Merge branch 'release/0.12.0'

mrkmg · Apr 28, 2017 · 968715c · 968715c
2 parents 5ec49ee + 4e79d91
commit 968715c
Show file tree

Hide file tree

Showing 19 changed files with 684 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,5 @@ node_modules
 # IntelliJ Folder
 .idea
 *.iml
+
+.nyc_output
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 sudo: false
 node_js:
+  - 7
   - 6
   - 5
   - 4

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Generate a release for a project following semver using nodejs and gitflow
 [![Generate Release on NPM](https://img.shields.io/npm/v/generate-release.svg?style=flat-square)](https://www.npmjs.com/package/generate-release)
 [![Generate Release uses the MIT](https://img.shields.io/npm/l/generate-release.svg?style=flat-square)](https://opensource.org/licenses/MIT)
 
-Current Version: 0.11.0
+Current Version: 0.12.0
 
 Requires NodeJS v4.0.0 or greater
 
@@ -111,7 +111,7 @@ is an example with all default options set.
           "pre_commit_commands": [],
           "post_commit_commands": [],
           "post_complete_commands": [],
-          "files_to_commit": []
+          "files_to_commit": [],
           "files_to_version": ["README.md"]
       }
       

diff --git a/main/index.js b/main/index.js
diff --git a/main/lib/GitCommands.js b/main/lib/GitCommands.js
diff --git a/main/lib/Options.js b/main/lib/Options.js
diff --git a/main/lib/PackageFile.js b/main/lib/PackageFile.js
diff --git a/main/lib/error/GitResetError.js b/main/lib/error/GitResetError.js
diff --git a/main/lib/error/HelpError.js b/main/lib/error/HelpError.js
diff --git a/main/lib/helper/gitFlowSettings.js b/main/lib/helper/gitFlowSettings.js
diff --git a/main/lib/helper/globNormalize.js b/main/lib/helper/globNormalize.js
diff --git a/main/lib/helper/incrementVersion.js b/main/lib/helper/incrementVersion.js
diff --git a/main/lib/helper/replaceVersionInFile.js b/main/lib/helper/replaceVersionInFile.js
diff --git a/main/lib/helper/runArbitraryCommand.js b/main/lib/helper/runArbitraryCommand.js
diff --git a/main/lib/question/askConfirmUpdate.js b/main/lib/question/askConfirmUpdate.js
diff --git a/main/lib/question/askReleaseMessage.js b/main/lib/question/askReleaseMessage.js
diff --git a/main/lib/question/askReleaseType.js b/main/lib/question/askReleaseType.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generate-release",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Generate a release using git-glow",
   "engines": {
     "node": ">=4.0.0"
@@ -21,8 +21,8 @@
     "test": "npm run lint && npm run unit && npm run cover",
     "lint": "coffeelint -f .coffeelint.json src test",
     "unit": "mocha --recursive --compilers coffee:coffee-script/register --timeout 10000 ./test/specs",
-    "cover": "istanbul cover _mocha -- --recursive --compilers coffee:coffee-script/register --require coffee-coverage/register-istanbul --timeout 10000 ./test/specs",
-    "coveralls": "istanbul-coveralls",
+    "cover": "nyc mocha --recursive --compilers coffee:coffee-script/register --require coffee-coverage/register-istanbul --timeout 10000 ./test/specs",
+    "coveralls": "nyc report --reporter=text-lcov | coveralls",
     "release": "coffee -e 'require(\"./src\")([])'"
   },
   "files": [
@@ -41,10 +41,10 @@
   "homepage": "https://github.com/mrkmg/node-generate-release#readme",
   "dependencies": {
     "bluebird": "^3.1.2",
-    "exists-sync": "0.0.3",
+    "exists-sync": "0.0.4",
     "glob": "^7.0.4",
     "iniparser": "^1.0.5",
-    "inquirer": "^1.1.0",
+    "inquirer": "^3.0.6",
     "minimist": "^1.2.0",
     "observatory": "^1.0.0",
     "rmdir": "^1.2.0",
@@ -53,14 +53,15 @@
   },
   "devDependencies": {
     "chai": "^3.4.1",
-    "chai-as-promised": "^5.2.0",
-    "coffee-coverage": "^1.0.1",
+    "chai-as-promised": "^6.0.0",
+    "coffee-coverage": "^2.0.1",
     "coffee-script": "^1.10.0",
     "coffeelint": "^1.14.2",
     "coffeelint-limit-newlines": "0.0.2",
     "istanbul": "^0.4.2",
     "istanbul-coveralls": "^1.0.3",
-    "mocha": "^2.3.4",
-    "sinon": "^1.17.4"
+    "mocha": "^3.2.0",
+    "nyc": "^10.2.0",
+    "sinon": "^2.1.0"
   }
 }