bump 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1175cf2868e448afaf993f17409112483889ed04
-  data.tar.gz: 29be419ef76fed2ca063e1eea18f6fbc922a019e
+  metadata.gz: 3a574d2178ab81ef0b3933c40c61d63f1f186c79
+  data.tar.gz: 19ac68b8d7e0be7d29d72bc5c99a02cd64faec64
 SHA512:
-  metadata.gz: a31e2f7327abba449c4144807c2f20471a3d67566800fe77326507be5d4d22fc93b2885e67f87f3d9fa9530d8cad6fa0d4e9223d5761efde0894efe31335b2e0
-  data.tar.gz: ccca570ac125a618f0524664a975838c1e5e3673dfd2e4ccb110300367360f8880c47e8d07fdc0cf422d690f9e9042304716c97b9d53caa2b26b7daee533d303
+  metadata.gz: eff95fab4f733f9250d4705200a35f3fd30be85b73aa62b8f4bf0dbc52470073c9d7709d87b0398e9bff70e0bd12b2922e406d200c24c85b4f07c1db81ec4d14
+  data.tar.gz: dad1267f7b8c2985b79cafb08e76b6fae46c8d8751715b4dbea552bfb64d685b3aae870d3882d14e49e76fa0fcd7aa56b1dafb9a267087739e82eb8108c40b5f

data/README.md

