gem-release 0.3.1 → 0.4.0

data/lib/gem_release/version.rb

@@ -1,3 +1,3 @@
 module GemRelease
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/lib/gem_release/version_file.rb

@@ -6,11 +6,15 @@ module GemRelease
 
     VERSION_PATTERN = /(VERSION\s*=\s*(?:"|'))((?:(?!"|').)*)("|')/
     NUMBER_PATTERN  = /(\d+)\.(\d+)\.(\d+)(.*)/
+    PRERELEASE_NUMBER_PATTERN  = /(\d+)\.(\d+)\.(\d+)\.(.*)(\d+)/
 
     attr_reader :target
 
     def initialize(options = {})
-      @target = options[:target] || :patch
+      @target = options[:target]
+      if @target == nil || @target == ''
+        @target = is_prerelease_version_number?(old_number) ? :pre : :patch
+      end
     end
 
     def bump!
@@ -19,9 +23,20 @@ module GemRelease
     end
 
     def new_number
-      @new_number ||= old_number.sub(NUMBER_PATTERN) do
-        respond_to?(target) ? send(target, $1, $2, $3) : target
-      end
+      @new_number ||=
+        if is_version_number?(target)
+          target
+        elsif [:major, :minor, :patch].include?(target.to_sym)
+          old_number.sub(NUMBER_PATTERN) do
+            send(target, $1, $2, $3)
+          end
+        elsif is_prerelease_version_number?(old_number)
+          old_number.sub(PRERELEASE_NUMBER_PATTERN) do
+            prerelease($1, $2, $3, $4, $5)
+          end
+        else
+          "#{old_number}.#{target}1"
+        end
     end
 
     def old_number
@@ -58,6 +73,10 @@ module GemRelease
         "#{major}.#{minor}.#{patch.to_i + 1}"
       end
 
+      def prerelease(major, minor, patch, prereleasePrefix, prereleaseNumber)
+        "#{major}.#{minor}.#{patch}.#{prereleasePrefix || 'pre'}#{prereleaseNumber.to_i + 1}"
+      end
+
       def content
         @content ||= File.read(filename)
       end
@@ -76,5 +95,13 @@ module GemRelease
         end
         result
       end
+
+      def is_version_number?(v)
+        v.to_s.match(NUMBER_PATTERN) != nil
+      end
+
+      def is_prerelease_version_number?(v)
+        v.to_s.match(PRERELEASE_NUMBER_PATTERN) != nil
+      end
   end
 end

data/lib/rubygems/commands/bump_command.rb

@@ -9,7 +9,7 @@ class Gem::Commands::BumpCommand < Gem::Command
   attr_reader :arguments, :usage
 
   DEFAULTS = {
-    :version  => 'patch',
+    :version  => '',
     :commit   => true,
     :push     => false,
     :tag      => false,
@@ -22,13 +22,13 @@ class Gem::Commands::BumpCommand < Gem::Command
   def initialize(options = {})
     super 'bump', 'Bump the gem version', DEFAULTS.merge(options)
 
-    option :version, '-v', 'Target version: next [major|minor|patch] or a given version number [x.x.x]'
+    option :version, '-v', 'Target version: next [major|minor|patch|pre] or a given version number [x.x.x]'
     option :commit,  '-c', 'Perform a commit after incrementing gem version'
     option :push,    '-p', 'Push to the origin git repository'
     option :tag,     '-t', 'Create a git tag and push --tags to origin'
     option :release, '-r', 'Build gem from a gemspec and push to rubygems.org'
-    option :key,     '-k', 'When releasing: Use the given API key from ~/.gem/credentials'
-    option :host,    '-h', 'When releasing: Push to a gemcutter-compatible host other than rubygems.org'
+    option :key,     '-k', 'When releasing: use the given API key from ~/.gem/credentials'
+    option :host,    '-h', 'When releasing: push to a gemcutter-compatible host other than rubygems.org'
     option :quiet,   '-q', 'Do not output status messages'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-release
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-22 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  requirement: &70341463036800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *70341463036800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70341463036320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70341463036320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 description: Release your ruby gems with ease. (What a bold statement for such a tiny
   plugin ...)
 email: svenfuchs@artweb-design.de
@@ -84,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Release your ruby gems with ease