ember-cli-update - npm Package Compare versions

Comparing version 0.6.1 to 0.6.2

bin/ember-cli-update.js

@@ -21,2 +21,2 @@ #!/usr/bin/env node
   ignoreConflicts
-});
+}).catch(console.error);

package.json

 {
   "name": "ember-cli-update",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Update Ember CLI Ember.js apps and addons",
@@ -10,5 +10,6 @@ "main": "src/index.js",
   "scripts": {
-    "test": "npm run test:bin && npm run test:command",
-    "test:bin": "cross-env DEBUG=ember-cli-update,git-diff-apply mocha \"test/!(fixtures)/**/!(ember-addon)-test.js\"",
-    "test:command": "cross-env DEBUG=ember-cli-update,git-diff-apply,ember-cli-addon-tests mocha test/acceptance/ember-addon-test.js",
+    "test": "npm run test:both",
+    "test:both": "npm run test:bin && npm run test:command",
+    "test:bin": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures mocha \"test/!(fixtures)/**/!(ember-addon)-test.js\"",
+    "test:command": "cross-env DEBUG=ember-cli-update,git-diff-apply,git-fixtures,ember-cli-addon-tests mocha test/acceptance/ember-addon-test.js",
     "posttest": "npm run lint",
@@ -48,4 +49,6 @@ "prelint": "eslint --version",
     "eslint-config-sane": "^0.1.0",
+    "eslint-plugin-mocha": "^4.11.0",
     "fixturify": "^0.3.3",
     "fs-extra": "^4.0.0",
+    "git-fixtures": "^0.3.0",
     "mocha": "^3.4.2"
@@ -52,0 +55,0 @@ },

README.md

@@ -32,4 +32,8 @@ # ember-cli-update
 
-This will update your app or addon to the latest Ember CLI version. It does this by grabbing your current installed Ember CLI version and looking up the latest version, then applying a diff of the changes to your project. You will probably encounter merge conflicts, in which your system's git merge tool will run.
+This will update your app or addon to the latest Ember CLI version. It does this by grabbing your current installed Ember CLI version and looking up the latest version, then applying a diff of the changes needed to your project. Your project files will only get modified if they were changed in the by Ember CLI between versions, and it will only change the section necessary, not the entire file.
 
+This is different from the existing `ember init` command. That command tries to reset your project back to a brand new project. It removes all your changes and additions.
+
+You will probably encounter merge conflicts, in which your system's git merge tool will run.
+
 ## Options
@@ -41,8 +45,19 @@
 | --to | Update to a version that isn\'t latest | String | "2.14.1" "~2.15" "latest" "beta" | "latest" |
-| --ignore-conflict | Handle merge conflicts yourself | Boolean | | false |
+| --ignore-conflicts | Handle merge conflicts yourself | Boolean | | false |
 
 ## Hints
 
+Need help using `git mergetool`? Here are some starting points:
+
+* https://git-scm.com/docs/git-mergetool
+
+If you made a mistake during the update/conflict resolution, run these commands to undo everything and get you back to before the update:
+
+```
+git reset --hard
+git clean -f
+```
+
 If you notice ".orig" files lying around after a merge and don't want that behavior, run `git config mergetool.keepBackup false`.
 
 To avoid being prompted "Hit return to start merge resolution tool (vimdiff):" for every conflict, set a merge tool like `git config merge.tool "vimdiff"`.

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

9815

increased by9.47%

Number of package files

14

increased by7.69%

Lines of code

166

increased by3.11%

Number of lines in readme file

62

increased by31.91%

Worsened metrics

Dev dependency count

12

increased by20%

No dependency changes