bumper_pusher 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1afe0635ec7221d0ba4a6ea1ccd9e9f1598e02a
-  data.tar.gz: e6bd9a9031ea4126b0eb68d66fe82d3355fa996c
+  metadata.gz: 221caf300713c8a338aea4067b57a8fc07b23096
+  data.tar.gz: e452613d46aae1f3652d1edc6a1aafaef493d2ea
 SHA512:
-  metadata.gz: db2759bcb807c0bf2db66218708f016bdba02f5dc8800b8ae662e9075a91f02ccb5b05d622ab932829feb0b5ee81ed63e09ab1574faef4ab6e5ae458e984e9ff
-  data.tar.gz: 122df59f28fbc3c1510770cefa0ccb1c68e15971bca9de2001bd09a7ba954a7509c0ef93eb3584b30e77e22188647f85151ce02774c9bbb8f6f701cf6ee8e5c5
+  metadata.gz: 434d801446803d372fc1d66c257c655f608a0b71787c68e8abf99c169190b9de1f5256446ee592db6ef3ab5e9f581367ff75bde8f0822f4c0e0d221419bcc757
+  data.tar.gz: 46236f555c829db0fd4263ea7897305f4245d4c73a989dbd503c458ab0d5da3b72b88278c95ccf79b9190f67de33e5b45b03942a51249a74d3cec2804142a205

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [0.1.14](https://github.com/skywinder/bumper_pusher/tree/0.1.14)
+[Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.13...0.1.14)
+#### 09/02/15
 ## [0.1.13](https://github.com/skywinder/bumper_pusher/tree/0.1.13)
 [Full Changelog](https://github.com/skywinder/bumper_pusher/compare/0.1.12...0.1.13)
 #### 09/02/15

data/lib/bumper_pusher/bumper.rb

@@ -33,13 +33,13 @@ module BumperPusher
         end
       end
 
-      current_branch = get_current_branch()
+      current_branch = get_current_branch
 
       unless @options[:beta]
 
-        if is_gitflow_installed
+        if is_git_flow_installed
           # supposed, that with git flow you should release from develop branch
-          if current_branch != 'develop'
+          if current_branch != 'develop' && !is_branch_hotfix?
             puts "Warning: You're in branch (#{current_branch})!".yellow
             ask_sure_Y
           end
@@ -73,7 +73,12 @@ module BumperPusher
       case all_specs.count
         when 0
           puts 'No spec files found. -> Exit.'
-          exit
+          if is_debug?
+            puts 'Debug -> set @spec_mode to gem -> continue'
+            @spec_mode = GEM_SPEC_TYPE
+          else
+            exit
+          end
         when 1
           spec_file = all_specs[0]
         else
@@ -103,6 +108,10 @@ module BumperPusher
 
     end
 
+    def is_debug?
+      (ENV['RUBYLIB'] =~ /ruby-debug-ide/) ? true : false
+    end
+
     def find_current_gem_file
       list_of_specs = execute_line("find . -name '*.gem'")
       arr = list_of_specs.split("\n")
@@ -184,11 +193,13 @@ module BumperPusher
     end
 
     def ask_sure_Y
-      puts 'Are you sure? Press Y to continue:'
-      str = gets.chomp
-      if str != 'Y'
-        puts '-> exit'
-        exit
+      unless @options[:dry_run]
+        puts 'Are you sure? Press Y to continue:'
+        str = gets.chomp
+        if str != 'Y'
+          puts '-> exit'
+          exit
+        end
       end
     end
 
@@ -202,7 +213,7 @@ module BumperPusher
     def execute_line_if_not_dry_run(line, check_exit = true)
       if @options[:dry_run]
         puts "Dry run: #{line}"
-        nil
+        check_exit ? nil : 0
       else
         puts line
         value = %x[#{line}]
@@ -263,9 +274,12 @@ module BumperPusher
       check_repo_is_clean_or_dry_run
 
       unless @options[:beta]
-        execute_line_if_not_dry_run('git pull')
+        unless is_branch_hotfix?
+          execute_line_if_not_dry_run('git pull')
+        end
         current_branch = get_current_branch
         execute_line_if_not_dry_run("git checkout master && git pull && git checkout #{current_branch}")
+        execute_line_if_not_dry_run('git push --all')
       end
 
       version_file = find_version_file
@@ -274,10 +288,14 @@ module BumperPusher
 
 
       unless @options[:beta]
-        execute_line_if_not_dry_run('git push --all')
+<<<<<<< HEAD
           if is_gitflow_installed
+=======
+        execute_line_if_not_dry_run('git push --all')
+        if is_git_flow_installed && !is_branch_hotfix?
+>>>>>>> hotfix/fix-13
           execute_line_if_not_dry_run("git flow release start #{bumped_version}", check_exit = false)
-        end
+          end
       end
 
       if @options[:bump]
@@ -288,16 +306,24 @@ module BumperPusher
       if @options[:commit]
         execute_line_if_not_dry_run("git commit --all -m \"Update #{@spec_mode} to version #{bumped_version}\"")
 
-        if is_gitflow_installed
-
-          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')
+        if is_git_flow_installed
+          if is_branch_hotfix?
+            branch_split = get_current_branch.split('/').last
+            if execute_line_if_not_dry_run("git flow hotfix finish -n #{branch_split}", check_exit = false) == 0
+              execute_line_if_not_dry_run('git checkout master')
+            end
+          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')
+            end
           end
         end
+        execute_line_if_not_dry_run('git push --all')
         execute_line_if_not_dry_run("git tag #{bumped_version}")
       end
 
       if @options[:push]
+        execute_line_if_not_dry_run('git push --all')
         execute_line_if_not_dry_run('git push --tags')
 
         if @spec_mode == POD_SPEC_TYPE
@@ -339,12 +365,12 @@ module BumperPusher
           puts 'Cancelled bumping: no github_changelog_generator gem found'
         else
 
-          if is_gitflow_installed
+          if is_git_flow_installed
             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
+          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
@@ -392,9 +418,15 @@ module BumperPusher
       execute_line_if_not_dry_run("git push --delete origin #{result}")
     end
 
-    def is_gitflow_installed()
+    def is_git_flow_installed
       system("git flow version") ? true : false
     end
+
+    def is_branch_hotfix?
+      branch = get_current_branch
+      branch.include? 'hotfix'
+    end
+
   end
 
 end

data/lib/bumper_pusher/version.rb

@@ -1,3 +1,3 @@
 module BumperPusher
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bumper_pusher
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Petr Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler