gitscape 1.3.1 → 1.3.2

data/lib/gitscape/base.rb

@@ -102,7 +102,7 @@ class Gitscape::Base
     merge_master = true
     master_branch = @repo.branch "master"
 
-    if hotfix_branch_name.empty?
+    if hotfix_branch_name.to_s.empty?
       puts "!!! not currently on a hotfix branch, and no branch name was provided as an argument !!!"
       puts usage_string
       exit 1
@@ -115,7 +115,7 @@ class Gitscape::Base
 
     # Collect the set of branches we'd like to merge the hotfix into
     merge_branches = [development_branch, live_branch]
-    merge_branches.insert master_branch if !(merge_branches.include? master_branch) && merge_master
+    merge_branches << master_branch if !(merge_branches.include? master_branch) && merge_master
 
     # Merge the hotfix into branches
     for branch in merge_branches

data/lib/gitscape/version.rb

@@ -1,3 +1,3 @@
 module Gitscape
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Jon Botelho
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-14 00:00:00 -05:00
+date: 2013-01-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency