Skip to content

Commit

Permalink
Enchancements to install/update (#1726)
Browse files Browse the repository at this point in the history
* can upgrades to upgrade and install script

* removed version.json

* fix issues caused by removing version.json

fix pacakge.json version number.
fix issue that stopped automatic upgrade
added error catching to gitub api calls

* Merge lib/application.js changes from canstudios/latest-release

* Add refactored file

* Refactor common code into helper file

* Move framework & authoring git code into helper

* Switch to use helper function

Also reduce other duplication

* Fix issue with framework folder path

* Switch comparison to use semver

* Refactor, and switch to use configuration module

* Add spinner

* Add delegate function to check for update data

* Adjust spinner code

* Make log a bit more user-friendly

* Amend code style

* Remove all dependencies on version.json

* Remove whole framework folder before clone

* Fix import errors

* Remove comments

* Reword message

* Refactor

* Start install refactor

* Amend imports

* Update style

* Refactor

* Fix broken references

* Add newlines

* Add temporary callback

* Move config items to point of ref, as need to make use of dynamic vars

* Set configResults

* Refactor tenant code

* Add bracket for readability

* Remove line

* Update tenantmanager to use local framework

* Add missing import

* Fix to framework install

* Keep config.frameworkRevision for now

* Add logs

* Add error checks

* Add custom directory

* Fix application update check

* Add missing import

* Fix error handling

* Update functions to use opts values

* Disable logging for now

* Remove framework install

This is now done by tenantmanager when setting up master tenant

* Add frontend build function to helpers

* Update logs

* Amend colouring

* Hide exec logs

* Add error handling

* Move spinner code to helpers

* Move exit code to helpers

* Abstract input code

* Refactor functions for more general use

* Add missing bits

* Update logs for readability

* Fix logic

* Remove extraneous code

* Add helpful error for GitHub API limit error

Amend some other logs for readability

* Add missing error var

* Update log messages

* Amend to use log wrapper

* Add spinner to install

* Fix issue with halted install process

* Fix upgrade version check issue

* Allow framework version to be ‘locked’ in config.json

Requires ‘framework’ attribute, can be 1, 2, or 3 figures (e.g. ‘1’, ‘1.1’ or ‘1.1.1’)

* Allow undefined frameworkRevision value

* Add dependency

* Set env var to silence install output

* Remove adapt_framework folder from .gitignore

*  Amend in-line with review by @tomgreenfield

* Remove unused functions

* Refactor

* Fix error handling

* Fix typos

* Add config.json install overrides

Also refactor input configs

* Switch to use writeJSON

* Add input validators/transforms

* Refactor for readability

* Fix error bug

* Fix error check

* Remove .env file generation as we don’t support foreman

*  Update prompt dev to allow password replace

* Remove .env and .vagrant

* Fix config output

* Update feedback texts

* Remove reference to version.json

* Fix issue with framework install directory

* Removed unused lines

* Move into single applyEachSeries

* Don’t modify existing object

* Pass opts to bowermanager

* Fix issue with framework plugin isntall

* Refactor code

* Change prompt.delimiter to match install script

* Fix issue with undefined masterTenantID

* Make SMTP input optional

* Remove redundant code

* Tidy output logs

* Move init

* Stop newline after passwords

* Move installHelpers

* Move further up

* Uncouple function from framework lock

* Move input code to installHelpers

* Update instructional text

* Refactor error handling code

* Fix issue with authoring update erroring on git fetch

* Move log

* Rewrite for readability

* Make revision input optional

But must specify one…

* Refactor for error handling

* Fix framework update

Now updateRepos always does a fetch
Resets to remote/branch

* Fix updateRepo to allow any valid revision

* Remove logs

* Remove node_modules before installing deps

* Amend user instruction text

* Fix typo

* Use backticks

* Amend logging

* Update log

* Fix issue with returning error after exec

* Default framework URL to adaptlearning

* Return error if trying to upgrade with custom repos

* Refactor error handling code

* Split up server config items to let us dynamically set rootUrl.default

* Remove unused function

* Switch processes to use remote name ‘origin’

* Fix config defaults

* Return data with callback

* Switch spinner library due to issue on windows

* Fix broken var reference

* Update log for usability

* Allow for config.json value

* Fix whitespace

* Remove log from config.json install

* Add db connection check

* Move out of async.race due to execution time

* Reduce animation framerate

* Fix error handler
  • Loading branch information
taylortom authored Oct 17, 2017
1 parent f54d501 commit 535e544
Show file tree
Hide file tree
Showing 14 changed files with 1,382 additions and 1,273 deletions.
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/adapt_framework

/conf/config.json

/data
Expand Down Expand Up @@ -31,9 +29,5 @@

/.settings

version.json

.idea
.vagrant
.env
.project
Loading

0 comments on commit 535e544

Please sign in to comment.