bumper_pusher 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2ed9473b61cd4475b712d59b4ad21f018e096e5
-  data.tar.gz: 8fea6ee93a718cc2b722db719d3ebaa99dd32d85
+  metadata.gz: c347d01e39fac9f0a695a8c51d5002cd19a7c782
+  data.tar.gz: dc287b2ff9f1f167d6c76476dabd2fbd9cae4b30
 SHA512:
-  metadata.gz: 034e1d1090bd10bdfd92fb9f1504810df751b51d95bd8e708fc925e34c201cc2f8c0065b377ec5ddd97e45de075cd234aa8c8a0d7784c30b945fbc9604828612
-  data.tar.gz: 2ca25ff45f9eb4d28e1badedd2dbcae3dc36c135a4b421cc0a44561d44738f76d4b803f302e4ef4e1f035f465963cf617caebd99829b1107f1d52937017356b7
+  metadata.gz: 4b6e5a4d52ae7ef99a685ba1b4255b862f00887079141abf8c376dc353fef6a0ac9d5a23a4b3efb4b7e8990c9d2fbfe6a7ceba013f6268f00fe13f6ea88b8a0b
+  data.tar.gz: ec4723b7ded1f2c7a700408125867bbf7ac4bb9da99702423b566345bbb795f3d70c972a2676f20094f2c2b2642628c73b7c07208c42024b2ae6f604824dd6b0

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [0.1.3] (https://github.com/skywinder/bumper_pusher/tree/0.1.3)
+## [0.1.4] (https://github.com/skywinder/bumper_pusher/tree/0.1.4)
 #### 19/11/14
 - *Merged pull-request:* Add check and warrning message, if you try to bump not from master branch [\#4](https://github.com/skywinder/bumper_pusher/pull/4) ([skywinder](https://github.com/skywinder))
 

data/README.md

@@ -1,34 +1,26 @@
 # BumperPusher
 
-TODO: Write a gem description
+This gem make bumping and pushing your ruby gems easy and fast!
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'bumper_pusher'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+- Works with `gemspec` and `podspec` files
+- Automatically detect your current version (from `spec` or `version.rb` file)
+- Auto-bump spec
+- Auto-push spec
 
-    $ gem install bumper_pusher
+## Installation
+	[sudo] gem install bumper_pusher
 
 ## Usage
-- To bump path version and push your gemspec or podscpec file: `bumper_pusher`
-	-  `-r` for bump release
-	- `-m` for bump minor 
-	- `-p` for bump patch (default option)
+- Just print: `bumper_pusher` and that's it!
+- If you want to test, that all works as expected: try **dry_run** mode: `bumper_pusher --dry-run` 
+- To bump version print: `bumper_pusher [option]`
+	-  `-r` for bump release (`1.2.3` -> `2.0.0`)
+	- `-m` for bump minor (`1.2.3` -> `1.3.0`)
+	- `-p` for bump patch (`1.2.3` -> `1.2.4`) **default option**
 	
 - To install locally your gemspec `bumper_pusher -b`
 
-..Look at **Params** section for details.
-
-### Params:
+### Params
 	Usage: bumper_pusher [options]
 	    -d, --dry-run                    Dry run
 	        --release                    Bump release version
@@ -39,6 +31,23 @@ Or install it yourself as:
 	    -b, --beta                       Build beta gem without commit and push
 	    -v, --version                    Print version number
 	    -c, --[no]-changelog             Auto generation of changelog and pushing it origin. Default is true
+
+## Alternatives
+- https://github.com/peritus/bumpversion
+- https://github.com/vojtajina/grunt-bump
+- https://github.com/gregorym/bump
+- https://github.com/svenfuchs/gem-release
+
+## Features & Benefits of this project
+
+- **Very easy to use**: just print `bumper_pusher` in your repo folder.
+- Support version storage directly in `gemspec` file and in `version.rb`
+- Check that you're bumping from `master`. (otherwise print warning with confirmation)
+- Check that your `git status` in clean
+- Ability to build test gem easily  `bumper_pusher -b`
+- Ability to generate changelog for new version by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)
+- Support both `gemspec` and `podspec` files
+
 ## Contributing
 
 1. Fork it ( https://github.com/skywinder/bumper_pusher/fork )

data/bumper_pusher.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Petr Korolev"]
   spec.email         = ["sky4winder@gmail.com"]
   spec.summary       = %q{Easiest way to bump your specs}
-  spec.description   = %q{Easiest way to bump your specs}
-  spec.homepage      = ""
+  spec.description   = %q{Bumping and pushing your ruby gems easy and fast!}
+  spec.homepage      = %q{https://github.com/skywinder/bumper_pusher}
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/bumper_pusher/bumper.rb

@@ -1,5 +1,6 @@
 require 'colorize'
-
+require "readline"
+require 'open3'
 module BumperPusher
 
   POD_SPEC_TYPE = 'podspec'
@@ -33,9 +34,23 @@ module BumperPusher
       end
 
       current_branch = `git rev-parse --abbrev-ref HEAD`.strip!
-      if current_branch != 'master'
-        puts "Warning: You're not in 'master' branch (#{current_branch})!".yellow
-        ask_sure_Y
+
+      unless @options[:beta]
+
+        if is_gitflow_installed
+          # supposed, that with git flow you should release from develop branch
+          if current_branch != 'develop'
+            puts "Warning: You're in branch (#{current_branch})!".yellow
+            ask_sure_Y
+          end
+        else
+          # supposed, that w/o git flow you should release from master or release branch
+          if current_branch != 'master' || !/release/.match(current_branch)[0].nil?
+            puts "Warning: You're in branch (#{current_branch})!".yellow
+            ask_sure_Y
+          end
+        end
+
       end
     end
 
@@ -193,6 +208,41 @@ module BumperPusher
       end
     end
 
+    def execute_interactive_if_not_dry_run(cmd)
+      if @options[:dry_run]
+        puts "Dry run: #{cmd}"
+        nil
+      else
+        Open3.popen3(cmd) do |i, o, e, th|
+          Thread.new {
+            until i.closed? do
+              input =Readline.readline("", true).strip
+              i.puts input
+            end
+          }
+
+          t_err = Thread.new {
+            until e.eof? do
+              putc e.readchar
+            end
+          }
+
+          t_out = Thread.new {
+            until o.eof? do
+              putc o.readchar
+            end
+          }
+
+          Process::waitpid(th.pid) rescue nil
+          # "rescue nil" is there in case process already ended.
+
+          t_err.join
+          t_out.join
+        end
+      end
+    end
+
+
     def check_exit_status(output)
       if $?.exitstatus != 0
         puts "Output:\n#{output}\nExit status = #{$?.exitstatus} ->Terminate script."
@@ -208,6 +258,10 @@ module BumperPusher
       result, versions_array = find_version_in_file(version_file)
       bumped_version = bump_version(versions_array)
 
+      if is_gitflow_installed && !@options[:beta]
+        execute_line_if_not_dry_run("git flow release start #{bumped_version}")
+      end
+
       if @options[:bump]
         execute_line_if_not_dry_run("sed -i \"\" \"s/#{result}/#{bumped_version}/\" README.md")
         execute_line_if_not_dry_run("sed -i \"\" \"s/#{result}/#{bumped_version}/\" #{version_file}")
@@ -215,15 +269,19 @@ 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
+          execute_line_if_not_dry_run("git flow release finish -n #{bumped_version}")
+        end
+
         execute_line_if_not_dry_run("git tag #{bumped_version}")
+
       end
 
       if @options[:push]
         execute_line_if_not_dry_run('git push')
         execute_line_if_not_dry_run('git push --tags')
-      end
 
-      if @options[:push]
         if @spec_mode == POD_SPEC_TYPE
           execute_line_if_not_dry_run("pod trunk push #{@spec_file}")
         else
@@ -247,7 +305,7 @@ module BumperPusher
         if @spec_mode == GEM_SPEC_TYPE
           execute_line_if_not_dry_run("gem build #{@spec_file}")
           gem = find_current_gem_file
-          execute_line_if_not_dry_run("gem install #{gem}")
+          execute_interactive_if_not_dry_run("gem install #{gem}")
 
           execute_line_if_not_dry_run("sed -i \"\" \"s/#{bumped_version}/#{result}/\" README.md")
           execute_line_if_not_dry_run("sed -i \"\" \"s/#{bumped_version}/#{result}/\" #{version_file}")
@@ -299,5 +357,15 @@ module BumperPusher
       execute_line_if_not_dry_run('git reset --hard HEAD~1')
       execute_line_if_not_dry_run("git push --delete origin #{result}")
     end
+
+    def is_gitflow_installed()
+      system("git flow version")? true : false
+    end
   end
+
+end
+
+if $0 == __FILE__
+  puts "bumper.rb self run"
+  BumperPusher::Bumper.new({}).execute_interactive_if_not_dry_run("pwd")
 end

data/lib/bumper_pusher/version.rb

@@ -1,3 +1,3 @@
 module BumperPusher
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bumper_pusher
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Petr Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-description: Easiest way to bump your specs
+description: Bumping and pushing your ruby gems easy and fast!
 email:
 - sky4winder@gmail.com
 executables:
@@ -72,7 +72,7 @@ files:
 - lib/bumper_pusher/bumper.rb
 - lib/bumper_pusher/parser.rb
 - lib/bumper_pusher/version.rb
-homepage: ''
+homepage: https://github.com/skywinder/bumper_pusher
 licenses:
 - MIT
 metadata: {}
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Easiest way to bump your specs