gem-release 0.0.22 → 0.0.23

data/lib/gem_release/helpers.rb

@@ -43,11 +43,6 @@ module GemRelease
     end
 
     def gem_version
-      # After a version file has been changed, the new version will strangely not be obtained by reloading the spec with
-      # Gem::Specification.load(). Therefore, let's obtain the version from the version file directly, and only use
-      # gemspec.version if this fails.
-      VersionFile.new.old_number
-    rescue
       gemspec.version.to_s
     end
 

data/lib/gem_release/version.rb

@@ -1,5 +1,5 @@
 module GemRelease
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 
   class Version < Template
     attr_reader :version

data/lib/gem_release/version_file.rb

@@ -35,12 +35,7 @@ module GemRelease
     protected
 
       def require_version
-        $: << 'lib' unless $:.include?('lib')
-        require "#{gem_module_path}/version"
-      end
-
-      def force_load!
-        silence { load(filename) }
+        silence { require(filename) }
       end
 
       def major(major, minor, patch)

data/lib/rubygems/commands/bump_command.rb

@@ -1,5 +1,6 @@
 require 'gem_release'
 require 'rubygems/commands/tag_command'
+require 'rubygems/commands/release_command'
 
 class Gem::Commands::BumpCommand < Gem::Command
   include GemRelease, Gem::Commands
@@ -11,6 +12,7 @@ class Gem::Commands::BumpCommand < Gem::Command
     :version  => 'patch',
     :push     => false,
     :tag      => false,
+    :release  => false,
     :commit   => true,
     :quiet    => false
   }
@@ -22,6 +24,7 @@ class Gem::Commands::BumpCommand < Gem::Command
     option :commit,  '-c', 'Perform a commit after incrementing gem version'
     option :push,    '-p', 'Push to origin'
     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 :quiet,   '-q', 'Do not output status messages'
   end
 
@@ -30,7 +33,7 @@ class Gem::Commands::BumpCommand < Gem::Command
 
     # enforce option dependencies
     options[:push] = options[:push] || options[:tag]
-    options[:commit] = options[:commit] || options[:push]
+    options[:commit] = options[:commit] || options[:push] || options[:release]
 
     in_gemspec_dirs do
       bump
@@ -41,6 +44,7 @@ class Gem::Commands::BumpCommand < Gem::Command
     else
       commit  if options[:commit]
       push    if options[:push]
+      release if options[:release]
       tag     if options[:tag]
     end
   end
@@ -69,6 +73,10 @@ class Gem::Commands::BumpCommand < Gem::Command
       `git push`
     end
 
+    def release
+      ReleaseCommand.new.invoke
+    end
+
     def tag
       TagCommand.new.invoke
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem-release
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 0
-  - 22
-  version: 0.0.22
+  - 23
+  version: 0.0.23
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 -04:00
+date: 2011-09-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency