bump 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1667a11fae813507f2b4f6a105774f96f9a28a2d
-  data.tar.gz: bdc45d4d01fe2753c5711e39c516170abda8740f
+  metadata.gz: 17af1c7f47a19abd1ace6aee8345088421e47453
+  data.tar.gz: ab54a763ebe1126c7b0322b70373818fa89620cb
 SHA512:
-  metadata.gz: 672a2823801f52f781f06d677ec8d7e53318bdf766675b674707e9c2288be6066b4912b122f3dc4824e15fc96ae4f8e1245545be92876168b1c7d47fdd25cb40
-  data.tar.gz: bce54abe9b989efa56252c060aae3ffcf0c543a2e40149d5bce9df4ff2fbadddfd3d41b5548f5d5c7ee52aea0dda8e4202d25f795105964677e3a10b34c12b85
+  metadata.gz: bba34c35004146cb1a70caa0393755f983dab7ea2008fb540297a48ce6f06054e5ff4b2db6c4022c3e563494ba60224a3d856aec27a9763ecf01bf163de2e6f8
+  data.tar.gz: 07c299ca4ee9e13c0b7d35f65119dbd93dc55fac9d68f53b6351e89f6e74dff09c48a568679295c780768b64177ae68b3805bba65ceee4dc4650c40a69ffe5b9

data/README.md

@@ -49,6 +49,12 @@ If you don't want to run the `bundle` command after bumping, add the `--no-bundl
 
     bump patch --no-bundle
 
+### `--replace-in`
+
+If you want to bump the version in additional files
+
+    bump patch --reaplace-in Readme.md
+
 ### `--commit-message [MSG], -m [MSG]`
 
 If you want to append additional information to the commit message, pass it in using the `--commit-message [MSG]` or `-m [MSG]` option.
@@ -69,6 +75,8 @@ require "bump/tasks"
 # if you want to always tag the version, add:
 # Bump.tag_by_default = true
 #
+# if you want to bump the version in additional files, add:
+# Bump.replace_in_default = ["Readme.md"]
 
 ```
 

data/bin/bump

@@ -3,25 +3,26 @@ require 'optparse'
 
 options = {}
 OptionParser.new do |opts|
-  opts.banner = <<BANNER
-Bump your gem version.
+  opts.banner = <<-BANNER.gsub(/^    /, "")
+    Bump your gem version.
 
-Usage:
-    bump current    # show current version
-    bump file       # show version file path
-    bump pre        # increase prerelease version of your gem (1.0.0-X) [alpha, beta, rc, ]
-    bump patch      # increase patch version of your gem (1.0.X)
-    bump minor      # increase minor version of your gem (1.X.0)
-    bump major      # increase major version of your gem (X.0.0)
-    bump set 1.2.3  # set the version number to the given value
+    Usage:
+        bump current    # show current version
+        bump file       # show version file path
+        bump pre        # increase prerelease version of your gem (1.0.0-X) [alpha, beta, rc, ]
+        bump patch      # increase patch version of your gem (1.0.X)
+        bump minor      # increase minor version of your gem (1.X.0)
+        bump major      # increase major version of your gem (X.0.0)
+        bump set 1.2.3  # set the version number to the given value
 
-Options:
-BANNER
+    Options:
+  BANNER
   opts.on("--no-commit", "Do not make a commit.") { options[:commit] = false }
-  opts.on("-m","--commit-message [MSG]", "Append MSG to the commit message.") {|msg| options[:commit_message] = msg }
+  opts.on("-m", "--commit-message MSG", String, "Append MSG to the commit message.") { |msg| options[:commit_message] = msg }
   opts.on("--no-bundle", "Do not bundle.") { options[:bundle] = false }
   opts.on("--tag", "Create git tag from version (only if commit is true).") { options[:tag] = true }
-  opts.on("-h", "--help","Show this.") { puts opts; exit }
+  opts.on("--replace-in FILE", String, "Replace old version with the new version additionally in this file") { |f| (options[:replace_in] ||= []) << f }
+  opts.on("-h", "--help", "Show this.") { puts opts; exit }
 end.parse!
 
 unless (ARGV.size == 1 && ARGV.first != "set") || (ARGV.size == 2 && ARGV.first == "set")
@@ -29,9 +30,7 @@ unless (ARGV.size == 1 && ARGV.first != "set") || (ARGV.size == 2 && ARGV.first
   exit 1
 end
 
-if ARGV.first == "set"
-  options[:version] = ARGV[1]
-end
+options[:version] = ARGV[1] if ARGV[0] == "set"
 
 require File.dirname(__FILE__) + '/../lib/bump'
 output, status = Bump::Bump.run(ARGV.first, options)

data/lib/bump.rb

@@ -7,33 +7,35 @@ module Bump
   class RakeArgumentsDeprecatedError < StandardError; end
 
   class <<self
-    attr_accessor :tag_by_default
+    attr_accessor :tag_by_default, :replace_in_default
   end
 
   class Bump
-    BUMPS         = %w(major minor patch pre)
-    PRERELEASE    = ["alpha","beta","rc",nil]
+    BUMPS         = ["major", "minor", "patch", "pre"].freeze
+    PRERELEASE    = ["alpha", "beta", "rc", nil].freeze
     OPTIONS       = BUMPS | ["set", "current", "file"]
-    VERSION_REGEX = /(\d+\.\d+\.\d+(?:-(?:#{PRERELEASE.compact.join('|')}))?)/
+    VERSION_REGEX = /(\d+\.\d+\.\d+(?:-(?:#{PRERELEASE.compact.join('|')}))?)/.freeze
 
     class << self
-
       def defaults
         {
-          :tag => ::Bump.tag_by_default,
-          :commit => true,
-          :bundle => File.exist?("Gemfile")
+          tag: ::Bump.tag_by_default,
+          commit: true,
+          bundle: File.exist?("Gemfile"),
+          replace_in: ::Bump.replace_in_default || []
         }
       end
 
-      def run(bump, options={})
+      def run(bump, options = {})
         options = defaults.merge(options)
+        options[:commit] = false unless File.directory?(".git")
 
         case bump
         when *BUMPS
           bump_part(bump, options)
         when "set"
           raise InvalidVersionError unless options[:version]
+
           bump_set(options[:version], options)
         when "current"
           ["Current version: #{current}", 0]
@@ -66,7 +68,7 @@ module Bump
         options.each do |key, value|
           options[key] = parse_cli_options_value(value)
         end
-        options.delete_if{|key, value| value.nil?}
+        options.delete_if { |_key, value| value.nil? }
       end
 
       private
@@ -82,13 +84,26 @@ module Bump
       end
 
       def bump(file, current, next_version, options)
-        replace(file, current, next_version)
-        if options[:bundle] and Dir.glob('*.gemspec').any? and under_version_control?("Gemfile.lock")
+        # bump in files that need to change
+        [file, *options[:replace_in]].each do |f|
+          return ["Unable to find version #{current} in #{f}", 1] unless replace f, current, next_version
+
+          git_add f if options[:commit]
+        end
+
+        # bundle if needed
+        if options[:bundle] && Dir.glob('*.gemspec').any? && under_version_control?("Gemfile.lock")
           bundler_with_clean_env do
             return ["Bundle error", 1] unless system("bundle")
+
+            git_add "Gemfile.lock" if options[:commit]
           end
         end
-        commit(next_version, file, options) if options[:commit]
+
+        # commit staged changes
+        commit next_version, options if options[:commit]
+
+        # tell user the result
         ["Bump version #{current} to #{next_version}", 0]
       end
 
@@ -112,19 +127,24 @@ module Bump
       end
 
       def commit_message(version, options)
-        (options[:commit_message]) ? "v#{version} #{options[:commit_message]}" : "v#{version}"
+        base = "v#{version}"
+        options[:commit_message] ? "#{base} #{options[:commit_message]}" : base
+      end
+
+      def commit(version, options)
+        system("git", "commit", "-m", commit_message(version, options))
+        system("git", "tag", "-a", "-m", "Bump to v#{version}", "v#{version}") if options[:tag]
       end
 
-      def commit(version, file, options)
-        return unless File.directory?(".git")
-        system("git add --update Gemfile.lock") if options[:bundle]
-        system("git add --update #{file} && git commit -m '#{commit_message(version, options)}'")
-        system("git tag -a -m 'Bump to v#{version}' v#{version}") if options[:tag]
+      def git_add(file)
+        system("git", "add", "--update", file)
       end
 
       def replace(file, old, new)
         content = File.read(file)
-        File.open(file, "w"){|f| f.write(content.sub(old, new)) }
+        return unless content.sub!(old, new)
+
+        File.write(file, content)
       end
 
       def current_info
@@ -132,18 +152,25 @@ module Bump
           version_from_version ||
           version_from_version_rb ||
           version_from_gemspec ||
-          version_from_lib_rb  ||
-          version_from_chef  ||
+          version_from_lib_rb ||
+          version_from_chef ||
           raise(UnfoundVersionFileError)
         )
         raise UnfoundVersionError unless version
+
         [version, file]
       end
 
       def version_from_gemspec
-        return unless file    = find_version_file("*.gemspec")
-        version               = File.read(file)[/\.version\s*=\s*["']#{VERSION_REGEX}["']/, 1]
-        return unless version = File.read(file)[/Gem::Specification.new.+ ["']#{VERSION_REGEX}["']/, 1] if version.nil?
+        return unless file = find_version_file("*.gemspec")
+
+        content = File.read(file)
+        version = (
+          content[/\.version\s*=\s*["']#{VERSION_REGEX}["']/, 1] ||
+          File.read(file)[/Gem::Specification.new.+ ["']#{VERSION_REGEX}["']/, 1]
+        )
+        return unless version
+
         [version, file]
       end
 
@@ -158,6 +185,7 @@ module Bump
 
       def version_from_version
         return unless file = find_version_file("VERSION")
+
         extract_version_from_file(file)
       end
 
@@ -166,17 +194,19 @@ module Bump
         file = files.detect do |f|
           File.read(f) =~ /^\s+VERSION = ['"](#{VERSION_REGEX})['"]/i
         end
-        [$1, file] if file
+        [Regexp.last_match(1), file] if file
       end
 
       def version_from_chef
         file = find_version_file("metadata.rb")
         return unless file && File.read(file) =~ /^version\s+(['"])(#{VERSION_REGEX})['"]/
-        [$2, file]
+
+        [Regexp.last_match(2), file]
       end
 
       def extract_version_from_file(file)
         return unless version = File.read(file)[VERSION_REGEX]
+
         [version, file]
       end
 
@@ -195,9 +225,14 @@ module Bump
         major, minor, patch, *other = current.split('.')
         case part
         when "major"
-          major, minor, patch, prerelease = major.succ, 0, 0, nil
+          major = major.succ
+          minor = 0
+          patch = 0
+          prerelease = nil
         when "minor"
-          minor, patch, prerelease = minor.succ, 0, nil
+          minor = minor.succ
+          patch = 0
+          prerelease = nil
         when "patch"
           patch = patch.succ
         when "pre"

data/lib/bump/tasks.rb

@@ -17,8 +17,12 @@ namespace :bump do
     end
 
     task bump, :tag do |_task, args|
-      raise RakeArgumentsDeprecatedError,
-        "rake arguments are deprecated, use TAG=false to disable tagging" if args.tag
+      if args.tag
+        raise(
+          RakeArgumentsDeprecatedError,
+          "rake arguments are deprecated, use TAG=false to disable tagging"
+        )
+      end
       options = {
         tag: ENV['TAG'],
         commit: ENV['COMMIT'],
@@ -30,6 +34,6 @@ namespace :bump do
 
   desc "Sets the version number using the VERSION environment variable"
   task :set do
-    run_bump.call("set", :version => ENV['VERSION'])
+    run_bump.call("set", version: ENV['VERSION'])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bump
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Gregory Marcilhacy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: g.marcilhacy@gmail.com
 executables:
@@ -75,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="