bumper_pusher 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e583e0512a8968f2bf1b31b5fa1dc5e8a184d65
-  data.tar.gz: 6b9be7b84f751f9a51dd0ee06f095d25919e014c
+  metadata.gz: 9a68437a52a9be3fea575126686205ec9a4af70d
+  data.tar.gz: 146b40de6c483f628632745aa5f10dbb84168207
 SHA512:
-  metadata.gz: d7dd8e3d28a66faf8ba05763765fa647a7650a6e204442dd5976a19581b869685d90156561003edd1da12f3907cb724e0621bf6b69a9eb7fcf122cb4b69d9322
-  data.tar.gz: 317511f49a1c1f2cdf286ae6666a42188674349a7d4c00771cc261d475458dc5d7fa1917ae5721e2a9997c7138c31d3e5543d698f466a56c54503c0e9e9f9131
+  metadata.gz: 1ec6e4978ea0bef4201fc1f85971c96a06ccf9fc201cc4b927315751abe5d51a9aaa766067fc0f29baad33788077c2d8d939461070dfcb7d2a83596e11acb37c
+  data.tar.gz: f3933c646785dcba1ae5b770e19fdd25743348f1c9f899c2cd74935beffcd067f71f74897f897b0598ad9a1066155636ae2f76db827380b99c448ebb1200258b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [0.1.16](https://github.com/skywinder/bumper_pusher/tree/0.1.16) (2015-03-03)
+
+[Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.15...0.1.16)
+
 ## [0.1.15](https://github.com/skywinder/bumper_pusher/tree/0.1.15) (2015-03-03)
 
 [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.14...0.1.15)

data/lib/bumper_pusher/bumper.rb

@@ -289,7 +289,7 @@ module BumperPusher
       unless @options[:beta]
         execute_line_if_not_dry_run('git push --all')
         if is_git_flow_installed && !is_branch_hotfix?
-          execute_line_if_not_dry_run("git flow release start #{bumped_version}", check_exit = false)
+          execute_line_if_not_dry_run("git flow release start #{bumped_version}")
         end
       end
 
@@ -305,25 +305,16 @@ module BumperPusher
           if is_branch_hotfix?
             branch_split = get_current_branch.split('/').last
             unless execute_line_if_not_dry_run("git flow hotfix finish -n #{branch_split}", check_exit = false) == 0
-              puts 'Automatic merge failed, please open new terminal, resolve conflicts, then press Y. Or press N to terminate'
-              str = ''
-              while str != 'Y' && str != 'N'
-                str = gets.chomp
-                puts str
-              end
-              if str == 'N'
-                puts '-> exit'
-                exit
-              end
+              ask_to_merge
               execute_line_if_not_dry_run("git flow hotfix finish -n #{branch_split}")
             end
-            execute_line_if_not_dry_run('git checkout master')
-
           else
-            if execute_line_if_not_dry_run("git flow release finish -n #{bumped_version}", check_exit = false) == 0
-              execute_line_if_not_dry_run('git checkout master')
+            unless execute_line_if_not_dry_run("git flow release finish -n #{bumped_version}", check_exit = false) == 0
+              ask_to_merge
+              execute_line_if_not_dry_run("git flow release finish -n #{bumped_version}")
             end
           end
+          execute_line_if_not_dry_run('git checkout master')
         end
         execute_line_if_not_dry_run("git tag #{bumped_version}")
       end
@@ -372,19 +363,16 @@ module BumperPusher
         else
 
           if is_git_flow_installed
-            execute_line_if_not_dry_run("git flow hotfix start update-changelog", check_exit = false)
+            execute_line_if_not_dry_run('git flow hotfix start update-changelog')
           end
           execute_line_if_not_dry_run('github_changelog_generator')
           execute_line_if_not_dry_run("git commit CHANGELOG.md -m \"Update changelog for version #{bumped_version}\"")
           if is_git_flow_installed
-
-            if execute_line_if_not_dry_run("git flow hotfix finish -n update-changelog", check_exit = false) == 0
-              current_branch = get_current_branch
-              execute_line_if_not_dry_run("git push && git checkout master && git push && git checkout #{current_branch}")
-            else
-              execute_line_if_not_dry_run('git push')
+            unless execute_line_if_not_dry_run('git flow hotfix finish -n update-changelog', check_exit = false) == 0
+              ask_to_merge
+              execute_line_if_not_dry_run('git flow hotfix finish -n update-changelog')
             end
-
+            execute_line_if_not_dry_run("git push && git checkout master && git push && git checkout #{get_current_branch}")
           else
             execute_line_if_not_dry_run('git push')
           end
@@ -394,6 +382,19 @@ module BumperPusher
 
     end
 
+    def ask_to_merge
+      puts 'Automatic merge failed, please open new terminal, resolve conflicts, then press Y. Or press N to terminate'
+      str = ''
+      while str != 'Y' && str != 'N'
+        str = gets.chomp
+        puts str
+      end
+      if str == 'N'
+        puts '-> exit'
+        exit
+      end
+    end
+
     def find_version_file
       version_file = nil
       arr = `find . -name 'version.rb'`.split("\n")

data/lib/bumper_pusher/version.rb

@@ -1,3 +1,3 @@
 module BumperPusher
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumper_pusher
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Petr Korolev