gem-release 0.2.2 → 0.3.0

data/lib/gem_release/version.rb

@@ -1,3 +1,3 @@
 module GemRelease
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/lib/gem_release/version_file.rb

@@ -15,7 +15,7 @@ module GemRelease
 
     def bump!
       File.open(filename, 'w+') { |f| f.write(bumped_content) }
-      require_version
+      reload_version
     end
 
     def new_number
@@ -42,8 +42,8 @@ module GemRelease
         "lib/#{path}/version.rb"
       end
 
-      def require_version
-        silence { require(filename) }
+      def reload_version
+        silently { load(filename) }
       end
 
       def major(major, minor, patch)
@@ -65,5 +65,16 @@ module GemRelease
       def bumped_content
         content.sub(VERSION_PATTERN) { "#{$1}#{new_number}#{$3}" }
       end
+
+      def silently(&block)
+        warn_level = $VERBOSE
+        $VERBOSE = nil
+        begin
+          result = block.call
+        ensure
+          $VERBOSE = warn_level
+        end
+        result
+      end
   end
 end

data/lib/rubygems/commands/bump_command.rb

@@ -12,6 +12,10 @@ class Gem::Commands::BumpCommand < Gem::Command
     :version  => 'patch',
     :commit   => true,
     :push     => false,
+    :tag      => false,
+    :release  => false,
+    :key      => '',
+    :host     => '',
     :quiet    => false
   }
 
@@ -21,6 +25,10 @@ class Gem::Commands::BumpCommand < Gem::Command
     option :version, '-v', 'Target version: next [major|minor|patch] 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 :quiet,   '-q', 'Do not output status messages'
   end
 
@@ -28,7 +36,8 @@ class Gem::Commands::BumpCommand < Gem::Command
     @new_version_number = nil
 
     # enforce option dependencies
-    options[:commit] = options[:commit] || options[:push]
+    options[:push] = false if options[:tag] # push is performed as part of tag
+    options[:commit] = options[:commit] || options[:push] || options[:tag] || options[:release]
 
     in_gemspec_dirs do
       bump
@@ -39,6 +48,8 @@ class Gem::Commands::BumpCommand < Gem::Command
     else
       commit  if options[:commit]
       push    if options[:push]
+      tag     if options[:tag]
+      release if options[:release]
     end
   end
 
@@ -65,4 +76,19 @@ class Gem::Commands::BumpCommand < Gem::Command
       say "Pushing to the origin git repository" unless quiet?
       `git push origin`
     end
+
+    def release
+      cmd = ReleaseCommand.new
+      [:key, :host].each do |option|
+        cmd.options[option] = options[option]
+      end
+      cmd.options[:quiet] = options[:quiet]
+      cmd.execute
+    end
+
+    def tag
+      cmd = TagCommand.new
+      cmd.options[:quiet] = options[:quiet]
+      cmd.execute
+    end
 end

data/lib/rubygems/commands/release_command.rb

@@ -28,13 +28,14 @@ class Gem::Commands::ReleaseCommand < Gem::Command
   end
 
   def execute
+    tag if options[:tag]
+
     in_gemspec_dirs do
       build
       push
       remove
     end
 
-    tag if options[:tag]
     say "All is good, thanks my friend.\n"
   end
 
@@ -60,6 +61,6 @@ class Gem::Commands::ReleaseCommand < Gem::Command
     end
 
     def tag
-      TagCommand.new.invoke
+      TagCommand.new(:quiet => quiet?).invoke
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-release
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  requirement: &70092272876100 !ruby/object:Gem::Requirement
+  requirement: &70094017679920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *70092272876100
+  version_requirements: *70094017679920
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70092272875160 !ruby/object:Gem::Requirement
+  requirement: &70094017711600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70092272875160
+  version_requirements: *70094017711600
 description: Release your ruby gems with ease. (What a bold statement for such a tiny
   plugin ...)
 email: svenfuchs@artweb-design.de