gem-release 0.0.12 → 0.0.13

data/lib/gem_release.rb

@@ -4,4 +4,5 @@ module GemRelease
   autoload :Helpers,        'gem_release/helpers'
   autoload :Template,       'gem_release/template'
   autoload :Version,        'gem_release/version'
+  autoload :VersionFile,    'gem_release/version_file'
 end

data/lib/gem_release/helpers.rb

@@ -18,6 +18,14 @@ module GemRelease
       File.basename(Dir.pwd)
     end
 
+    def gem_module_path
+      @gem_module_path ||= gem_name.gsub('-', '_')
+    end
+
+    def gem_module_name
+      @gem_module_name ||= gem_module_path.camelize
+    end
+
     def gem_filename
       gemspec.file_name
     end
@@ -34,7 +42,7 @@ module GemRelease
 
     def gemspec_filename
       @gemspec_filename ||= begin
-        name = Array(options[:args]).first
+        name = Array(options[:args]).first rescue nil
         name ||= Dir['*.gemspec'].first
         name || raise("No gemspec found or given.")
       end

data/lib/gem_release/version.rb

@@ -1,5 +1,5 @@
 module GemRelease
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 
   class Version < Template
     attr_reader :version
@@ -16,5 +16,5 @@ module GemRelease
     def template_name
       'version.erb'
     end
-  end
+  end if defined?(Template)
 end

data/lib/gem_release/version_file.rb

@@ -0,0 +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}"}
+      end
+  end
+end

data/lib/rubygems/commands/bootstrap_command.rb

@@ -1,4 +1,3 @@
-require 'gem_release/helpers'
 require 'rubygems/commands/gemspec_command'
 
 class Gem::Commands::BootstrapCommand < Gem::Command

data/lib/rubygems/commands/bump_command.rb

@@ -0,0 +1,45 @@
+require 'core_ext/string/camelize'
+
+class Gem::Commands::BumpCommand < Gem::Command
+  include GemRelease
+  include Helpers, CommandOptions
+
+  attr_reader :arguments, :usage
+
+  OPTIONS = { :to => :patch, :push => 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)'
+  end
+
+  def execute
+    bump
+    commit
+    push if options[:push]
+  end
+  
+  protected
+
+    def bump
+      say "Bumping from #{version.old_number} to version #{version.new_number}"
+      version.bump!
+    end
+
+    def commit
+      say "Creating commit"
+      `git add #{version.filename}`
+      `git commit -m "Bump to #{version.new_number}"`
+    end
+
+    def push
+      say "Pushing to origin"
+      `git push`
+    end
+    
+    def version
+      @version ||= VersionFile.new(:target => options[:to])
+    end
+end

data/lib/rubygems/commands/gemspec_command.rb

@@ -1,5 +1,3 @@
-require 'gem_release/helpers'
-
 class Gem::Commands::GemspecCommand < Gem::Command
   include GemRelease
   include Helpers, CommandOptions

data/lib/rubygems/commands/release_command.rb

@@ -1,7 +1,6 @@
 require 'rubygems/commands/build_command'
 require 'rubygems/commands/push_command'
 require 'rubygems/commands/tag_command'
-require 'gem_release/helpers'
 
 class Gem::Commands::ReleaseCommand < Gem::Command
   include GemRelease, Gem::Commands

data/lib/rubygems/commands/tag_command.rb

@@ -1,5 +1,3 @@
-require 'gem_release/helpers'
-
 class Gem::Commands::TagCommand < Gem::Command
   include GemRelease
   include Helpers, CommandOptions

data/lib/rubygems_plugin.rb

@@ -3,5 +3,6 @@ require 'gem_release'
 
 Gem::CommandManager.instance.register_command :gemspec
 Gem::CommandManager.instance.register_command :bootstrap
+Gem::CommandManager.instance.register_command :bump
 Gem::CommandManager.instance.register_command :release
-Gem::CommandManager.instance.register_command :tag
+Gem::CommandManager.instance.register_command :tag

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem-release
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,29 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +02:00
+date: 2010-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
-        version: 1.6.0
-  type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: test_declarative
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +33,11 @@ dependencies:
         - 2
         version: 0.0.2
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,7 +49,7 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: Release your ruby gems with ease. (What a bold statement for such a tiny plugin ...)
 email: svenfuchs@artweb-design.de
 executables: []
@@ -85,7 +69,9 @@ files:
 - lib/gem_release/templates/gemspec.erb
 - lib/gem_release/templates/version.erb
 - lib/gem_release/version.rb
+- lib/gem_release/version_file.rb
 - lib/rubygems/commands/bootstrap_command.rb
+- lib/rubygems/commands/bump_command.rb
 - lib/rubygems/commands/gemspec_command.rb
 - lib/rubygems/commands/release_command.rb
 - lib/rubygems/commands/tag_command.rb