gem-release 0.0.13 → 0.0.14

data/lib/gem_release/command_options.rb

@@ -20,4 +20,4 @@ module GemRelease
       add_option(*args) { |value, options| options[key] = value }
     end
   end
-end
+end

data/lib/gem_release/gemspec.rb

@@ -13,7 +13,7 @@ module GemRelease
       @description ||= '[description]'
       @strategy = options[:strategy]
     end
-    
+
     def files
       case @strategy
       when 'git'
@@ -22,7 +22,7 @@ module GemRelease
         'Dir.glob("lib/**/**")'
       end
     end
-    
+
     def filename
       "#{name}.gemspec"
     end

data/lib/gem_release/helpers.rb

@@ -1,4 +1,4 @@
-require 'core_ext/kernel/silence'
+require 'core_ext/string/camelize'
 
 module GemRelease
   module Helpers
@@ -35,7 +35,7 @@ module GemRelease
     end
 
     def gemspec
-      @gemspec ||= Gem::Specification.load(gemspec_filename) # silence {  }
+      @gemspec ||= Gem::Specification.load(gemspec_filename)
     rescue LoadError, RuntimeError
       nil
     end
@@ -48,4 +48,4 @@ module GemRelease
       end
     end
   end
-end
+end

data/lib/gem_release/template.rb

@@ -30,4 +30,4 @@ module GemRelease
       File.new(File.expand_path("../templates/#{template_name}", __FILE__)).read
     end
   end
-end
+end

data/lib/gem_release/templates/gemspec.erb

@@ -16,5 +16,4 @@ Gem::Specification.new do |s|
   s.platform     = Gem::Platform::RUBY
   s.require_path = 'lib'
   s.rubyforge_project = '[none]'
-  s.required_rubygems_version = '>= 1.3.6'
 end

data/lib/gem_release/templates/version.erb

@@ -1,3 +1,3 @@
 module <%= module_name %>
   VERSION = <%= version.inspect %>
-end
+end

data/lib/gem_release/version.rb

@@ -1,5 +1,5 @@
 module GemRelease
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 
   class Version < Template
     attr_reader :version
@@ -12,9 +12,9 @@ module GemRelease
     def filename
       "lib/#{module_path}/version.rb"
     end
-    
+
     def template_name
       'version.erb'
     end
   end if defined?(Template)
-end
+end

data/lib/gem_release/version_file.rb

@@ -1,54 +1,54 @@
 module GemRelease
   class VersionFile
     include GemRelease::Helpers
-    
+
     VERSION_PATTERN = /(VERSION\s*=\s*(?:"|'))(\d+\.\d+\.\d+)("|')/
     NUMBER_PATTERN  = /(\d+)\.(\d+)\.(\d+)/
-    
+
     attr_reader :target
-    
+
     def initialize(options = {})
       @target = options[:target] || :patch
     end
-    
+
     def bump!
       File.open(filename, 'w+') { |f| f.write(bumped_content) }
     end
-    
+
     def new_number
       @new_number ||= old_number.sub(NUMBER_PATTERN) do
         respond_to?(target) ? send(target, $1, $2, $3) : target
       end
     end
-    
+
     def old_number
       @old_number ||= content =~ VERSION_PATTERN && $2
     end
-    
+
     def filename
       File.expand_path("lib/#{gem_module_path}/version.rb")
     end
-    
+
     protected
-    
+
       def major(major, minor, patch)
         "#{major.to_i + 1}.0.0"
       end
-    
+
       def minor(major, minor, patch)
         "#{major}.#{minor.to_i + 1}.0"
       end
-    
+
       def patch(major, minor, patch)
         "#{major}.#{minor}.#{patch.to_i + 1}"
       end
-    
+
       def content
         @content ||= File.read(filename)
       end
-      
+
       def bumped_content
-        content.sub(VERSION_PATTERN) { "#{$1}#{new_number}#{$3}"}
+        content.sub(VERSION_PATTERN) { "#{$1}#{new_number}#{$3}" }
       end
   end
-end
+end

data/lib/rubygems/commands/bootstrap_command.rb

@@ -1,4 +1,5 @@
 require 'rubygems/commands/gemspec_command'
+require 'core_ext/kernel/silence'
 
 class Gem::Commands::BootstrapCommand < Gem::Command
   include GemRelease, Gem::Commands
@@ -7,7 +8,7 @@ class Gem::Commands::BootstrapCommand < Gem::Command
   OPTIONS = { :gemspec => true, :strategy => 'git', :scaffold => false, :github => false }
 
   attr_reader :arguments, :usage
-  
+
   def initialize
     super 'bootstrap', 'Bootstrap a new gem source repository', OPTIONS
 
@@ -34,7 +35,7 @@ class Gem::Commands::BootstrapCommand < Gem::Command
     write_version
     write_rakefile
   end
-  
+
   def write_version
     version = Version.new(options)
     say "Creating #{version.filename}"
@@ -60,22 +61,22 @@ RAKEFILE
   def create_repo
     options = { :login => github_user, :token => github_token, :name  => gem_name }
     options = options.map { |name, value| "-F '#{name}=#{value}'" }.join(' ')
-    
+
     say 'Bootstrapializing git repository'
     `git init`
-    
+
     say 'Staging files'
     `git add .`
-    
+
     say 'Creating initial commit'
     `git commit -m 'initial commit'`
-    
+
     say "Adding remote origin git@github.com:#{github_user}/#{gem_name}.git"
     `git remote add origin git@github.com:#{github_user}/#{gem_name}.git`
 
     say 'Creating repository on Github'
     silence { `curl #{options} http://github.com/api/v2/yaml/repos/create` }
-    
+
     say 'Pushing to Github'
     `git push origin master`
   end

data/lib/rubygems/commands/bump_command.rb

@@ -1,26 +1,31 @@
-require 'core_ext/string/camelize'
+require 'rubygems/commands/tag_command'
+require 'rubygems/commands/release_command'
 
 class Gem::Commands::BumpCommand < Gem::Command
-  include GemRelease
+  include GemRelease, Gem::Commands
   include Helpers, CommandOptions
 
   attr_reader :arguments, :usage
 
-  OPTIONS = { :to => :patch, :push => false }
+  OPTIONS = { :version => 'patch', :push => false, :tag => false, :release => false }
 
   def initialize
     super 'bump', 'Bump the gem version', OPTIONS
 
-    option :to,   '-t', 'Target version: next [major|minor|patch] or a given version number [x.x.x]'
-    option :push, '-p', 'Push to origin (defaults to false)'
+    option :version, '-v', 'Target version: next [major|minor|patch] or a given version number [x.x.x]'
+    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'
   end
 
   def execute
     bump
     commit
-    push if options[:push]
+    push    if options[:push] || options[:tag]
+    release if options[:release]
+    tag     if options[:tag]
   end
-  
+
   protected
 
     def bump
@@ -38,8 +43,16 @@ class Gem::Commands::BumpCommand < Gem::Command
       say "Pushing to origin"
       `git push`
     end
-    
+
+    def release
+      ReleaseCommand.new.invoke
+    end
+
+    def tag
+      TagCommand.new.invoke
+    end
+
     def version
-      @version ||= VersionFile.new(:target => options[:to])
+      @version ||= VersionFile.new(:target => options[:version])
     end
-end
+end

data/lib/rubygems/commands/gemspec_command.rb

@@ -17,4 +17,4 @@ class Gem::Commands::GemspecCommand < Gem::Command
     say "Creating #{gemspec.filename}"
     gemspec.write
   end
-end
+end

data/lib/rubygems/commands/release_command.rb

@@ -11,7 +11,7 @@ class Gem::Commands::ReleaseCommand < Gem::Command
   attr_reader :arguments, :usage
 
   def initialize
-    super 'release', 'Build a gem from a gemspec and push to rubygems.org'
+    super 'release', 'Build gem from a gemspec and push to rubygems.org'
     option :tag, '-t', 'Create a git tag and push --tags to origin'
     @arguments = "gemspec - optional gemspec file name, will use the first *.gemspec if not specified"
     @usage = "#{program_name} [gemspec]"
@@ -43,4 +43,4 @@ class Gem::Commands::ReleaseCommand < Gem::Command
     def tag
       TagCommand.new.invoke
     end
-end
+end

data/lib/rubygems/commands/tag_command.rb

@@ -12,7 +12,7 @@ class Gem::Commands::TagCommand < Gem::Command
     tag
     push
   end
-  
+
   protected
 
     def tag
@@ -24,8 +24,8 @@ class Gem::Commands::TagCommand < Gem::Command
       say "Pushing --tags to origin git repository"
       `git push --tags origin`
     end
-    
+
     def tag_name
       "v#{gem_version}"
     end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem-release
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 +02:00
+date: 2010-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency