gem-release 0.1.3 → 0.2.0

data/lib/gem_release.rb

@@ -1,8 +1,9 @@
 module GemRelease
-  autoload :CommandOptions, 'gem_release/command_options'
-  autoload :Gemspec,        'gem_release/gemspec'
-  autoload :Helpers,        'gem_release/helpers'
-  autoload :Template,       'gem_release/template'
-  autoload :Version,        'gem_release/version'
-  autoload :VersionFile,    'gem_release/version_file'
+  autoload :CommandOptions,  'gem_release/command_options'
+  autoload :GemspecTemplate, 'gem_release/gemspec_template'
+  autoload :Helpers,         'gem_release/helpers'
+  autoload :Template,        'gem_release/template'
+  autoload :Version,         'gem_release/version'
+  autoload :VersionFile,     'gem_release/version_file'
+  autoload :VersionTemplate, 'gem_release/version_template'
 end

data/lib/gem_release/command_options.rb

@@ -10,7 +10,12 @@ module GemRelease
 
       if default.is_a?(String)
         long = "--#{key} #{key.to_s.upcase}"
-        args = [short, long, String, "#{description} (defaults to #{default})"]
+        if default == ''
+          default_description = 'not set by default'
+        else
+          default_description = "defaults to #{default}"
+        end
+        args = [short, long, String, "#{description} (#{default_description})"]
       else
         long = "--[no-]#{key}"
         args = [short, long, "#{description} (defaults to #{default})"]

data/lib/gem_release/{gemspec.rb → gemspec_template.rb}

@@ -1,5 +1,5 @@
 module GemRelease
-  class Gemspec < Template
+  class GemspecTemplate < Template
     attr_reader :author, :email, :homepage, :summary, :description, :strategy
 
     def initialize(options = {})

data/lib/gem_release/version.rb

@@ -1,16 +1,3 @@
 module GemRelease
-  VERSION = '0.1.3'
-
-  class Version < Template
-    attr_reader :version
-
-    def initialize(options = {})
-      super('version.rb', options)
-      @version ||= '0.0.1'
-    end
-
-    def filename
-      "lib/#{module_path}/version.rb"
-    end
-  end if defined?(Template)
+  VERSION = '0.2.0'
 end

data/lib/gem_release/version_template.rb

@@ -0,0 +1,14 @@
+module GemRelease
+  class VersionTemplate < Template
+    attr_reader :version
+
+    def initialize(options = {})
+      super('version.rb', options)
+      @version ||= '0.0.1'
+    end
+
+    def filename
+      "lib/#{module_path}/version.rb"
+    end
+  end
+end

data/lib/rubygems/commands/bootstrap_command.rb

@@ -50,7 +50,7 @@ class Gem::Commands::BootstrapCommand < Gem::Command
     create_file Template.new('Gemfile')
     create_file Template.new('Rakefile')
     create_file Template.new('test/test_helper.rb')
-    create_file Version.new(options)
+    create_file VersionTemplate.new(options)
   end
 
   def create_lib

data/lib/rubygems/commands/bump_command.rb

@@ -10,10 +10,8 @@ class Gem::Commands::BumpCommand < Gem::Command
 
   DEFAULTS = {
     :version  => 'patch',
-    :push     => false,
-    :tag      => false,
-    :release  => false,
     :commit   => true,
+    :push     => false,
     :quiet    => false
   }
 
@@ -23,8 +21,6 @@ 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 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
 
@@ -32,8 +28,7 @@ class Gem::Commands::BumpCommand < Gem::Command
     @new_version_number = nil
 
     # enforce option dependencies
-    options[:push] = options[:push] || options[:tag]
-    options[:commit] = options[:commit] || options[:push] || options[:release]
+    options[:commit] = options[:commit] || options[:push]
 
     in_gemspec_dirs do
       bump
@@ -44,8 +39,6 @@ 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
 
@@ -72,12 +65,4 @@ class Gem::Commands::BumpCommand < Gem::Command
       say "Pushing to origin" unless quiet?
       `git push`
     end
-
-    def release
-      ReleaseCommand.new.invoke
-    end
-
-    def tag
-      TagCommand.new.invoke
-    end
 end

data/lib/rubygems/commands/gemspec_command.rb

@@ -17,7 +17,7 @@ class Gem::Commands::GemspecCommand < Gem::Command
   end
 
   def execute
-    gemspec = Gemspec.new(options)
+    gemspec = GemspecTemplate.new(options)
     if gemspec.exists?
       say "Skipping #{gemspec.filename}: already exists" unless quiet?
     else

data/lib/rubygems/commands/release_command.rb

@@ -8,7 +8,9 @@ class Gem::Commands::ReleaseCommand < Gem::Command
 
   DEFAULTS = {
     :tag   => false,
-    :quiet => false
+    :quiet => false,
+    :key   => '',
+    :host  => ''
   }
 
   attr_reader :arguments, :usage
@@ -18,6 +20,8 @@ class Gem::Commands::ReleaseCommand < Gem::Command
 
     option :tag,   '-t', 'Create a git tag and push --tags to origin'
     option :quiet, '-q', 'Do not output status messages'
+    option :key,   '-k', 'Use the given API key from ~/.gem/credentials'
+    option :host,  '-h', 'Push to a gemcutter-compatible host other than rubygems.org'
 
     @arguments = "gemspec - optional gemspec file name, will use the first *.gemspec if not specified"
     @usage = "#{program_name} [gemspec]"
@@ -41,7 +45,13 @@ class Gem::Commands::ReleaseCommand < Gem::Command
     end
 
     def push
-      PushCommand.new.invoke(gem_filename)
+      args = []
+      [:key, :host].each do |option|
+        args += ["--#{option}", options[option]] unless options[option] == ''
+      end
+      args += "--quiet" if quiet?
+
+      PushCommand.new.invoke(gem_filename, *args)
     end
 
     def remove

metadata

@@ -1,71 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gem-release
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-26 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: test_declarative
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70146446234740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.2
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70146446234740
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70146446233940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id002
-description: Release your ruby gems with ease. (What a bold statement for such a tiny plugin ...)
+  prerelease: false
+  version_requirements: *70146446233940
+description: Release your ruby gems with ease. (What a bold statement for such a tiny
+  plugin ...)
 email: svenfuchs@artweb-design.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/core_ext/kernel/silence.rb
 - lib/core_ext/string/camelize.rb
 - lib/gem_release.rb
 - lib/gem_release/command_options.rb
-- lib/gem_release/gemspec.rb
+- lib/gem_release/gemspec_template.rb
 - lib/gem_release/helpers.rb
-- lib/gem_release/license.rb
 - lib/gem_release/template.rb
 - lib/gem_release/templates/Gemfile
 - lib/gem_release/templates/LICENSE
@@ -77,47 +57,35 @@ files:
 - lib/gem_release/templates/version.rb
 - lib/gem_release/version.rb
 - lib/gem_release/version_file.rb
+- lib/gem_release/version_template.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
 - lib/rubygems_plugin.rb
-has_rdoc: true
 homepage: http://github.com/svenfuchs/gem-release
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
-rubyforge_project: "[none]"
-rubygems_version: 1.4.2
+rubyforge_project: ! '[none]'
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Release your ruby gems with ease
 test_files: []
-

data/lib/gem_release/license.rb

@@ -1,18 +0,0 @@
-module GemRelease
-  class License < Template
-    attr_reader :author, :email, :year
-
-    def initialize(options = {})
-      super
-
-      @author  ||= user_name
-      @email   ||= user_email
-      @year    ||= Time.now.year
-    end
-
-    def template_name
-      'gemspec.erb'
-    end
-  end
-end
-