bumper_pusher 0.1.19 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a9c5cd1665ac64509ae6bbf4b100fb27b849f4e
-  data.tar.gz: f9485c660084ebf25899dd2882437a2b8f47646b
+  metadata.gz: 6dc5d4fcc685a0acc2de47503b2b698495e597b3
+  data.tar.gz: f9247122e1c0a2f5f5eb91e786704680ce85f883
 SHA512:
-  metadata.gz: e4752e488a17bba0be91d952128286195d29c056250ac747528db9201206ae279631f7ad73df5e67024ccdf2cf26add89fcb8f600273ae2172124a761f2f0772
-  data.tar.gz: fcac06d720762eed85d7787331ffb22e32fb1c597793c53c5d09418f9d407c6dea9a083572a73e202e6b068cb97c3465d4ca9ed382f20f22492a63c18ea7f311
+  metadata.gz: c8893da349684ec06a7fc39299e892416d94d067b59af8f9733b97bbc004beaa3a7e4718d11254e48dfac6561072ff1957df71e4a5535ee0d61946eef9584290
+  data.tar.gz: ccc1b36afc38b2a3dc87e5c1664d9d38676c83a89512adc6d94c34bcf53e0e6bc88df49c7d44ebe9c3136ebf28be186ae133f0901823f1c394ef7de74f161d6b

data/.rubocop.yml

@@ -0,0 +1,9 @@
+inherit_from: .rubocop_todo.yml
+
+Metrics/LineLength:
+  Enabled: false
+
+#http://viget.com/extend/just-use-double-quoted-ruby-strings
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 # Specify your gem's dependencies in bumper_pusher.gemspec
 gemspec

data/Rakefile

@@ -1,4 +1,4 @@
-task default: %w[test]
+task default: %w(test)
 
 task :test do
 end

data/bin/bumper_pusher

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'bumper_pusher'
+require "bumper_pusher"
 
 BumperPusher::Pusher.new

data/bumper_pusher.gemspec

@@ -1,17 +1,17 @@
 # coding: utf-8
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'bumper_pusher/version'
+require "bumper_pusher/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "bumper_pusher"
   spec.version       = BumperPusher::VERSION
   spec.authors       = ["Petr Korolev"]
   spec.email         = ["sky4winder@gmail.com"]
