Merge branch 'release/0.10.1'

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.10.0
+Current Version: 0.10.1
 
 Requires NodeJS v4.0.0 or greater
 
@@ -115,7 +115,33 @@ is an example with all default options set.
 The `files_to_commit` and `files_to_version` use [node-glob](https://github.com/isaacs/node-glob). See the
 documentation located there on how to format those options.
 
-If `release_message` is true, 
+If `release_message` is true, then you will be prompted to write a release message via your editor of choice.
+
+**package.json**
+
+If you are using this for an NPM package, you can include all the above options in your package.json instead of 
+a dedicated file.
+
+Place all your configuration options in `config : generateRelease`.
+
+    {
+        ...
+        "config": {
+            "generateRelease": {
+                "no_confirm": false,
+                "remote": "origin"
+            }
+        },
+        ...
+    }
+
+**Option Precedence**
+
+Precedence is determined in the following order:
+
+- CLI Argument
+- package.json file
+- .release.json file
 
 Building Assets, Running Tests, and Publishing Package
 --------------------------------

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generate-release",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Generate a release using git-glow",
   "engines": {
     "node": ">=4.0.0"
@@ -48,7 +48,8 @@
     "minimist": "^1.2.0",
     "observatory": "^1.0.0",
     "rmdir": "^1.2.0",
-    "temp": "^0.8.3"
+    "temp": "^0.8.3",
+    "xtend": "^4.0.1"
   },
   "devDependencies": {
     "chai": "^3.4.1",

src/lib/Options.coffee

@@ -7,6 +7,7 @@
 existsSync = require 'exists-sync'
 Path = require 'path'
 Minimist = require 'minimist'
+extend = require 'xtend'
 
 options =
   show_help:
@@ -101,6 +102,8 @@ class Options
 
     # Get Release File First
     @getOption 'dot_release_file_location', options.dot_release_file_location
+    @getOption 'package_file_location', options.package_file_location
+    @loadPackageConfig()
     @loadFileData()
     @getAllOptions()
 
@@ -123,7 +126,13 @@ class Options
 
   loadFileData: ->
     if existsSync @dot_release_file_location
-      @_file_data = require @dot_release_file_location
+      @_file_data = extend @_file_data, require @dot_release_file_location
+
+  loadPackageConfig: ->
+    if existsSync @package_file_location
+      package_json = require @package_file_location
+      if package_json.config?.generateRelease?
+        @_file_data = extend @_file_data, package_json.config.generateRelease
 
   getFileValue: (key) ->
     if @_file_data[key]? then @_file_data[key]

test/helpers/setupTestRepo.coffee

@@ -5,7 +5,7 @@ module.exports = (temp_dir) ->
   FS.mkdirSync temp_dir
   process.chdir temp_dir
   FS.writeFileSync 'package.json', package_json
-  FS.writeFileSync 'alt.package.json', package_json
+  FS.writeFileSync 'alt.package.json', alt_package_json
   FS.writeFileSync '.release.json', release_json
   FS.writeFileSync '.alt.release.json', release_json
   FS.writeFileSync '.all.release.json', all_release_json
@@ -26,7 +26,20 @@ TEST FILE
 '''
 
 package_json = '''
-{"version":"1.2.3"}
+{
+  "version":"1.2.3"
+}
+'''
+
+alt_package_json = '''
+{
+  "version":"1.2.3",
+  "config": {
+    "generateRelease": {
+      "release_message": "Alt Package Message {version}"
+    }
+  }
+}
 '''
 
 release_json = '''

test/specs/lib/Options.coffee

@@ -18,12 +18,12 @@ setupTestRepo = require '../../helpers/setupTestRepo'
 
 describe 'Options', ->
 
-  beforeEach ->
+  before ->
     @starting_dir = process.cwd()
     @temp_dir = Temp.path()
     setupTestRepo @temp_dir
 
-  afterEach (cb) ->
+  after (cb) ->
     process.chdir @starting_dir
     rmdir @temp_dir, cb
 
@@ -66,6 +66,14 @@ describe 'Options', ->
     assert.equal options.skip_git_push, true
     assert.equal options.release_message, true
 
+  it 'should parse the release config from package.json', ->
+    options = new Options [
+      'node', 'script',
+      '-p', 'alt.package.json'
+    ]
+
+    assert.equal options.release_message, 'Alt Package Message {version}'
+
   it 'should parse release file options correctly', ->
     options = new Options [
       'node', 'script'

test/specs/run.coffee

@@ -42,6 +42,7 @@ generate-release
 describe 'run', ->
   before ->
     @run_arguments = ['node', 'script', '-t', 'patch', '-n', '-l', '-s', '-o', 'test']
+    @quiet_run_arguments = ['node', 'script', '-t', 'patch', '-n', '-l', '-s', '-o', 'test', '-q']
     @help_arguments = ['node', 'script', '-h']
 
   beforeEach ->
@@ -76,6 +77,17 @@ describe 'run', ->
       assert not FS.existsSync "#{@temp_dir}/deleteme"
       assert @exit_stub.calledWith(0)
 
+  it 'Should not output anything with quiet run', ->
+    output_spy = Sinon.spy process.stdout, 'write'
+
+    Promise
+    .try =>
+      main @quiet_run_arguments
+    .then ->
+      assert not output_spy.called
+    .finally ->
+      output_spy.restore()
+
   it 'Should reset on command failure', ->
     commit_stub = Sinon.stub(GitCommands.prototype, 'commit').throws()
     reset_spy = Sinon.spy(GitCommands.prototype, 'reset')