bump 0.3.12 → 0.4.0

data/.travis.yml

@@ -8,3 +8,6 @@ rvm:
   - rbx-18mode
   - rbx-19mode
   - ruby-head
+before_script:
+  - git config --global user.email "you@example.com"
+  - git config --global user.name "Your Name"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bump (0.3.12)
+    bump (0.4.0)
 
 GEM
   remote: https://rubygems.org/

data/bin/bump

@@ -7,11 +7,12 @@ OptionParser.new do |opts|
 Bump your gem version.
 
 Usage:
-    bump current  # show current version
-    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 current    # show current version
+    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
@@ -20,11 +21,15 @@ BANNER
   opts.on("-h", "--help","Show this.") { puts opts; exit }
 end.parse!
 
-if ARGV.size != 1
+unless (ARGV.size == 1 && ARGV.first != "set") || (ARGV.size == 2 && ARGV.first == "set")
   puts "Usage instructions: bump --help"
   exit 1
 end
 
+if ARGV.first == "set" 
+  options[:version] = ARGV[1]
+end
+
 require File.dirname(__FILE__) + '/../lib/bump'
 output, status = Bump::Bump.run(ARGV.first, options)
 puts output

data/bump.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification.new "bump" do |s|
-  s.version = "0.3.12"
+  s.version = "0.4.0"
   s.author = "Gregory Marcilhacy"
   s.email = "g.marcilhacy@gmail.com"
   s.homepage = "https://github.com/gregorym/bump"

data/lib/bump.rb

@@ -1,5 +1,6 @@
 module Bump
   class InvalidOptionError < StandardError; end
+  class InvalidVersionError < StandardError; end
   class UnfoundVersionError < StandardError; end
   class TooManyVersionFilesError < StandardError; end
   class UnfoundVersionFileError < StandardError; end
@@ -7,7 +8,7 @@ module Bump
   class Bump
     BUMPS         = %w(major minor patch pre)
     PRERELEASE    = ["alpha","beta","rc",nil]
