Merge branch 'matt328-develop' into develop

mrkmg · Jul 5, 2016 · 3ff6514 · 3ff6514
2 parents d49ad67 + ba024b4
commit 3ff6514
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 17 deletions.
diff --git a/main/index.js b/main/index.js
diff --git a/main/lib/helper/incrementVersion.js b/main/lib/helper/incrementVersion.js
diff --git a/src/index.coffee b/src/index.coffee
@@ -67,7 +67,7 @@ module.exports = (args) ->
 
   #Bump Version
   .then ->
-    @options.next_version = incrementVersion @options.current_version, @options.release_type, @git_flow_settings.version_tag_prefix
+    @options.next_version = incrementVersion @options.current_version, @options.release_type
 
   #Set/Get Release Message
   .then ->

diff --git a/src/lib/helper/gitFlowSettings.coffee b/src/lib/helper/gitFlowSettings.coffee
@@ -30,5 +30,4 @@ module.exports = (project_path) ->
   {
     master: ini_data[BRANCH_CONFIG]['master']
     develop: ini_data[BRANCH_CONFIG]['develop']
-    version_tag_prefix: ini_data[PREFIX_CONFIG]['versiontag']
   }
diff --git a/src/lib/helper/incrementVersion.coffee b/src/lib/helper/incrementVersion.coffee
@@ -6,9 +6,9 @@
 
 VERSION_REGEX = /([0-9]+\.[0-9]+\.[0-9]+)/
 
-module.exports = (version, type, prefix = '') ->
+module.exports = (version, type) ->
   unless VERSION_REGEX.test version
-    throw new Error "Version does not batch semver: #{version}"
+    throw new Error "Version does not match semver: #{version}"
 
   version_split = version.match(VERSION_REGEX)[0].split('.').map (t) -> parseInt(t)
   switch type
@@ -24,4 +24,4 @@ module.exports = (version, type, prefix = '') ->
     else
       throw new Error "Unknown Bump Type: #{type}"
 
-  prefix + version_split.join '.'
+  version_split.join '.'
diff --git a/test/specs/lib/helper/incrementVersion.coffee b/test/specs/lib/helper/incrementVersion.coffee
@@ -17,11 +17,6 @@ describe 'incrementVersion', ->
     assert.equal incrementVersion('1.2.3', 'minor'), '1.3.0'
     assert.equal incrementVersion('1.2.3', 'major'), '2.0.0'
 
-  it 'increment with prefix', ->
-    assert.equal incrementVersion('v1.2.3', 'patch', 'v'), 'v1.2.4'
-    assert.equal incrementVersion('v1.2.3', 'minor', 'v'), 'v1.3.0'
-    assert.equal incrementVersion('v1.2.3', 'major', 'v'), 'v2.0.0'
-
   it 'throws on invalid versions', ->
     assert.throws ->
       incrementVersion('1', 'patch')