gem-release 0.0.19 → 0.0.20

data/lib/gem_release/helpers.rb

@@ -60,7 +60,6 @@ module GemRelease
 
     def in_gemspec_dirs
       gemspec_dirs.each do |dir|
-        @version = nil # UGH.
         Dir.chdir(dir) { yield }
       end
     end

data/lib/gem_release/version.rb

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

data/lib/rubygems/commands/bump_command.rb

@@ -29,21 +29,32 @@ class Gem::Commands::BumpCommand < Gem::Command
   end
 
   def execute
+    @new_version_number = nil
+
+    # enforce option dependencies
+    options[:push] = options[:push] || options[:tag]
+    options[:commit] = options[:commit] || options[:push] || options[:release]
+
     in_gemspec_dirs do
       bump
     end
 
-    @version = nil # UGH
-    commit  if options[:commit]
-    push    if options[:push] || options[:tag]
-    release if options[:release]
-    tag     if options[:tag]
+    if @new_version_number == nil
+      say "No version files could be found, so no actions were performed." unless quiet?
+    else
+      commit  if options[:commit]
+      push    if options[:push]
+      release if options[:release]
+      tag     if options[:tag]
+    end
   end
 
   protected
 
     def bump
+      version = VersionFile.new(:target => (@new_version_number || options[:version]))
       if File.exist?(version.filename)
+        @new_version_number ||= version.new_number
         say "Bumping #{gem_name} from #{version.old_number} to version #{version.new_number}" unless quiet?
         version.bump!
         `git add #{version.filename}` if options[:commit]
@@ -54,7 +65,7 @@ class Gem::Commands::BumpCommand < Gem::Command
 
     def commit
       say "Creating commit" unless quiet?
-      `git commit -m "Bump to #{version.new_number}"`
+      `git commit -m "Bump to #{@new_version_number}"`
     end
 
     def push
@@ -69,8 +80,4 @@ class Gem::Commands::BumpCommand < Gem::Command
     def tag
       TagCommand.new.invoke
     end
-
-    def version
-      @version ||= VersionFile.new(:target => options[:version])
-    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-release
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-29 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-09-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  requirement: &2167590280 !ruby/object:Gem::Requirement
+  requirement: &70249055850780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *2167590280
+  version_requirements: *70249055850780
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2167589760 !ruby/object:Gem::Requirement
+  requirement: &70249055850000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +32,7 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2167589760
+  version_requirements: *70249055850000
 description: Release your ruby gems with ease. (What a bold statement for such a tiny
   plugin ...)
 email: svenfuchs@artweb-design.de
@@ -64,7 +63,6 @@ files:
 - lib/rubygems/commands/release_command.rb
 - lib/rubygems/commands/tag_command.rb
 - lib/rubygems_plugin.rb
-has_rdoc: true
 homepage: http://github.com/svenfuchs/gem-release
 licenses: []
 post_install_message: 
@@ -85,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Release your ruby gems with ease