From f5efdea4c5119c3a38637fe07dbd886f59d4fcf5 Mon Sep 17 00:00:00 2001
From: Kevin Gravier <kgravier@fusetg.com>
Date: Wed, 6 Jul 2016 15:19:20 -0400
Subject: [PATCH] Release 0.10.1

Added the ability to define options in the package.json file for NPM packages
---
 README.md           |  2 +-
 main/lib/Options.js | 18 ++++++++++++++++--
 package.json        |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6a093b3..8c791c4 100644
--- 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.10.0
+Current Version: 0.10.1
 
 Requires NodeJS v4.0.0 or greater
 
diff --git a/main/lib/Options.js b/main/lib/Options.js
index 2475ef8..adbb034 100644
--- a/main/lib/Options.js
+++ b/main/lib/Options.js
@@ -7,7 +7,7 @@
  */
 
 (function() {
-  var Minimist, Options, Path, existsSync, options;
+  var Minimist, Options, Path, existsSync, extend, options;
 
   existsSync = require('exists-sync');
 
@@ -15,6 +15,8 @@
 
   Minimist = require('minimist');
 
+  extend = require('xtend');
+
   options = {
     show_help: {
       "default": false,
@@ -165,6 +167,8 @@
     function Options(args) {
       this.args = Minimist(args.slice(2));
       this.getOption('dot_release_file_location', options.dot_release_file_location);
+      this.getOption('package_file_location', options.package_file_location);
+      this.loadPackageConfig();
       this.loadFileData();
       this.getAllOptions();
     }
@@ -204,7 +208,17 @@
 
     Options.prototype.loadFileData = function() {
       if (existsSync(this.dot_release_file_location)) {
-        return this._file_data = require(this.dot_release_file_location);
+        return this._file_data = extend(this._file_data, require(this.dot_release_file_location));
+      }
+    };
+
+    Options.prototype.loadPackageConfig = function() {
+      var package_json, ref;
+      if (existsSync(this.package_file_location)) {
+        package_json = require(this.package_file_location);
+        if (((ref = package_json.config) != null ? ref.generateRelease : void 0) != null) {
+          return this._file_data = extend(this._file_data, package_json.config.generateRelease);
+        }
       }
     };
 
diff --git a/package.json b/package.json
index 2433143..fa9dddc 100644
--- a/package.json
+++ b/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"