Merge branch 'release/0.7.2'

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.7.1
+Current Version: 0.7.2
 
 Requires NodeJS v4.0.0 or greater
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generate-release",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Generate a release using git-glow",
   "engines": {
     "node": ">=4.0.0"

src/index.coffee

@@ -7,7 +7,6 @@
 IS_DEBUG = process.env.IS_DEBUG?
 
 Promise = require 'bluebird'
-Glob = require 'glob'
 Path = require 'path'
 Observatory = require 'observatory'
 
@@ -26,6 +25,7 @@ askReleaseMessage = require './lib/question/askReleaseMessage'
 incrementVersion = require './lib/helper/incrementVersion'
 replaceVersionInFile = require './lib/helper/replaceVersionInFile'
 runArbitraryCommand = require './lib/helper/runArbitraryCommand'
+globNormalize = require './lib/helper/globNormalize'
 
 module.exports = (args) ->
   options = undefined
@@ -132,8 +132,7 @@ module.exports = (args) ->
   #Write Version Files
   .then ->
     try
-      files = []
-      files.push Path.resolve file for file in Glob.sync item for item in options.files_to_version
+      files = globNormalize options.files_to_version
       for file in files
         observatory_tasks.write_files.status(file)
         replaceVersionInFile file, options.current_version, options.next_version
@@ -162,11 +161,7 @@ module.exports = (args) ->
   #Commit files
   .then ->
     try
-      files = [options.package_file_location]
-
-      files.push Path.resolve file for file in Glob.sync item for item in options.files_to_commit
-      files.push Path.resolve file for file in Glob.sync item for item in options.files_to_version
-
+      files = globNormalize options.package_file_location, options.files_to_commit, options.files_to_version
       observatory_tasks.git_commit.status('Committing')
       git_commands.commit files
       observatory_tasks.git_commit.done('Complete')

src/lib/helper/globNormalize.coffee

@@ -0,0 +1,17 @@
+Glob = require 'glob'
+Path = require 'path'
+
+globNormalize = (params...) ->
+  files = []
+
+  for item in params
+    if typeof item is 'string'
+      files.push Path.resolve file for file in Glob.sync item
+    else if Array.isArray item
+      files = files.concat globNormalize.apply {}, item
+    else
+      throw new Error "#{item} is not an array or a string."
+
+  files.sort().filter (item, pos, self) -> not pos or item isnt self[pos - 1]
+
+module.exports = globNormalize