-    OPTIONS       = BUMPS | ["current"]
+    OPTIONS       = BUMPS | ["set", "current"]
     VERSION_REGEX = /(\d+\.\d+\.\d+(?:-(?:#{PRERELEASE.compact.join('|')}))?)/
 
     def self.defaults
@@ -22,7 +23,10 @@ module Bump
 
       case bump
       when *BUMPS
-        bump(bump, options)
+        bump_part(bump, options)
+      when "set"
+        raise InvalidVersionError unless options[:version]
+        bump_set(options[:version], options)
       when "current"
         ["Current version: #{current}", 0]
       else
@@ -30,6 +34,8 @@ module Bump
       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
@@ -46,15 +52,24 @@ module Bump
 
     private
 
-    def self.bump(part, options)
-      current, file = current_info
-      next_version = next_version(current, part)
+    def self.bump(file, current, next_version, options)
       replace(file, current, next_version)
       system("bundle") if options[:bundle] and under_version_control?("Gemfile.lock")
       commit(next_version, file, options) if options[:commit]
       ["Bump version #{current} to #{next_version}", 0]
     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 self.bump_set(next_version, options)
+      current, file = current_info
+      bump(file, current, next_version, options)
+    end
+
     def self.commit(version, file, options)
       return unless File.directory?(".git")
       system("git add --update Gemfile.lock") if options[:bundle]
@@ -97,9 +112,11 @@ module Bump
     end
 
     def self.version_from_lib_rb
-      file = find_version_file("lib/**/*.rb")
-      return unless file && File.read(file) =~ /^\s+VERSION = ['"](#{VERSION_REGEX})['"]/i
-      [$1, file]
+      files = Dir.glob("lib/**/*.rb")
+      file = files.detect do |file|
+        File.read(file) =~ /^\s+VERSION = ['"](#{VERSION_REGEX})['"]/i
+      end
+      [$1, file] if file
     end
 
     def self.version_from_chef

data/lib/bump/tasks.rb

@@ -1,6 +1,12 @@
 require "bump"
 
 namespace :bump do
+  run_bump = lambda do |bump, options|
+    output, status = Bump::Bump.run(bump, options)
+    puts output
+    abort unless status == 0
+  end
+
   (Bump::Bump::BUMPS + ["current"]).each do |bump|
     if bump == "current"
       desc "Show current gem version"
@@ -9,9 +15,12 @@ namespace :bump do
     end
 
     task bump do
-      output, status = Bump::Bump.run(bump)
-      puts output
-      abort unless status == 0
+      run_bump.call(bump, {})
     end
   end
+
+  desc "Sets the version number using the VERSION environment variable"
+  task :set do
+    run_bump.call("set", :version => ENV['VERSION'])
+  end
 end

data/spec/bump/tasks_spec.rb

@@ -16,6 +16,13 @@ describe "rake bump" do
     `git log -1 --pretty=format:'%s'`.should == "v1.3.0"
   end
 
+  it "sets a version" do
+    output = run "VERSION=1.3.0 rake bump:set"
+    output.should include("1.3.0")
+    read("VERSION").should == "1.3.0\n"
+    `git log -1 --pretty=format:'%s'`.should == "v1.3.0"
+  end
+
   it "fails when it cannot bump" do
     write "VERSION", "AAA"
     run "rake bump:minor", :fail => true

data/spec/bump_spec.rb

@@ -90,6 +90,11 @@ describe Bump do
       read(gemspec).should include('s.version = "5.0.0"')
     end
 
+    it "should set the version" do
+      bump("set 1.2.3").should include("1.2.3")
+      read(gemspec).should include('s.version = "1.2.3"')
+    end
+
     it "should bump more then 10" do
       bump("patch").should include("4.2.4")
       bump("patch").should include("4.2.5")
@@ -115,6 +120,11 @@ describe Bump do
       bump("patch").should include("4.2.4")
       read(gemspec).should include('"4.2.4"')
     end
+
+    it "should set the version" do
+      bump("set 1.2.3").should include("1.2.3")
+      read(gemspec).should include('"1.2.3"')
+    end
   end
 
   context "VERSION in version.rb" do
@@ -134,6 +144,11 @@ describe Bump do
       read(version_file).should include('  VERSION = "1.3.0"')
     end
 
+    it "should set the version" do
+      bump("set 1.2.3").should include("1.2.3")
+      read(version_file).should include('"1.2.3"')
+    end
+
     it "should bump Version" do
       write version_file, <<-RUBY.sub(" "*8, "")
         module Foo
@@ -144,6 +159,16 @@ describe Bump do
       read(version_file).should include('  Version = "1.3.0"')
     end
 
+    it "should set Version" do
+      write version_file, <<-RUBY.sub(" "*8, "")
+        module Foo
+          Version = "1.2.3"
+        end
+      RUBY
+      bump("set 1.3.0").should include("1.3.0")
+      read(version_file).should include('  Version = "1.3.0"')
+    end
+
     it "should bump if a gemspec exists and leave it alone" do
       write_gemspec "'1.'+'2.3'"
       bump("minor").should include("1.3.0")
@@ -169,6 +194,11 @@ describe Bump do
       read("VERSION").should include("1.3.0")
     end
 
+    it "should set the version" do
+      bump("set 1.3.0").should include("1.3.0")
+      read("VERSION").should include("1.3.0")
+    end
+
     it "should bump if a gemspec & version.rb exists and leave it alone" do
       write_gemspec "File.read('VERSION')"
       write_version_file "File.read('VERSION')"
@@ -294,6 +324,11 @@ describe Bump do
       read(version_file).should include('  VERSION = "1.3.0"')
     end
 
+    it "should set VERSION" do
+      bump("set 1.3.0").should include("1.3.0")
+      read(version_file).should include('  VERSION = "1.3.0"')
+    end
+
     it "should bump Version" do
       write version_file, <<-RUBY.sub(" "*8, "")
         module Foo
@@ -304,6 +339,16 @@ describe Bump do
       read(version_file).should include('  Version = "1.3.0"')
     end
 
+    it "should set Version" do
+      write version_file, <<-RUBY.sub(" "*8, "")
+        module Foo
+          Version = "1.2.3"
+        end
+      RUBY
+      bump("set 1.3.0").should include("1.3.0")
+      read(version_file).should include('  Version = "1.3.0"')
+    end
+
     it "should bump if a gemspec exists and leave it alone" do
       write_gemspec "'1.'+'2.3'"
       bump("minor").should include("1.3.0")
@@ -332,6 +377,11 @@ describe Bump do
       bump("minor").should include("1.3.0")
       read(version_file).should include("1.3.0")
     end
+
+    it "should set the version" do
+      bump("set 1.3.0").should include("1.3.0")
+      read(version_file).should include("1.3.0")
+    end
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bump
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake