bumper_pusher 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12a13b59038f4a088b15c85b75537149fea4b5e7
-  data.tar.gz: 03117dcda2b1ad04006817e7765bb7c6bcebf8da
+  metadata.gz: d604ffda651fdf4b254167ca393b4a05e08bf02a
+  data.tar.gz: 2fd824b6778fe5e2f07a33b0b46a21c44508525c
 SHA512:
-  metadata.gz: 7824d7e43e23b2d39c45aa4343e4d9e0527a0b6fc3a065f3c6390deb31e8dce422fccecfc22bb0defca71419553801d94c48f3194788fad55fd75903084f9ba2
-  data.tar.gz: 49a47baa7109ecc58c6eb70f99257fc59d686330f434d3fbd9984ed05efff0fe1d88550e76db1f3a8412c65418803398ffce1cc5923902c9f47285e8ca489c04
+  metadata.gz: 6072a8c2ed42e94326e2d7951b97d42b24eeb7aca6573d6fd2ab924b48a00f04fcc37a06fe714da9a86d5276fd8e3b66b95b8dcb3cfefeab9baf3a514169391d
+  data.tar.gz: 940aa235c8f12e0b13f1231474b320a0939bc376aec7327c570ef2b775602c52da8dbdddb7070aa4121bb4fdaaf35dfa7d068f3f45b368ecbec3762f6fa8aa29

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.1.10] (https://github.com/skywinder/bumper_pusher/tree/0.1.10)
+#### 11/12/14
+- *Closed issue:* Push after update changelog [\#10](https://github.com/skywinder/bumper_pusher/issues/10)
+
 ## [0.1.9] (https://github.com/skywinder/bumper_pusher/tree/0.1.9)
 #### 10/12/14
 ## [0.1.8] (https://github.com/skywinder/bumper_pusher/tree/0.1.8)

data/lib/bumper_pusher/bumper.rb

@@ -199,16 +199,20 @@ module BumperPusher
       output
     end
 
-    def execute_line_if_not_dry_run(line)
+    def execute_line_if_not_dry_run(line, check_exit = true)
       if @options[:dry_run]
         puts "Dry run: #{line}"
         nil
       else
         puts line
         value = %x[#{line}]
-        puts value
-        check_exit_status(value)
-        value
+        if check_exit
+          puts value
+          check_exit_status(value)
+          value
+        else
+          $?.exitstatus
+        end
       end
     end
 
@@ -269,7 +273,7 @@ module BumperPusher
       bumped_version = bump_version(versions_array)
 
       if is_gitflow_installed && !@options[:beta]
-        execute_line_if_not_dry_run("git flow release start #{bumped_version}")
+        execute_line_if_not_dry_run("git flow release start #{bumped_version}", check_exit = false)
       end
 
       if @options[:bump]
@@ -281,10 +285,14 @@ module BumperPusher
         execute_line_if_not_dry_run("git commit --all -m \"Update #{@spec_mode} to version #{bumped_version}\"")
 
         if is_gitflow_installed
-          execute_line_if_not_dry_run("git flow release finish -n #{bumped_version}")
-          execute_line_if_not_dry_run('git checkout master')
-          execute_line_if_not_dry_run("git tag #{bumped_version}")
-          execute_line_if_not_dry_run('git checkout develop')
+
+          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')
+            execute_line_if_not_dry_run("git tag #{bumped_version}")
+            execute_line_if_not_dry_run('git checkout develop')
+          else
+            execute_line_if_not_dry_run("git tag #{bumped_version}")
+          end
         else
           execute_line_if_not_dry_run("git tag #{bumped_version}")
         end
@@ -334,14 +342,19 @@ module BumperPusher
         else
 
           if is_gitflow_installed
-            execute_line_if_not_dry_run("git flow hotfix start update-changelog")
+            execute_line_if_not_dry_run("git flow hotfix start update-changelog", check_exit = false)
           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_gitflow_installed
-            execute_line_if_not_dry_run("git flow hotfix finish -n update-changelog")
-            current_branch = get_current_branch
-            execute_line_if_not_dry_run("git push && git checkout master && git push && git checkout #{current_branch}")
+
+            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')
+            end
+
           else
             execute_line_if_not_dry_run('git push')
           end
@@ -382,7 +395,7 @@ module BumperPusher
     end
 
     def is_gitflow_installed()
-      system("git flow version")? true : false
+      system("git flow version") ? true : false
     end
   end
 

data/lib/bumper_pusher/version.rb

@@ -1,3 +1,3 @@
 module BumperPusher
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bumper_pusher
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Petr Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler