bump 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17af1c7f47a19abd1ace6aee8345088421e47453
-  data.tar.gz: ab54a763ebe1126c7b0322b70373818fa89620cb
+  metadata.gz: 83453453cffa0d63a765fc4fb7aa084d7a992da4
+  data.tar.gz: f4db814fff42565eee6927dc941b026c282939df
 SHA512:
-  metadata.gz: bba34c35004146cb1a70caa0393755f983dab7ea2008fb540297a48ce6f06054e5ff4b2db6c4022c3e563494ba60224a3d856aec27a9763ecf01bf163de2e6f8
-  data.tar.gz: 07c299ca4ee9e13c0b7d35f65119dbd93dc55fac9d68f53b6351e89f6e74dff09c48a568679295c780768b64177ae68b3805bba65ceee4dc4650c40a69ffe5b9
+  metadata.gz: 9e74704154155f9ddb50c45b40a802b6a7a0088e07a7dd073fe1ee11e0580765f1a7add70ababfc247580230a700c3707d4ff75afea36f0bd8dac9c1c11792af
+  data.tar.gz: 9e892e2d1e59aa12abeab19e5fdff8b54594aa9c8912404d0fd503f64a0628a4601ae81d8fbe63406663e32c3bb6e70fe295234f773b017c0e4fe64e085e5c22

data/README.md

@@ -17,6 +17,12 @@ Current version:
 
 > Current version: 0.1.2
 
+Show next patch version:
+
+    bump show-next patch
+
+> Next patch version: 0.1.3
+
 Version file path:
 
     bump file
@@ -39,10 +45,15 @@ If you don't want to make a commit after bumping, add the `--no-commit` option.
 
 ### `--tag`
 
-Will add a git tag (if the current project is a git repository and `--no-commit` has not been given).
+Will add a git tag like `v1.2.3` (if the current project is a git repository and `--no-commit` has not been given).
 
     bump patch --tag
 
+The `--tag-prefix` option can change the tag prefix:
+
+    bump patch --tag --tag-prefix v-     # tag as v-1.2.3
+    bump patch --tag --tag-prefix ""     # tag as 1.2.3
+
 ### `--no-bundle`
 
 If you don't want to run the `bundle` command after bumping, add the `--no-bundle` option.
@@ -81,6 +92,7 @@ require "bump/tasks"
 ```
 
     rake bump:current                           # display current version
+    rake bump:show-next INCREMENT=minor         # display next minor version
     rake bump:file                              # display version file path
 
     # bumping using defaults for `COMMIT`, `TAG`, and `BUNDLE`
@@ -91,6 +103,7 @@ require "bump/tasks"
 
     # bumping with option(s)
     rake bump:patch TAG=false BUNDLE=false      # commit, but don't tag or run `bundle`
+    rake bump:patch TAG=true TAG_PREFIX=v-      # tag with a prefix 'v-' ex. the tag will look like v-0.0.1
     rake bump:patch COMMIT=false TAG=false      # don't commit, don't tag
     rake bump:minor BUNDLE=false                # don't run `bundle`
 
@@ -99,8 +112,10 @@ require "bump/tasks"
 ```ruby
 require "bump"
 Bump::Bump.current        # -> "1.2.3"
+Bump::Bump.next_version("patch")        # -> "1.2.4"
 Bump::Bump.file           # -> "lib/foo/version.rb"
 Bump::Bump.run("patch")   # -> version changed
+Bump::Bump.run("patch", tag: true, tag_prefix: 'v-') # -> version changed with tagging with '-v' as prefix
 Bump::Bump.run("patch", commit: false, bundle:false, tag:false) # -> version changed with options
 Bump::Bump.run("patch", commit_message: '[no ci]') # -> creates a commit message with 'v1.2.3 [no ci]' instead of default: 'v1.2.3'
 ```

data/bin/bump

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'optparse'
+require 'shellwords'
 
 options = {}
 OptionParser.new do |opts|
@@ -7,13 +8,14 @@ OptionParser.new do |opts|
     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
+        bump current              # show current version
+        bump show-next INCREMENT  # show next (pre|patch|minor|major) version of your gem
+        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
@@ -21,16 +23,16 @@ OptionParser.new do |opts|
   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("--tag-prefix TAG_PREFIX", "Prefix the tag with this string, ex. 'v'") { |tag_prefix| options[:tag_prefix] = tag_prefix }
   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")
-  puts "Usage instructions: bump --help"
-  exit 1
-end
+valid_argv = ["set", "show-next"].include?(ARGV.first) ? 2 : 1
+abort "Usage instructions: bump --help" unless ARGV.size == valid_argv
 
 options[:version] = ARGV[1] if ARGV[0] == "set"
+options[:increment] = ARGV[1] if ARGV[0] == "show-next"
 
 require File.dirname(__FILE__) + '/../lib/bump'
 output, status = Bump::Bump.run(ARGV.first, options)

data/lib/bump.rb

@@ -1,4 +1,5 @@
 module Bump
+  class InvalidIncrementError < StandardError; end
   class InvalidOptionError < StandardError; end
   class InvalidVersionError < StandardError; end
   class UnfoundVersionError < StandardError; end
@@ -20,6 +21,7 @@ module Bump
       def defaults
         {
           tag: ::Bump.tag_by_default,
+          tag_prefix: 'v',
           commit: true,
           bundle: File.exist?("Gemfile"),
           replace_in: ::Bump.replace_in_default || []
@@ -39,11 +41,18 @@ module Bump
           bump_set(options[:version], options)
         when "current"
           ["Current version: #{current}", 0]
+        when "show-next"
+          increment = options[:increment]
+          raise InvalidIncrementError unless BUMPS.include?(increment)
+
+          [next_version(increment), 0]
         when "file"
           ["Version file path: #{file}", 0]
         else
           raise InvalidOptionError
         end
+      rescue InvalidIncrementError
+        ["Invalid increment. Choose between #{BUMPS.join(',')}.", 1]
       rescue InvalidOptionError
         ["Invalid option. Choose between #{OPTIONS.join(',')}.", 1]
       rescue InvalidVersionError
@@ -60,6 +69,31 @@ module Bump
         current_info.first
       end
 
+      def next_version(increment, current = Bump.current)
+        current, prerelease = current.split('-')
+        major, minor, patch, *other = current.split('.')
+        case increment
+        when "major"
+          major = major.succ
+          minor = 0
+          patch = 0
+          prerelease = nil
+        when "minor"
+          minor = minor.succ
+          patch = 0
+          prerelease = nil
+        when "patch"
+          patch = patch.succ
+        when "pre"
+          prerelease.strip! if prerelease.respond_to? :strip
+          prerelease = PRERELEASE[PRERELEASE.index(prerelease).succ % PRERELEASE.length]
+        else
+          raise InvalidIncrementError
+        end
+        version = [major, minor, patch, *other].compact.join('.')
+        [version, prerelease].compact.join('-')
+      end
+
       def file
         current_info.last
       end
@@ -115,9 +149,9 @@ module Bump
         end
       end
 
-      def bump_part(part, options)
+      def bump_part(increment, options)
         current, file = current_info
-        next_version = next_version(current, part)
+        next_version = next_version(increment, current)
         bump(file, current, next_version, options)
       end
 
@@ -127,13 +161,14 @@ module Bump
       end
 
       def commit_message(version, options)
-        base = "v#{version}"
-        options[:commit_message] ? "#{base} #{options[:commit_message]}" : base
+        tag = "#{options[:tag_prefix]}#{version}"
+        options[:commit_message] ? "#{tag} #{options[:commit_message]}" : tag
       end
 
       def commit(version, options)
+        tag = "#{options[:tag_prefix]}#{version}"
         system("git", "commit", "-m", commit_message(version, options))
-        system("git", "tag", "-a", "-m", "Bump to v#{version}", "v#{version}") if options[:tag]
+        system("git", "tag", "-a", "-m", "Bump to #{tag}", tag) if options[:tag]
       end
 
       def git_add(file)
@@ -220,31 +255,6 @@ module Bump
         end
       end
 
-      def next_version(current, part)
-        current, prerelease = current.split('-')
-        major, minor, patch, *other = current.split('.')
-        case part
-        when "major"
-          major = major.succ
-          minor = 0
-          patch = 0
-          prerelease = nil
-        when "minor"
-          minor = minor.succ
-          patch = 0
-          prerelease = nil
-        when "patch"
-          patch = patch.succ
-        when "pre"
-          prerelease.strip! if prerelease.respond_to? :strip
-          prerelease = PRERELEASE[PRERELEASE.index(prerelease).succ % PRERELEASE.length]
-        else
-          raise "unknown part #{part.inspect}"
-        end
-        version = [major, minor, patch, *other].compact.join('.')
-        [version, prerelease].compact.join('-')
-      end
-
       def under_version_control?(file)
         @all_files ||= `git ls-files`.split(/\r?\n/)
         @all_files.include?(file)

data/lib/bump/tasks.rb

@@ -7,9 +7,11 @@ namespace :bump do
     abort unless status == 0
   end
 
-  (Bump::Bump::BUMPS + ["current", "file"]).each do |bump|
+  (Bump::Bump::BUMPS + ["current", "file", "show-next"]).each do |bump|
     if bump == "current"
       desc "Show current gem version"
+    elsif bump == "show-next"
+      desc "Show next #{Bump::Bump::BUMPS.join('|')} version."
     elsif bump == "file"
       desc "Show version file path"
     else
@@ -25,8 +27,10 @@ namespace :bump do
       end
       options = {
         tag: ENV['TAG'],
+        tag_prefix: ENV['TAG_PREFIX'],
         commit: ENV['COMMIT'],
-        bundle: ENV['BUNDLE']
+        bundle: ENV['BUNDLE'],
+        increment: ENV['INCREMENT']
       }
       run_bump.call(bump, Bump::Bump.parse_cli_options!(options))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bump
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Gregory Marcilhacy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler