bump 0.1.2 → 0.1.3

data/bump.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "bump"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
   s.author = "Gregory Marcilhacy"
   s.email = "g.marcilhacy@gmail.com"
   s.homepage = "http://github.com/gregorymp/bump"
@@ -13,6 +13,11 @@ Gem::Specification.new do |s|
     lib/bump.rb
   )
   
+  s.test_files = %w(
+    test/bump_spec.rb
+    test/fixture/fixture.gemspec
+  )
+  
   s.require_path = "lib"
   s.executables = ["bump"]
 

data/lib/bump.rb

@@ -1,16 +1,18 @@
 module Bump
 
+  class InvalidOptionError < StandardError; end
+  class UnfoundVersionError < StandardError; end
+  class TooManyGemspecsFoundError < StandardError; end
+  class UnfoundGemspecError < StandardError; end
+
   class Bump
     
+    attr_accessor :bump, :output, :gemspec_path, :version, :next_version
+    
     BUMPS = %w(major minor tiny)
     OPTIONS = BUMPS | ["current"]
     VERSION_REGEX = /version\s*=\s*["|'](\d.\d.\d)["|']/
 
-    class InvalidOptionError < StandardError; end
-    class UnfoundVersionError < StandardError; end
-    class TooManyGemspecsFoundError < StandardError; end
-    class UnfoundGemspecError < StandardError; end
-
     def initialize(bump)
       @bump = bump.is_a?(Array) ? bump.first : bump
     end
@@ -19,45 +21,47 @@ module Bump
       begin
         raise InvalidOptionError unless OPTIONS.include?(@bump)
 
-        gemspec = find_gemspec_file
-        current_version = find_current_version(gemspec)
+        @gemspec_path = find_gemspec_file if @gemspec_path.nil?
+        @version = find_current_version
         
         case @bump
           when "major", "minor", "tiny"
-            bump(current_version, gemspec)
+            bump
           when "current"
-            current(current_version)
+            current
           else
             raise Exception
         end
         
         rescue InvalidOptionError
-          puts "Invalid option. Choose between #{OPTIONS.join(',')}."
+          @output = "Invalid option. Choose between #{OPTIONS.join(',')}."
         rescue UnfoundVersionError
-          puts "Unable to find your gem version"
+          @output = "Unable to find your gem version"
         rescue UnfoundGemspecError
-          puts "Unable to find gemspec file"
+          @output = "Unable to find gemspec file"
         rescue TooManyGemspecsFoundError
-          puts "More than one gemspec file"
+          @output = "More than one gemspec file"
         rescue Exception => e
-          puts "Something wrong happened: #{e.message}"
-      end   
+          @output = "Something wrong happened: #{e.message}"
+      end
+      puts @output
+      return @output
     end
 
     private
 
-    def bump(current_version, gemspec)
-      next_version = find_next_version(current_version)
-      system(%(ruby -i -pe "gsub(/#{current_version}/, '#{next_version}')" #{gemspec}))
-      puts "Bump version #{current_version} to #{next_version}"
+    def bump
+      @next_version = find_next_version
+      system(%(ruby -i -pe "gsub(/#{@version}/, '#{@next_version}')" #{@gemspec_path}))
+      @output = "Bump version #{@version} to #{@next_version}"
     end
 
-    def current(current_version)
-      puts "Current version: #{current_version}"
+    def current
+      @output = "Current version: #{@version}"
     end
 
-    def find_current_version(file)
-      match = File.read(file).match VERSION_REGEX
+    def find_current_version
+      match = File.read(@gemspec_path).match VERSION_REGEX
       if match.nil?
         raise UnfoundVersionError
       else
@@ -72,8 +76,8 @@ module Bump
       gemspecs.first 
     end
 
-    def find_next_version(current_version)
-      match = current_version.match /(\d).(\d).(\d)/
+    def find_next_version
+      match = @version.match /(\d).(\d).(\d)/
       case @bump
         when "major"
           "#{match[1].to_i + 1}.0.0"
@@ -85,5 +89,4 @@ module Bump
     end 
 
   end
-
 end

data/test/bump_spec.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + "/../lib/bump.rb"
+
+describe Bump do
+  
+  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
+  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
+  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
+  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
+  end
+
+end

data/test/fixture/fixture.gemspec

@@ -0,0 +1,21 @@
+Gem::Specification.new do |s|
+  s.name = "fixture"
+  s.version = "2.0.0"
+  s.author = "Gregory Marcilhacy"
+  s.email = "g.marcilhacy@gmail.com"
+  s.homepage = "http://github.com/gregorymp/bump"
+  s.summary = "Bump your gem version file"
+
+  s.files = %w(
+    README.textile
+    bump.gemspec
+    bin/bump
+    lib/bump.rb
+  )
+  
+  s.require_path = "lib"
+  s.executables = ["bump"]
+
+end
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bump
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Gregory Marcilhacy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 +02:00
+date: 2011-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,8 @@ files:
 - bump.gemspec
 - bin/bump
 - lib/bump.rb
+- test/bump_spec.rb
+- test/fixture/fixture.gemspec
 has_rdoc: true
 homepage: http://github.com/gregorymp/bump
 licenses: []
@@ -62,9 +64,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Bump your gem version file
-test_files: []
-
+test_files: 
+- test/bump_spec.rb
+- test/fixture/fixture.gemspec