bump 0.1.5 → 0.2.0

data/Gemfile.lock

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

data/README.textile

@@ -4,17 +4,16 @@ bc. gem install bump
 
 h1. Usage
 
-Current version of your gem file:
+Current version of your gem:
 
 bc. bump current
 Current version: 0.1.2
 
-Bump your gemfile (major, minor, tiny):
+Bump your gemfile (major, minor, patch):
 
-bc. bump tiny
+bc. bump patch
 Bump version 0.1.2 to 0.1.3
 
-
 h1. Todo
 
 * Handle options properly

data/bump.gemspec

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

data/lib/bump.rb

@@ -1,28 +1,24 @@
 module Bump
-
   class InvalidOptionError < StandardError; end
   class UnfoundVersionError < StandardError; end
-  class TooManyGemspecsFoundError < StandardError; end
-  class UnfoundGemspecError < StandardError; end
+  class TooManyVersionFilesError < StandardError; end
+  class UnfoundVersionFileError < StandardError; end
 
   class Bump
+    attr_accessor :bump
     
-    attr_accessor :bump, :gemspec_path, :version, :next_version
-    
-    BUMPS = %w(major minor tiny)
+    BUMPS = %w(major minor patch)
     OPTIONS = BUMPS | ["current"]
-    VERSION_REGEX = /\.version\s*=\s*["'](\d+\.\d+\.\d+)["']/
+    VERSION_REGEX = /(\d+\.\d+\.\d+)/
 
     def initialize(bump)
       @bump = bump.is_a?(Array) ? bump.first : bump
     end
 
     def run
-      @version = find_current_version
-
       case @bump
-      when "major", "minor", "tiny"
-        bump
+      when "major", "minor", "patch"
+        bump(@bump)
       when "current"
         current
       else
@@ -32,55 +28,76 @@ module Bump
       ["Invalid option. Choose between #{OPTIONS.join(',')}.", 1]
     rescue UnfoundVersionError
       ["Unable to find your gem version", 1]
-    rescue UnfoundGemspecError
+    rescue UnfoundVersionFileError
       ["Unable to find gemspec file", 1]
-    rescue TooManyGemspecsFoundError
+    rescue TooManyVersionFilesError
       ["More than one gemspec file", 1]
     rescue Exception => e
-      ["Something wrong happened: #{e.message}", 1]
+      ["Something wrong happened: #{e.message}\n#{e.backtrace.join("\n")}", 1]
     end
 
     private
 
-    def bump
-      @next_version = find_next_version
-      system(%(ruby -i -pe "gsub(/#{@version}/, '#{@next_version}')" #{gemspec_path}))
-      ["Bump version #{@version} to #{@next_version}", 0]
+    def bump(part)
+      current, file = current_version
+      next_version = next_version(current, part)
+      replace(file, current, next_version)
+      ["Bump version #{current} to #{next_version}", 0]
+    end
+
+    def replace(file, old, new)
+      content = File.read(file)
+      File.open(file, "w"){|f| f.write(content.gsub(old, new)) }
     end
 
     def current
-      ["Current version: #{@version}", 0]
+      ["Current version: #{current_version.first}", 0]
     end
 
-    def find_current_version
-      match = File.read(gemspec_path).match VERSION_REGEX
-      if match.nil?
-        raise UnfoundVersionError
-      else
-        match[1]
-      end
+    def current_version
+      version, file = version_from_version_rb || version_from_gemspec || raise(UnfoundVersionFileError)
+      raise UnfoundVersionError unless version
+      [version, file]
     end
 
-    def gemspec_path
-      @gemspec_path ||= begin
-        gemspecs = Dir.glob("*.gemspec")
-        raise UnfoundGemspecError if gemspecs.size.zero?
-        raise TooManyGemspecsFoundError if gemspecs.size > 1
-        gemspecs.first
+    def version_from_version_rb
+      return unless file = find_version_file("*/**/version.rb")
+      [
+        File.read(file)[VERSION_REGEX],
+        file
+      ]
+    end
+
+    def version_from_gemspec
+      return unless file = find_version_file("*.gemspec")
+      [
+        File.read(file)[/\.version\s*=\s*["']#{VERSION_REGEX}["']/, 1],
+        file
+      ]
+    end
+
+    def find_version_file(pattern)
+      files = Dir.glob(pattern)
+      case files.size
+      when 0 then nil
+      when 1 then files.first
+      else
+        raise TooManyVersionFilesError
       end
     end
 
-    def find_next_version
-      match = @version.match /(\d+)\.(\d+)\.(\d+)/
-      case @bump
+    def next_version(current, part)
+      match = current.match /(\d+)\.(\d+)\.(\d+)/
+      case part
       when "major"
         "#{match[1].to_i + 1}.0.0"
       when "minor"
         "#{match[1]}.#{match[2].to_i + 1}.0"
-      when "tiny"
+      when "patch"
         "#{match[1]}.#{match[2]}.#{match[3].to_i + 1}"
+      else
+        raise "unknown part #{part.inspect}"
       end
     end
-
   end
 end

data/spec/bump_spec.rb

@@ -23,15 +23,15 @@ describe Bump do
   it "should fail with multiple gemspecs" do
     write_gemspec
     write("xxxx.gemspec", "xxx")
-    bump("", :fail => true).should include "More than one gemspec file"
+    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("", :fail => true).should include "Unable to find your gem version"
+    write_gemspec('"a.b.c"')
+    bump("current", :fail => true).should include "Unable to find your gem version"
   end
 
-  context ".version in gemspect" do
+  context ".version in gemspec" do
     before do
       write_gemspec
     end
@@ -41,8 +41,8 @@ describe Bump do
       read(gemspec).should include('s.version = "4.2.3"')
     end
 
-    it "should bump tiny" do
-      bump("tiny").should include("4.2.4")
+    it "should bump patch" do
+      bump("patch").should include("4.2.4")
       read(gemspec).should include('s.version = "4.2.4"')
     end
 
@@ -57,18 +57,55 @@ describe Bump do
     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")
+      bump("patch").should include("4.2.4")
+      bump("patch").should include("4.2.5")
+      bump("patch").should include("4.2.6")
+      bump("patch").should include("4.2.7")
+      bump("patch").should include("4.2.8")
+      bump("patch").should include("4.2.9")
+      bump("patch").should include("4.2.10")
+      bump("patch").should include("4.2.11")
       read(gemspec).should include('s.version = "4.2.11"')
     end
   end
 
+  context "VERSION in version.rb" do
+    before do
+      write "lib/foo/version.rb", <<-RUBY.sub(" "*8, "")
+        module Foo
+          VERSION = "1.2.3"
+        end
+      RUBY
+    end
+
+    it "show current" do
+      bump("current").should include("1.2.3")
+      read("lib/foo/version.rb").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"')
+    end
+
+    it "should bump Version" do
+      write "lib/foo/version.rb", <<-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"')
+    end
+
+    it "should bump if a gemspec exists and leave it alone" do
+      write_gemspec "Foo::VERSION"
+      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')
+    end
+  end
+
   private
 
   def write(file, content)
@@ -91,10 +128,10 @@ describe Bump do
     run "#{File.expand_path("../../bin/bump", __FILE__)} #{command}", options
   end
 
-  def write_gemspec(version = "4.2.3")
+  def write_gemspec(version = '"4.2.3"')
     write gemspec, <<-RUBY.sub(" "*6, "")
       Gem::Specification.new do |s|
-        s.version = "#{version}"
+        s.version = #{version}
       end
     RUBY
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bump
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -27,7 +27,6 @@ files:
 - bump.gemspec
 - lib/bump.rb
 - spec/bump_spec.rb
-- spec/fixture/fixture.gemspec
 homepage: https://github.com/gregorym/bump
 licenses:
 - MIT