bump 0.1.4 → 0.1.5

data/Gemfile.lock

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

data/bin/bump

@@ -2,4 +2,6 @@
 require File.dirname(__FILE__) + '/../lib/bump'
 
 bump = Bump::Bump.new(ARGV)
-bump.run
+output, status = bump.run
+puts output
+exit status

data/bump.gemspec

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

data/lib/bump.rb

@@ -7,61 +7,53 @@ module Bump
 
   class Bump
     
-    attr_accessor :bump, :output, :gemspec_path, :version, :next_version
+    attr_accessor :bump, :gemspec_path, :version, :next_version
     
     BUMPS = %w(major minor tiny)
     OPTIONS = BUMPS | ["current"]
-    VERSION_REGEX = /version\s*=\s*["|'](\d.\d.\d)["|']/
+    VERSION_REGEX = /\.version\s*=\s*["'](\d+\.\d+\.\d+)["']/
 
     def initialize(bump)
       @bump = bump.is_a?(Array) ? bump.first : bump
     end
 
     def run
-      begin
-        raise InvalidOptionError unless OPTIONS.include?(@bump)
+      @version = find_current_version
 
-        @gemspec_path = find_gemspec_file if @gemspec_path.nil?
-        @version = find_current_version
-        
-        case @bump
-          when "major", "minor", "tiny"
-            bump
-          when "current"
-            current
-          else
-            raise Exception
-        end
-        
-        rescue InvalidOptionError
-          @output = "Invalid option. Choose between #{OPTIONS.join(',')}."
-        rescue UnfoundVersionError
-          @output = "Unable to find your gem version"
-        rescue UnfoundGemspecError
-          @output = "Unable to find gemspec file"
-        rescue TooManyGemspecsFoundError
-          @output = "More than one gemspec file"
-        rescue Exception => e
-          @output = "Something wrong happened: #{e.message}"
+      case @bump
+      when "major", "minor", "tiny"
+        bump
+      when "current"
+        current
+      else
+        raise InvalidOptionError
       end
-      puts @output
-      return @output
+    rescue InvalidOptionError
+      ["Invalid option. Choose between #{OPTIONS.join(',')}.", 1]
+    rescue UnfoundVersionError
+      ["Unable to find your gem version", 1]
+    rescue UnfoundGemspecError
+      ["Unable to find gemspec file", 1]
+    rescue TooManyGemspecsFoundError
+      ["More than one gemspec file", 1]
+    rescue Exception => e
+      ["Something wrong happened: #{e.message}", 1]
     end
 
     private
 
     def bump
       @next_version = find_next_version
-      system(%(ruby -i -pe "gsub(/#{@version}/, '#{@next_version}')" #{@gemspec_path}))
-      @output = "Bump version #{@version} to #{@next_version}"
+      system(%(ruby -i -pe "gsub(/#{@version}/, '#{@next_version}')" #{gemspec_path}))
+      ["Bump version #{@version} to #{@next_version}", 0]
     end
 
     def current
-      @output = "Current version: #{@version}"
+      ["Current version: #{@version}", 0]
     end
 
     def find_current_version
-      match = File.read(@gemspec_path).match VERSION_REGEX
+      match = File.read(gemspec_path).match VERSION_REGEX
       if match.nil?
         raise UnfoundVersionError
       else
@@ -69,24 +61,26 @@ module Bump
       end
     end
 
-    def find_gemspec_file
-      gemspecs = Dir.glob("*.gemspec")
-      raise UnfoundGemspecError if gemspecs.size.zero?
-      raise TooManyGemspecsFoundError if gemspecs.size > 1
-      gemspecs.first 
+    def gemspec_path
+      @gemspec_path ||= begin
+        gemspecs = Dir.glob("*.gemspec")
+        raise UnfoundGemspecError if gemspecs.size.zero?
+        raise TooManyGemspecsFoundError if gemspecs.size > 1
+        gemspecs.first
+      end
     end
 
     def find_next_version
-      match = @version.match /(\d).(\d).(\d)/
+      match = @version.match /(\d+)\.(\d+)\.(\d+)/
       case @bump
-        when "major"
-          "#{match[1].to_i + 1}.0.0"
-        when "minor"
-          "#{match[1]}.#{match[2].to_i + 1}.0"
-        when "tiny"
-          "#{match[1]}.#{match[2]}.#{match[3].to_i + 1}"
+      when "major"
+        "#{match[1].to_i + 1}.0.0"
+      when "minor"
+        "#{match[1]}.#{match[2].to_i + 1}.0"
+      when "tiny"
+        "#{match[1]}.#{match[2]}.#{match[3].to_i + 1}"
       end
-    end 
+    end
 
   end
 end

data/spec/bump_spec.rb

@@ -1,45 +1,101 @@
 require File.dirname(__FILE__) + "/../lib/bump.rb"
 
 describe Bump do
+  let(:gemspec){ "fixture.gemspec" }
 
   around do |example|
-    gemspec = <<-RUBY.sub(" "*6, "")
-      Gem::Specification.new do |s|
-        s.version = "1.0.0"
-      end
-    RUBY
-    path = File.expand_path("../fixture/fixture.gemspec", __FILE__)
-    File.open(path, 'w') {|f| f.write(gemspec) }
-    example.call
-    File.open(path, 'w') {|f| f.write("") }
+    run "rm -rf fixture && mkdir fixture"
+    Dir.chdir "fixture" do
+      example.call
+    end
+    run "rm -rf fixture"
   end
 
-  it "should find current version" do
-    bump = Bump::Bump.new("current")
-    bump.gemspec_path = File.dirname(__FILE__) + "/fixture/fixture.gemspec"
-    output = bump.run
-    output.include?("1.0.0").should be_true
+  it "should fail if it cannot find anything to bump" do
+    bump("current", :fail => true).should include "Unable to find"
   end
 
-  it "should bump a tiny version" do
-    bump = Bump::Bump.new("tiny")
-    bump.gemspec_path = File.dirname(__FILE__) + "/fixture/fixture.gemspec"
-    output = bump.run
-    output.include?("1.0.1").should be_true
+  it "should fail without command" do
+    write_gemspec
+    bump("", :fail => true).should include "Invalid option"
   end
-  
-  it "should bump a minor version" do
-    bump = Bump::Bump.new("minor")
-    bump.gemspec_path = File.dirname(__FILE__) + "/fixture/fixture.gemspec"
-    output = bump.run
-    output.include?("1.1.0").should be_true
+
+  it "should fail with multiple gemspecs" do
+    write_gemspec
+    write("xxxx.gemspec", "xxx")
+    bump("", :fail => true).should include "More than one gemspec file"
   end
-  
-  it "should bump a major version" do
-    bump = Bump::Bump.new("major")
-    bump.gemspec_path = File.dirname(__FILE__) + "/fixture/fixture.gemspec"
-    output = bump.run
-    output.include?("2.0.0").should be_true
+
+  it "should fail if version is weird" do
+    write_gemspec("a.b.c")
+    bump("", :fail => true).should include "Unable to find your gem version"
   end
 
+  context ".version in gemspect" do
+    before do
+      write_gemspec
+    end
+
+    it "should find current version" do
+      bump("current").should include("4.2.3")
+      read(gemspec).should include('s.version = "4.2.3"')
+    end
+
+    it "should bump tiny" do
+      bump("tiny").should include("4.2.4")
+      read(gemspec).should include('s.version = "4.2.4"')
+    end
+
+    it "should bump minor" do
+      bump("minor").should include("4.3.0")
+      read(gemspec).should include('s.version = "4.3.0"')
+    end
+
+    it "should bump major" do
+      bump("major").should include("5.0.0")
+      read(gemspec).should include('s.version = "5.0.0"')
+    end
+
+    it "should bump more then 10" do
+      bump("tiny").should include("4.2.4")
+      bump("tiny").should include("4.2.5")
+      bump("tiny").should include("4.2.6")
+      bump("tiny").should include("4.2.7")
+      bump("tiny").should include("4.2.8")
+      bump("tiny").should include("4.2.9")
+      bump("tiny").should include("4.2.10")
+      bump("tiny").should include("4.2.11")
+      read(gemspec).should include('s.version = "4.2.11"')
+    end
+  end
+
+  private
+
+  def write(file, content)
+    folder = File.dirname(file)
+    run "mkdir -p #{folder}" unless File.exist?(folder)
+    File.open(file, 'w'){|f| f.write content }
+  end
+
+  def read(file)
+    File.read(file)
+  end
+
+  def run(cmd, options={})
+    result = `#{cmd} 2>&1`
+    raise "FAILED #{cmd} --> #{result}" if $?.success? != !options[:fail]
+    result
+  end
+
+  def bump(command="", options={})
+    run "#{File.expand_path("../../bin/bump", __FILE__)} #{command}", options
+  end
+
+  def write_gemspec(version = "4.2.3")
+    write gemspec, <<-RUBY.sub(" "*6, "")
+      Gem::Specification.new do |s|
+        s.version = "#{version}"
+      end
+    RUBY
+  end
 end

metadata

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