bump 0.2.0 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bump (0.1.5)
+    bump (0.2.0)
 
 GEM
   remote: http://rubygems.org/

data/README.textile

@@ -14,7 +14,14 @@ Bump your gemfile (major, minor, patch):
 bc. bump patch
 Bump version 0.1.2 to 0.1.3
 
+h1. Supported locations
+* VERSION file with "1.2.3"
+* gemspec with `gem.version = "1.2.3"`
+* lib/**/version.rb file with `VERSION = "1.2.3"`
+
 h1. Todo
 
 * Handle options properly
+* `VERSION = "1.2.3"` in lib/*.rb
+* gemspec with `Gem::Specification.new "gem-name", "1.2.3" do`
 

data/bin/bump

@@ -1,7 +1,31 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../lib/bump'
+require 'optparse'
+
+options = {
+  :commit => true
+}
+OptionParser.new do |opts|
+  opts.banner = <<BANNER
+Bump your gem version.
+
+Usage:
+    bump current  # show current version
+    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 = Bump::Bump.new(ARGV)
-output, status = bump.run
+Options:
+BANNER
+  opts.on("--no-commit", "Do not make a commit.") { options[:commit] = false }
+  opts.on("-h", "--help","Show this.") { puts opts; exit }
+end.parse!
+
+if ARGV.size != 1
+  puts "Usage instructions: bump --help"
+  exit 1
+end
+
+require File.dirname(__FILE__) + '/../lib/bump'
+output, status = Bump::Bump.run(ARGV.first, options)
 puts output
 exit status

data/bump.gemspec

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

data/lib/bump.rb

@@ -5,20 +5,14 @@ module Bump
   class UnfoundVersionFileError < StandardError; end
 
   class Bump
-    attr_accessor :bump
-    
     BUMPS = %w(major minor patch)
     OPTIONS = BUMPS | ["current"]
     VERSION_REGEX = /(\d+\.\d+\.\d+)/
 
-    def initialize(bump)
-      @bump = bump.is_a?(Array) ? bump.first : bump
-    end
-
-    def run
-      case @bump
+    def self.run(bump, options)
+      case bump
       when "major", "minor", "patch"
-        bump(@bump)
+        bump(bump, options)
       when "current"
         current
       else
@@ -29,7 +23,7 @@ module Bump
     rescue UnfoundVersionError
       ["Unable to find your gem version", 1]
     rescue UnfoundVersionFileError
-      ["Unable to find gemspec file", 1]
+      ["Unable to find a file with the gem version", 1]
     rescue TooManyVersionFilesError
       ["More than one gemspec file", 1]
     rescue Exception => e
@@ -38,45 +32,58 @@ module Bump
 
     private
 
-    def bump(part)
+    def self.bump(part, options)
       current, file = current_version
       next_version = next_version(current, part)
       replace(file, current, next_version)
+      commit(next_version, file) if options[:commit]
       ["Bump version #{current} to #{next_version}", 0]
     end
 
-    def replace(file, old, new)
+    def self.commit(version, file)
+      return unless File.directory?(".git")
+      raise unless system("git add #{file} && git commit -m 'v#{version}'")
+    end
+
+    def self.replace(file, old, new)
       content = File.read(file)
       File.open(file, "w"){|f| f.write(content.gsub(old, new)) }
     end
 
-    def current
+    def self.current
       ["Current version: #{current_version.first}", 0]
     end
 
-    def current_version
-      version, file = version_from_version_rb || version_from_gemspec || raise(UnfoundVersionFileError)
+    def self.current_version
+      version, file = (
+        version_from_version_rb ||
+        version_from_gemspec ||
+        version_from_version ||
+        raise(UnfoundVersionFileError)
+      )
       raise UnfoundVersionError unless version
       [version, file]
     end
 
-    def version_from_version_rb
+    def self.version_from_version_rb
       return unless file = find_version_file("*/**/version.rb")
-      [
-        File.read(file)[VERSION_REGEX],
-        file
-      ]
+      return unless version = File.read(file)[VERSION_REGEX]
+      [version, file]
     end
 
-    def version_from_gemspec
+    def self.version_from_gemspec
       return unless file = find_version_file("*.gemspec")
-      [
-        File.read(file)[/\.version\s*=\s*["']#{VERSION_REGEX}["']/, 1],
-        file
-      ]
+      return unless version = File.read(file)[/\.version\s*=\s*["']#{VERSION_REGEX}["']/, 1]
+      [version, file]
+    end
+
+    def self.version_from_version
+      return unless file = find_version_file("VERSION")
+      return unless version = File.read(file)[VERSION_REGEX]
+      [version, file]
     end
 
-    def find_version_file(pattern)
+    def self.find_version_file(pattern)
       files = Dir.glob(pattern)
       case files.size
       when 0 then nil
@@ -86,7 +93,7 @@ module Bump
       end
     end
 
-    def next_version(current, part)
+    def self.next_version(current, part)
       match = current.match /(\d+)\.(\d+)\.(\d+)/
       case part
       when "major"

data/spec/bump_spec.rb

@@ -2,10 +2,12 @@ require File.dirname(__FILE__) + "/../lib/bump.rb"
 
 describe Bump do
   let(:gemspec){ "fixture.gemspec" }
+  let(:version_rb_file){ "lib/foo/version.rb" }
 
   around do |example|
     run "rm -rf fixture && mkdir fixture"
     Dir.chdir "fixture" do
+      `git init && git commit --allow-empty -am 'initial'` # so we never accidentally do commit to the current repo
       example.call
     end
     run "rm -rf fixture"
@@ -17,18 +19,43 @@ describe Bump do
 
   it "should fail without command" do
     write_gemspec
-    bump("", :fail => true).should include "Invalid option"
+    bump("", :fail => true).should include "Usage instructions: bump --help"
+  end
+
+  it "should fail with invalid options" do
+    write_gemspec
+    bump("xxx", :fail => true).should include "Invalid option"
   end
 
   it "should fail with multiple gemspecs" do
     write_gemspec
-    write("xxxx.gemspec", "xxx")
+    write("xxxx.gemspec", "Gem::Specification.new{}")
     bump("current", :fail => true).should include "More than one gemspec file"
   end
 
   it "should fail if version is weird" do
-    write_gemspec('"a.b.c"')
-    bump("current", :fail => true).should include "Unable to find your gem version"
+    write_gemspec('"1."+"3.4"')
+    bump("current", :fail => true).should include "Unable to find a file with the gem version"
+  end
+
+  it "should show help" do
+    bump("--help").should include("bump current")
+  end
+
+  context "git" do
+    it "should commit the new version" do
+      write_gemspec
+      bump("patch")
+      `git log -1 --pretty=format:'%s'`.should == "v4.2.4"
+      `git status`.should include "nothing to commit"
+    end
+
+    it "should not commit if --no-commit flag was given" do
+      write_gemspec
+      bump("patch --no-commit")
+      `git log -1 --pretty=format:'%s'`.should == "initial"
+      `git status`.should_not include "nothing to commit"
+    end
   end
 
   context ".version in gemspec" do
@@ -71,38 +98,58 @@ describe Bump do
 
   context "VERSION in version.rb" do
     before do
-      write "lib/foo/version.rb", <<-RUBY.sub(" "*8, "")
-        module Foo
-          VERSION = "1.2.3"
-        end
-      RUBY
+      write_version_rb
     end
 
     it "show current" do
       bump("current").should include("1.2.3")
-      read("lib/foo/version.rb").should include('  VERSION = "1.2.3"')
+      read(version_rb_file).should include('  VERSION = "1.2.3"')
     end
 
     it "should bump VERSION" do
       bump("minor").should include("1.3.0")
-      read("lib/foo/version.rb").should include('  VERSION = "1.3.0"')
+      read(version_rb_file).should include('  VERSION = "1.3.0"')
     end
 
     it "should bump Version" do
-      write "lib/foo/version.rb", <<-RUBY.sub(" "*8, "")
+      write version_rb_file, <<-RUBY.sub(" "*8, "")
         module Foo
           Version = "1.2.3"
         end
       RUBY
       bump("minor").should include("1.3.0")
-      read("lib/foo/version.rb").should include('  Version = "1.3.0"')
+      read(version_rb_file).should include('  Version = "1.3.0"')
     end
 
     it "should bump if a gemspec exists and leave it alone" do
-      write_gemspec "Foo::VERSION"
+      write_gemspec "'1.'+'2.3'"
       bump("minor").should include("1.3.0")
-      read("lib/foo/version.rb").should include('  VERSION = "1.3.0"')
-      read(gemspec).should include('version = Foo::VERSION')
+      read(gemspec).should include("version = '1.'+'2.3'")
+    end
+  end
+
+  context "version in VERSION" do
+    before do
+      write "VERSION", "1.2.3\n"
+    end
+
+    it "show current" do
+      bump("current").should include("1.2.3")
+      read("VERSION").should == "1.2.3\n"
+    end
+
+    it "should bump version" do
+      bump("minor").should include("1.3.0")
+      read("VERSION").should == "1.3.0\n"
+    end
+
+    it "should bump if a gemspec & version.rb exists and leave it alone" do
+      write_gemspec "File.read('VERSION')"
+      write_version_rb "File.read('VERSION')"
+      bump("minor").should include("1.3.0")
+      read("VERSION").should == "1.3.0\n"
+      read(version_rb_file).should include("VERSION = File.read('VERSION')")
+      read(gemspec).should include("version = File.read('VERSION')")
     end
   end
 
@@ -135,4 +182,12 @@ describe Bump do
       end
     RUBY
   end
+
+  def write_version_rb(version = '"1.2.3"')
+    write version_rb_file, <<-RUBY.sub(" "*6, "")
+      module Foo
+        VERSION = #{version}
+      end
+    RUBY
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bump
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: g.marcilhacy@gmail.com