@@ -1,5 +1,5 @@
-[![Build Status](https://travis-ci.org/gregorym/bump.png)](https://travis-ci.org/gregorym/bump)
-[![Gem Version](https://badge.fury.io/rb/bump.png)](http://badge.fury.io/rb/bump)
+[![Build Status](https://travis-ci.org/gregorym/bump.svg)](https://travis-ci.org/gregorym/bump)
+[![Gem Version](https://badge.fury.io/rb/bump.svg)](http://badge.fury.io/rb/bump)
 
 # Introduction
 Bump is a gem that will simplify the way you build gems and chef-cookbooks.
@@ -40,16 +40,26 @@ If you don't want to run the `bundle` command after bumping, add the `--no-bundl
     
     bump patch --no-bundle
 
-### --commit-message [MSG]
-If you want to append additional information to the commit message, pass it in using the `--commit-message [MSG]` option.
+### --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.
 
     bump patch --commit-message [no-ci]
 
+or
+
+    bump patch -m [no-cli]
+
 ### Rake
 
 ```Ruby
 # Rakefile
 require "bump/tasks"
+
+#
+# if you want to always tag the verison, add:
+# Bump.tag_by_default = true
+#
+
 ```
 
     rake bump:patch
@@ -69,10 +79,7 @@ Bump::Bump.run("patch", commit_message: '[no ci]') # -> creates a commit message
  - gemspec with `gem.version = "1.2.3"` or `Gem:Specification.new "gem-name", "1.2.3" do`
  - lib/**/version.rb file with `VERSION = "1.2.3"`
  - metadata.rb with `version "1.2.3"`
-
-# Todo
-
- - `VERSION = "1.2.3"` in lib/*.rb
+ - `VERSION = "1.2.3"` in lib/**/*.rb
 
 # Author
 Gregory<br/>

data/bin/bump

@@ -17,7 +17,7 @@ Usage:
 Options:
 BANNER
   opts.on("--no-commit", "Do not make a commit.") { options[:commit] = false }
-  opts.on("--commit-message [MSG]", "Append MSG to the commit message.") {|msg| options[:commit_message] = msg }
+  opts.on("-m","--commit-message [MSG]", "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 }

data/lib/bump.rb

@@ -5,184 +5,191 @@ module Bump
   class TooManyVersionFilesError < StandardError; end
   class UnfoundVersionFileError < StandardError; end
 
+  class <<self
+    attr_accessor :tag_by_default
+  end
+
   class Bump
     BUMPS         = %w(major minor patch pre)
     PRERELEASE    = ["alpha","beta","rc",nil]
     OPTIONS       = BUMPS | ["set", "current"]
     VERSION_REGEX = /(\d+\.\d+\.\d+(?:-(?:#{PRERELEASE.compact.join('|')}))?)/
 
-    def self.defaults
-      {
-        :commit => true,
-        :bundle => File.exist?("Gemfile"),
-        :tag => false
-      }
-    end
+    class << self
 
-    def self.run(bump, options={})
-      options = defaults.merge(options)
-
-      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]
-      else
-        raise InvalidOptionError
-      end
-    rescue InvalidOptionError
-      ["Invalid option. Choose between #{OPTIONS.join(',')}.", 1]
-    rescue InvalidVersionError
-      ["Invalid version number given.", 1]
-    rescue UnfoundVersionError
-      ["Unable to find your gem version", 1]
-    rescue UnfoundVersionFileError
-      ["Unable to find a file with the gem version", 1]
-    rescue TooManyVersionFilesError
-      ["More than one version file found (#{$!.message})", 1]
-    end
+      def defaults
+        {
+          :commit => true,
+          :bundle => File.exist?("Gemfile"),
+          :tag => ::Bump.tag_by_default
+        }
+      end
 
-    def self.current
-      current_info.first
-    end
+      def run(bump, options={})
+        options = defaults.merge(options)
+
+        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]
+        else
+          raise InvalidOptionError
+        end
+      rescue InvalidOptionError
+        ["Invalid option. Choose between #{OPTIONS.join(',')}.", 1]
+      rescue InvalidVersionError
+        ["Invalid version number given.", 1]
+      rescue UnfoundVersionError
+        ["Unable to find your gem version", 1]
+      rescue UnfoundVersionFileError
+        ["Unable to find a file with the gem version", 1]
+      rescue TooManyVersionFilesError
+        ["More than one version file found (#{$!.message})", 1]
+      end
 
-    private
+      def current
+        current_info.first
+      end
 
-    def self.bump(file, current, next_version, options)
-      replace(file, current, next_version)
-      if options[:bundle] and under_version_control?("Gemfile.lock")
-        bundler_with_clean_env do
-          system("bundle")
+      private
+
+      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")
+          bundler_with_clean_env do
+            return ["Bundle error", 1] unless system("bundle")
+          end
         end
+        commit(next_version, file, options) if options[:commit]
+        ["Bump version #{current} to #{next_version}", 0]
       end
-      commit(next_version, file, options) if options[:commit]
-      ["Bump version #{current} to #{next_version}", 0]
-    end
 
-    def self.bundler_with_clean_env(&block)
-      if defined?(Bundler)
-        Bundler.with_clean_env(&block)
-      else
-        yield
+      def bundler_with_clean_env(&block)
+        if defined?(Bundler)
+          Bundler.with_clean_env(&block)
+        else
+          yield
+        end
       end
-    end
 
-    def self.bump_part(part, options)
-      current, file = current_info
-      next_version = next_version(current, part)
-      bump(file, current, next_version, options)
-    end
+      def bump_part(part, options)
+        current, file = current_info
+        next_version = next_version(current, part)
+        bump(file, current, next_version, options)
+      end
 
-    def self.bump_set(next_version, options)
-      current, file = current_info
-      bump(file, current, next_version, options)
-    end
+      def bump_set(next_version, options)
+        current, file = current_info
+        bump(file, current, next_version, options)
+      end
 
-    def self.commit_message(version, options)
-      (options[:commit_message]) ? "v#{version} #{options[:commit_message]}" : "v#{version}"
-    end
+      def commit_message(version, options)
+        (options[:commit_message]) ? "v#{version} #{options[:commit_message]}" : "v#{version}"
+      end
 
-    def self.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]
-    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]
+      end
 
-    def self.replace(file, old, new)
-      content = File.read(file)
-      File.open(file, "w"){|f| f.write(content.sub(old, new)) }
-    end
+      def replace(file, old, new)
+        content = File.read(file)
+        File.open(file, "w"){|f| f.write(content.sub(old, new)) }
+      end
 
-    def self.current_info
-      version, file = (
-        version_from_version ||
-        version_from_version_rb ||
-        version_from_gemspec ||
-        version_from_lib_rb  ||
-        version_from_chef  ||
-        raise(UnfoundVersionFileError)
-      )
-      raise UnfoundVersionError unless version
-      [version, file]
-    end
+      def current_info
+        version, file = (
+          version_from_version ||
+          version_from_version_rb ||
+          version_from_gemspec ||
+          version_from_lib_rb  ||
+          version_from_chef  ||
+          raise(UnfoundVersionFileError)
+        )
+        raise UnfoundVersionError unless version
+        [version, file]
+      end
 
-    def self.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?
-      [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?
+        [version, file]
+      end
 
-    def self.version_from_version_rb
-      files = Dir.glob("lib/**/version.rb")
-      files.detect do |file|
-        if version_and_file = extract_version_from_file(file)
-          return version_and_file
+      def version_from_version_rb
+        files = Dir.glob("lib/**/version.rb")
+        files.detect do |file|
+          if version_and_file = extract_version_from_file(file)
+            return version_and_file
+          end
         end
       end
-    end
 
-    def self.version_from_version
-      return unless file = find_version_file("VERSION")
-      extract_version_from_file(file)
-    end
+      def version_from_version
+        return unless file = find_version_file("VERSION")
+        extract_version_from_file(file)
+      end
 
-    def self.version_from_lib_rb
-      files = Dir.glob("lib/**/*.rb")
-      file = files.detect do |file|
-        File.read(file) =~ /^\s+VERSION = ['"](#{VERSION_REGEX})['"]/i
+      def version_from_lib_rb
+        files = Dir.glob("lib/**/*.rb")
+        file = files.detect do |f|
+          File.read(f) =~ /^\s+VERSION = ['"](#{VERSION_REGEX})['"]/i
+        end
+        [$1, file] if file
       end
-      [$1, file] if file
-    end
 
-    def self.version_from_chef
-      file = find_version_file("metadata.rb")
-      return unless file && File.read(file) =~ /^version\s+(['"])(#{VERSION_REGEX})['"]/
-      [$2, file]
-    end
+      def version_from_chef
+        file = find_version_file("metadata.rb")
+        return unless file && File.read(file) =~ /^version\s+(['"])(#{VERSION_REGEX})['"]/
+        [$2, file]
+      end
 
-    def self.extract_version_from_file(file)
-      return unless version = File.read(file)[VERSION_REGEX]
-      [version, file]
-    end
+      def extract_version_from_file(file)
+        return unless version = File.read(file)[VERSION_REGEX]
+        [version, file]
+      end
 
-    def self.find_version_file(pattern)
-      files = Dir.glob(pattern)
-      case files.size
-      when 0 then nil
-      when 1 then files.first
-      else
-        raise TooManyVersionFilesError, files.join(", ")
+      def find_version_file(pattern)
+        files = Dir.glob(pattern)
+        case files.size
+        when 0 then nil
+        when 1 then files.first
+        else
+          raise TooManyVersionFilesError, files.join(", ")
+        end
       end
-    end
 
-    def self.next_version(current, part)
-      current, prerelease = current.split('-')
-      major, minor, patch, *other = current.split('.')
-      case part
-      when "major"
-        major, minor, patch, prerelease = major.succ, 0, 0, nil
-      when "minor"
-        minor, patch, prerelease = minor.succ, 0, 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 next_version(current, part)
+        current, prerelease = current.split('-')
+        major, minor, patch, *other = current.split('.')
+        case part
+        when "major"
+          major, minor, patch, prerelease = major.succ, 0, 0, nil
+        when "minor"
+          minor, patch, prerelease = minor.succ, 0, 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 self.under_version_control?(file)
-      @all_files ||= `git ls-files`.split(/\r?\n/)
-      @all_files.include?(file)
+      def under_version_control?(file)
+        @all_files ||= `git ls-files`.split(/\r?\n/)
+        @all_files.include?(file)
+      end
     end
   end
 end

data/lib/bump/tasks.rb

@@ -15,7 +15,7 @@ namespace :bump do
     end
 
     task bump, :tag do |_task, args|
-      run_bump.call(bump, :tag => args[:tag])
+      run_bump.call(bump, args)
     end
   end
 

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: bump
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Gregory Marcilhacy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 description: 
 email: g.marcilhacy@gmail.com
 executables:
@@ -69,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Bump your gem version file