bump 0.3.1 → 0.3.2

data/Gemfile.lock

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

data/bin/bump

@@ -11,6 +11,7 @@ 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)

data/bump.gemspec

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

data/lib/bump.rb

@@ -5,13 +5,14 @@ module Bump
   class UnfoundVersionFileError < StandardError; end
 
   class Bump
-    BUMPS = %w(major minor patch)
+    BUMPS = %w(major minor patch pre)
+    PRERELEASE = ["alpha","beta","rc",nil]
     OPTIONS = BUMPS | ["current"]
-    VERSION_REGEX = /(\d+\.\d+\.\d+)/
+    VERSION_REGEX = /(\d+\.\d+\.\d+(?:-(?:#{PRERELEASE.compact.join('|')}))?)/
 
     def self.run(bump, options)
       case bump
-      when "major", "minor", "patch"
+      when *BUMPS
         bump(bump, options)
       when "current"
         current
@@ -96,17 +97,23 @@ module Bump
     end
 
     def self.next_version(current, part)
-      match = current.match /(\d+)\.(\d+)\.(\d+)/
+      current, prerelease = current.split('-')
+      major, minor, patch, *other = current.split('.')
       case part
       when "major"
-        "#{match[1].to_i + 1}.0.0"
+        major, minor, patch, prerelease = major.succ, 0, 0, nil
       when "minor"
-        "#{match[1]}.#{match[2].to_i + 1}.0"
+        minor, patch, prerelease = minor.succ, 0, nil
       when "patch"
-        "#{match[1]}.#{match[2]}.#{match[3].to_i + 1}"
+        patch = patch.succ
+      when "pre"
+        prerelease.strip! if prerelease.respond_to? :strip
+        prerelease = PRERELEASE[PRERELEASE.index(prerelease).succ % PRERELEASE.length]
       else
         raise "unknown part #{part.inspect}"
       end
+      version = [major, minor, patch, *other].compact.join('.')
+      [version, prerelease].compact.join('-')
     end
   end
 end

data/spec/bump_spec.rb

@@ -145,28 +145,87 @@ describe Bump do
   end
 
   context "version in VERSION" do
+    let(:version) { "1.2.3" }
+
     before do
-      write "VERSION", "1.2.3\n"
+      write "VERSION", "#{version}\n"
     end
 
     it "show current" do
-      bump("current").should include("1.2.3")
-      read("VERSION").should == "1.2.3\n"
+      bump("current").should include("#{version}")
+      read("VERSION").should include("#{version}")
     end
 
     it "should bump version" do
       bump("minor").should include("1.3.0")
-      read("VERSION").should == "1.3.0\n"
+      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_rb "File.read('VERSION')"
       bump("minor").should include("1.3.0")
-      read("VERSION").should == "1.3.0\n"
+      read("VERSION").should include("1.3.0")
       read(version_rb_file).should include("VERSION = File.read('VERSION')")
       read(gemspec).should include("version = File.read('VERSION')")
     end
+
+    context "with pre-release identifier" do
+      let(:version) { "1.2.3-alpha" }
+      before do
+        write "VERSION", "#{version}\n"
+      end
+
+      it "show current" do
+        bump("current").should include(version)
+        read("VERSION").should include(version)
+      end
+
+      it "minor should drop prerelease" do
+        bump("minor").should include("1.3.0")
+        read("VERSION").should include("1.3.0")
+        bump("minor").should_not include("alpha")
+        read("VERSION").should_not include("alpha")
+      end
+
+      it "major should drop prerelease" do
+        bump("major").should include("2.0.0")
+        read("VERSION").should include("2.0.0")
+        bump("major").should_not include("alpha")
+        read("VERSION").should_not include("alpha")
+      end
+
+      context "alpha" do
+        it "should bump to beta" do
+          bump("pre").should include("1.2.3-beta")
+          read("VERSION").should include("1.2.3-beta")
+        end
+      end
+
+      context "beta" do
+        let(:version) { "1.2.3-beta" }
+        it "should bump to rc" do
+          bump("pre").should include("1.2.3-rc")
+          read("VERSION").should include("1.2.3-rc")
+        end
+      end
+
+      context "rc" do
+        let(:version) { "1.2.3-rc" }
+        it "should bump to final" do
+          bump("pre").should include("1.2.3")
+          read("VERSION").should include("1.2.3")
+        end
+      end
+
+      context "final" do
+        let(:version) { "1.2.3" }
+        it "should bump to alpha" do
+          bump("pre").should include("1.2.3-alpha")
+          read("VERSION").should include("1.2.3-alpha")
+        end
+      end
+    end
   end
 
   context "with a Gemfile" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bump
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors: