bumper_pusher 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbb0d24c2e07727306d6db6bdc39acd86d91359e
-  data.tar.gz: b5b81fda4ec1eb48df7db797a4e7c250a457cbef
+  metadata.gz: 328e5eea81ff73d917cfd4b6faf2ae7b1224c654
+  data.tar.gz: ad1001cdeab002ad0be2b7f9ef14d0317d6da117
 SHA512:
-  metadata.gz: 91df9059b90a9dfe240858199bc5ddb12db886aa62b1fc9af0de4357406466b4e7d39e5cb88aef3c52cbe6bdf6211f6fd39cc59157e1c52200fa39d0f728dc43
-  data.tar.gz: c7defa37d138cf864243fe81b6eac1b5d0441bceb11fbf3987f0ff591b7ecc6d3cda574120e25548e0f65d83a190b9ca51bc7dc4342d0996370e26196d4cc2bf
+  metadata.gz: 0e33e471f3873a8aabfb9cd8f264cb6fe663639519d53ce47cdfdaea2269a841a149dd3c3bdd26c6d438e6a6b5806739cd5c2dfa98baa00a916bc028ce014df9
+  data.tar.gz: 20734c4177ef634cdd00f26a2336935f0fe716a5c95dce0370cc10b54117b4de741cc2a8456d8df56b7f42bf5658fe2a210f62f73dc1c8a18003ac99e9ab0e88

data/bumper_pusher.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_runtime_dependency(%q<colorize>, ["~> 0.7"])
+  spec.add_runtime_dependency(%q<github_changelog_generator>, ">= 1.2", "< 5.0")
 end

data/lib/bumper_pusher/bumper.rb

@@ -33,7 +33,7 @@ module BumperPusher
         end
       end
 
-      current_branch = `git rev-parse --abbrev-ref HEAD`.strip!
+      current_branch = get_current_branch()
 
       unless @options[:beta]
 
@@ -54,6 +54,10 @@ module BumperPusher
       end
     end
 
+    def get_current_branch
+      `git rev-parse --abbrev-ref HEAD`.strip!
+    end
+
 
     def find_spec_file
 
@@ -254,6 +258,12 @@ module BumperPusher
 
       check_repo_is_clean_or_dry_run
 
+      unless @options[:beta]
+        execute_line_if_not_dry_run('git pull')
+        current_branch = get_current_branch
+        execute_line_if_not_dry_run("git checkout master && git pull && git checkout #{current_branch}")
+      end
+
       version_file = find_version_file
       result, versions_array = find_version_in_file(version_file)
       bumped_version = bump_version(versions_array)
@@ -322,9 +332,18 @@ module BumperPusher
         if `which github_changelog_generator`.empty?
           puts 'Cancelled bumping: no github_changelog_generator gem found'
         else
+
+          if is_gitflow_installed
+            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}\"")
-          execute_line_if_not_dry_run('git push')
+          if is_gitflow_installed
+            execute_line_if_not_dry_run("git flow hotfix finish -n update-changelog")
+          else
+            execute_line_if_not_dry_run('git push')
+          end
+
         end
       end
 

data/lib/bumper_pusher/version.rb

@@ -1,3 +1,3 @@
 module BumperPusher
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumper_pusher
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Petr Korolev
@@ -52,6 +52,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: Bumping and pushing your ruby gems easy and fast!
 email:
 - sky4winder@gmail.com