-  spec.summary       = %q{Easiest way to bump your specs}
-  spec.description   = %q{Bumping and pushing your ruby gems easy and fast!}
-  spec.homepage      = %q{https://github.com/skywinder/bumper_pusher}
+  spec.summary       = "Easiest way to bump your specs"
+  spec.description   = "Bumping and pushing your ruby gems easy and fast!"
+  spec.homepage      = "https://github.com/skywinder/bumper_pusher"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   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")
+  spec.add_runtime_dependency("colorize", ["~> 0.7"])
+  spec.add_runtime_dependency("github_changelog_generator", ">= 1.2", "< 5.0")
 end

data/lib/bumper_pusher/bumper.rb

@@ -1,13 +1,11 @@
-require 'colorize'
+require "colorize"
 require "readline"
-require 'open3'
+require "open3"
 module BumperPusher
-
-  POD_SPEC_TYPE = 'podspec'
-  GEM_SPEC_TYPE = 'gemspec'
+  POD_SPEC_TYPE = "podspec"
+  GEM_SPEC_TYPE = "gemspec"
 
   class Bumper
-
     @spec_mode
 
     def initialize(options)
@@ -16,10 +14,10 @@ module BumperPusher
     end
 
     def check_repo_is_clean_or_dry_run
-      value =%x[#{'git status --porcelain'}]
+      value = `#{"git status --porcelain"}`
 
       if value.empty?
-        puts 'Repo is clean -> continue'
+        puts "Repo is clean -> continue"
       else
         if @options[:dry_run]
           puts 'Repo not clean, "Dry run" enabled -> continue'
@@ -27,7 +25,7 @@ module BumperPusher
           if @options[:beta]
             puts 'Repo not clean, "Beta build" enabled -> continue'
           else
-            puts 'Repository not clean -> exit'
+            puts "Repository not clean -> exit"
             exit
           end
         end
@@ -39,13 +37,13 @@ module BumperPusher
 
         if is_git_flow_installed
           # supposed, that with git flow you should release from develop branch
-          if current_branch != 'develop' && !is_branch_hotfix?
+          if current_branch != "develop" && !is_branch_hotfix?
             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?
+          if current_branch != "master" || !/release/.match(current_branch)[0].nil?
             puts "Warning: You're in branch (#{current_branch})!".yellow
             ask_sure_y
           end
@@ -58,23 +56,21 @@ module BumperPusher
       `git rev-parse --abbrev-ref HEAD`.strip!
     end
 
-
     def find_spec_file
-
       pod_arr = execute_line("find . -name '*.#{POD_SPEC_TYPE}'  -maxdepth 1").split("\n")
       gem_arr = execute_line("find . -name '*.#{GEM_SPEC_TYPE}' -maxdepth 1").split("\n")
       if gem_arr.any? && pod_arr.any?
-        puts 'Warning: both podspec and gemspec found!'.yellow
+        puts "Warning: both podspec and gemspec found!".yellow
       end
       all_specs = gem_arr | pod_arr
 
-      spec_file = ''
+      spec_file = ""
 
       case all_specs.count
         when 0
-          puts 'No spec files found. -> Exit.'
+          puts "No spec files found. -> Exit."
           if is_debug?
-            puts 'Debug -> set @spec_mode to gem -> continue'
+            puts "Debug -> set @spec_mode to gem -> continue"
             @spec_mode = GEM_SPEC_TYPE
           else
             exit
@@ -82,13 +78,13 @@ module BumperPusher
         when 1
           spec_file = all_specs[0]
         else
-          puts 'Which spec should be used?'
-          all_specs.each_with_index { |file, index| puts "#{index+1}. #{file}" }
+          puts "Which spec should be used?"
+          all_specs.each_with_index { |file, index| puts "#{index + 1}. #{file}" }
           input_index = Integer(gets.chomp)
-          spec_file = all_specs[input_index-1]
+          spec_file = all_specs[input_index - 1]
       end
 
-      if spec_file == nil
+      if spec_file.nil?
         puts "Can't find specified spec file -> exit"
         exit
       end
@@ -96,76 +92,68 @@ module BumperPusher
       if gem_arr.include?(spec_file)
         @spec_mode = GEM_SPEC_TYPE
       else
-        if pod_arr.include?(spec_file)
-          @spec_mode = POD_SPEC_TYPE
-        else
-
-        end
+        @spec_mode = POD_SPEC_TYPE if pod_arr.include?(spec_file)
 
       end
 
-      spec_file.sub('./', '')
-
+      spec_file.sub("./", "")
     end
 
     def is_debug?
-      (ENV['RUBYLIB'] =~ /ruby-debug-ide/) ? true : false
+      (ENV["RUBYLIB"] =~ /ruby-debug-ide/) ? true : false
     end
 
     def find_current_gem_file
       list_of_specs = execute_line("find . -name '*.gem' -maxdepth 1")
       arr = list_of_specs.split("\n")
 
-      spec_file = ''
+      spec_file = ""
 
       case arr.count
         when 0
-          if @options[:dry_run]
-            return "test.#{POD_SPEC_TYPE}"
-          end
+          return "test.#{POD_SPEC_TYPE}" if @options[:dry_run]
           puts "No #{POD_SPEC_TYPE} files found. -> Exit."
           exit
         when 1
           spec_file = arr[0]
         else
-          puts 'Which spec should be used?'
-          arr.each_with_index { |file, index| puts "#{index+1}. #{file}" }
+          puts "Which spec should be used?"
+          arr.each_with_index { |file, index| puts "#{index + 1}. #{file}" }
           input_index = Integer(gets.chomp)
-          spec_file = arr[input_index-1]
+          spec_file = arr[input_index - 1]
       end
 
-      if spec_file == nil
+      if spec_file.nil?
         puts "Can't find specified spec file -> exit"
         exit
       end
 
-      spec_file.sub('./', '')
-
+      spec_file.sub("./", "")
     end
 
     def find_version_in_file(podspec)
       readme = File.read(podspec)
 
-      #try to find version in format 1.22.333
+      # try to find version in format 1.22.333
       re = /(\d+)\.(\d+)\.(\d+)/m
 
       match_result = re.match(readme)
 
       unless match_result
-        puts 'Not found any versions'
+        puts "Not found any versions"
         exit
       end
 
       puts "Found version #{match_result[0]}"
-      return match_result[0], match_result.captures
+      [match_result[0], match_result.captures]
     end
 
     def bump_version(versions_array)
       bumped_result = versions_array.dup
-      bumped_result.map! { |x| x.to_i }
+      bumped_result.map!(&:to_i)
 
       if @options[:beta]
-        bumped_version = versions_array.join('.') + '.1'
+        bumped_version = versions_array.join(".") + ".1"
       else
         case @options[:bump_number]
           when :major
@@ -178,26 +166,24 @@ module BumperPusher
           when :patch
             bumped_result[2] += 1
           else
-            raise('unknown bump_number')
+            fail("unknown bump_number")
         end
-        bumped_version = bumped_result.join('.')
+        bumped_version = bumped_result.join(".")
       end
 
       puts "Bump version: #{versions_array.join('.')} -> #{bumped_version}"
 
-      unless @options[:dry_run] || @options[:beta]
-        ask_sure_y
-      end
+      ask_sure_y unless @options[:dry_run] || @options[:beta]
 
       bumped_version
     end
 
     def ask_sure_y
       unless @options[:dry_run]
-        puts 'Are you sure? Press Y to continue:'
+        puts "Are you sure? Press Y to continue:"
         str = gets.chomp
-        if str != 'Y'
-          puts '-> exit'
+        if str != "Y"
+          puts "-> exit"
           exit
         end
       end
@@ -210,15 +196,15 @@ module BumperPusher
       output
     end
 
-# @param [Object] line
-# @param [Object] check_exit
+    # @param [Object] line
+    # @param [Object] check_exit
     def execute_line_if_not_dry_run(line, check_exit = true)
       if @options[:dry_run]
         puts "Dry run: #{line}"
         check_exit ? nil : 0
       else
         puts line
-        value = %x[#{line}]
+        value = `#{line}`
         if check_exit
           puts value
           check_exit_status(value)
@@ -236,25 +222,25 @@ module BumperPusher
       else
         Open3.popen3(cmd) do |i, o, e, th|
           Thread.new {
-            until i.closed? do
-              input =Readline.readline("", true).strip
+            until i.closed?
+              input = Readline.readline("", true).strip
               i.puts input
             end
           }
 
           t_err = Thread.new {
-            until e.eof? do
-              putc e.readchar
-            end
+            putc e.readchar until e.eof?
           }
 
           t_out = Thread.new {
-            until o.eof? do
-              putc o.readchar
-            end
+            putc o.readchar until o.eof?
           }
 
-          Process::waitpid(th.pid) rescue nil
+          begin
+            Process.waitpid(th.pid)
+          rescue
+            nil
+          end
           # "rescue nil" is there in case process already ended.
 
           t_err.join
@@ -263,7 +249,6 @@ module BumperPusher
       end
     end
 
-
     def check_exit_status(output)
       if $?.exitstatus != 0
         puts "Output:\n#{output}\nExit status = #{$?.exitstatus} ->Terminate script."
@@ -272,26 +257,22 @@ module BumperPusher
     end
 
     def run_bumping_script
-
       check_repo_is_clean_or_dry_run
 
       unless @options[:beta]
-        unless is_branch_hotfix?
-          execute_line_if_not_dry_run('git pull')
-        end
+        execute_line_if_not_dry_run("git pull") unless is_branch_hotfix?
         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 pull --all')
-        execute_line_if_not_dry_run('git push --all')
+        execute_line_if_not_dry_run("git pull --all")
+        execute_line_if_not_dry_run("git push --all")
       end
 
       version_file = find_version_file
       result, versions_array = find_version_in_file(version_file)
       bumped_version = bump_version(versions_array)
 
-
       unless @options[:beta]
-        execute_line_if_not_dry_run('git push --all')
+        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}")
         end
@@ -302,12 +283,20 @@ module BumperPusher
         execute_line_if_not_dry_run("sed -i \"\" \"s/#{result}/#{bumped_version}/\" #{version_file}")
       end
 
+      gem = find_current_gem_file
+      execute_line_if_not_dry_run("gem build #{@spec_file}")
+      if @options[:install]
+        if @spec_mode == GEM_SPEC_TYPE
+          execute_line_if_not_dry_run("gem install #{gem}")
+        end
+      end
+
       if @options[:commit]
         execute_line_if_not_dry_run("git commit --all -m \"Update #{@spec_mode} to version #{bumped_version}\"")
 
         if is_git_flow_installed
           if is_branch_hotfix?
-            branch_split = get_current_branch.split('/').last
+            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
               ask_to_merge
               execute_line_if_not_dry_run("git flow hotfix finish -n #{branch_split}")
@@ -318,32 +307,25 @@ module BumperPusher
               execute_line_if_not_dry_run("git flow release finish -n #{bumped_version}")
             end
           end
-          execute_line_if_not_dry_run('git checkout master')
+          execute_line_if_not_dry_run("git checkout master")
         end
-        execute_line_if_not_dry_run('git push --all')
+        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')
-
+        execute_line_if_not_dry_run("git push --all")
+        execute_line_if_not_dry_run("git push --tags")
 
         if @spec_mode == POD_SPEC_TYPE
           execute_line_if_not_dry_run("pod trunk push #{@spec_file}")
         else
           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 push #{gem}")
 
-            if @options[:install]
-              execute_line_if_not_dry_run("gem install #{gem}")
-            end
-
             execute_line_if_not_dry_run("rm #{gem}")
           else
-            raise 'Unknown spec type'
+            fail "Unknown spec type"
           end
         end
       end
@@ -358,45 +340,43 @@ module BumperPusher
           execute_line_if_not_dry_run("sed -i \"\" \"s/#{bumped_version}/#{result}/\" #{version_file}")
           execute_line_if_not_dry_run("rm #{gem}")
         else
-          raise 'Unknown spec type'
+          fail "Unknown spec type"
         end
       end
 
-
       if @options[:changelog] && !@options[:beta]
         if `which github_changelog_generator`.empty?
-          puts 'Cancelled bumping: no github_changelog_generator gem found'
+          puts "Cancelled bumping: no github_changelog_generator gem found"
         else
 
           if is_git_flow_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")
           end
-          execute_line_if_not_dry_run('github_changelog_generator')
+          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
-            unless execute_line_if_not_dry_run('git flow hotfix finish -n update-changelog', check_exit = false) == 0
+            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')
+              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')
+            execute_line_if_not_dry_run("git push")
           end
 
         end
       end
-
     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'
+      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'
+      if str == "N"
+        puts "-> exit"
         exit
       end
     end
@@ -411,42 +391,40 @@ module BumperPusher
           puts "version.rb file found (#{arr[0]}) -> bump this file"
           version_file = arr[0]
         else
-          puts 'More than 1 version.rb file found. -> skip'
+          puts "More than 1 version.rb file found. -> skip"
       end
 
-      version_file ? version_file.sub('./', '') : @spec_file
+      version_file ? version_file.sub("./", "") : @spec_file
     end
 
     def revert_last_bump
       spec_file = @spec_file
-      result, _ = find_version_in_file(spec_file)
+      result, = find_version_in_file(spec_file)
 
       puts "DELETE tag #{result} and HARD reset HEAD~1?\nPress Y to continue:"
       str = gets.chomp
-      if str != 'Y'
-        puts '-> exit'
+      if str != "Y"
+        puts "-> exit"
         exit
       end
       execute_line_if_not_dry_run("git tag -d #{result}")
-      execute_line_if_not_dry_run('git reset --hard HEAD~1')
+      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_git_flow_installed
-      system('git flow version') ? true : false
+      system("git flow version") ? true : false
     end
 
     def is_branch_hotfix?
       branch = get_current_branch
-      branch.include? 'hotfix'
+      branch.include? "hotfix"
     end
-
   end
-
 end
 
-if $0 == __FILE__
-  puts 'bumper.rb self run'
+if $PROGRAM_NAME == __FILE__
+  puts "bumper.rb self run"
 
   BumperPusher::Bumper.new({}).execute_interactive_if_not_dry_run("pwd")
 end

data/lib/bumper_pusher/parser.rb

@@ -1,55 +1,51 @@
 #!/usr/bin/env ruby
-require 'optparse'
+require "optparse"
 
 module BumperPusher
-
   class Parser
-
     def initialize
-
     end
 
     def parse_options
-      options = {:dry_run => false, :bump_number => :patch, :changelog => true, :bump => true, :commit => true, :build => true, :push => true, :install => true}
+      options = { dry_run: false, bump_number: :patch, changelog: true, bump: true, commit: true, build: true, push: true, install: true }
 
-      OptionParser.new { |opts|
-        opts.banner = 'Usage: bumper_pusher [options]'
+      OptionParser.new do |opts|
+        opts.banner = "Usage: bumper_pusher [options]"
 
-        opts.on('-d', '--dry-run', 'Dry run') do |v|
+        opts.on("-d", "--dry-run", "Dry run") do |v|
           options[:dry_run] = v
         end
-        opts.on('-r', '--release', 'Bump release version') do |v|
+        opts.on("-r", "--release", "Bump release version") do |_v|
           options[:bump_number] = :major
         end
-        opts.on('-m', '--minor', 'Bump minor version') do |v|
+        opts.on("-m", "--minor", "Bump minor version") do |_v|
           options[:bump_number] = :minor
         end
-        opts.on('-p', '--patch', 'Bump patch version') do |v|
+        opts.on("-p", "--patch", "Bump patch version") do |_v|
           options[:bump_number] = :patch
         end
-        opts.on('-r', '--revert', 'Revert last bump') do |v|
+        opts.on("-r", "--revert", "Revert last bump") do |v|
           options[:revert] = v
         end
-        opts.on('-i', '--[no-]install', 'Install this gem after push it. Default is true.') do |v|
+        opts.on("-i", "--[no-]install", "Install this gem after push it. Default is true.") do |v|
           options[:install] = v
         end
-        opts.on('-b', '--beta', 'Build beta gem without commit and push') do |v|
+        opts.on("-b", "--beta", "Build beta gem without commit and push") do |v|
           options[:beta] = v
           options[:bump] = v
           options[:build] = v
           options[:commit] = !v
           options[:push] = !v
-
         end
-        opts.on('-v', '--version', 'Print version number') do |v|
+        opts.on("-v", "--version", "Print version number") do |_v|
           puts "Version: #{BumperPusher::VERSION}"
           exit
         end
-        opts.on('-c', '--[no]-changelog', 'Auto generation of changelog and pushing it origin. Default is true') do |v|
+        opts.on("-c", "--[no]-changelog", "Auto generation of changelog and pushing it origin. Default is true") do |v|
           options[:changelog] = v
         end
-      }.parse!
+      end.parse!
       options
     end
   end
-end
+end

data/lib/bumper_pusher/version.rb

@@ -1,3 +1,3 @@
 module BumperPusher
-  VERSION = "0.1.19"
+  VERSION = "0.2.0"
 end

data/lib/bumper_pusher.rb

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
-require_relative 'bumper_pusher/version'
-require_relative 'bumper_pusher/parser'
-require_relative 'bumper_pusher/bumper'
+require_relative "bumper_pusher/version"
+require_relative "bumper_pusher/parser"
+require_relative "bumper_pusher/bumper"
 
 module BumperPusher
-
   class Pusher
     attr_reader :options
     def initialize
@@ -19,14 +18,8 @@ module BumperPusher
       else
         @parser.run_bumping_script
       end
-
     end
   end
-
-
 end
 
-if $0 == __FILE__
-  bumper = BumperPusher::Pusher.new
-
-end
+bumper = BumperPusher::Pusher.new if $PROGRAM_NAME == __FILE__

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumper_pusher
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.2.0
 platform: ruby
 authors:
 - Petr Korolev
@@ -81,6 +81,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile