gem-release 0.0.8 → 0.0.9

data/lib/gem_release/command_options.rb

@@ -1,11 +1,23 @@
 module GemRelease
   module CommandOptions
+    def initialize(*args)
+      @arguments = ''
+      super
+    end
+
     def option(key, short, description)
-      long    = "--[no-]#{key}"
-      default = self.class::OPTIONS[key]
-      add_option(short, long, description, "Defaults to #{default}") do |value, options| 
-        options[key] = value
+      options = self.class::OPTIONS
+      default = options[key]
+
+      if String === default
+        long = "--#{key} #{key.to_s.upcase}"
+        args = [short, long, String, "#{description} (defaults to #{default})"]
+      else
+        long = "--[no-]#{key}"
+        args = [short, long, "#{description} (defaults to #{default})"]
       end
+
+      add_option(*args) { |value, options| options[key] = value }
     end
   end
 end

data/lib/gem_release/version.rb

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

data/lib/rubygems/commands/{init_command.rb → bootstrap_command.rb}

@@ -1,26 +1,21 @@
 require 'gem_release/helpers'
+require 'rubygems/commands/gemspec_command'
 
-class Gem::Commands::InitCommand < Gem::Command
-  include GemRelease
+class Gem::Commands::BootstrapCommand < Gem::Command
+  include GemRelease, Gem::Commands
   include Helpers, CommandOptions
 
-  OPTIONS = {
-    :gemspec  => true,
-    :scaffold => false,
-    :github   => false
-  }
+  OPTIONS = { :gemspec => true, :strategy => 'git', :scaffold => false, :github => false }
 
   attr_reader :arguments, :usage
   
   def initialize
-    super 'init', 'Initialize a new gem source repository', OPTIONS
+    super 'bootstrap', 'Bootstrap a new gem source repository', OPTIONS
 
     option :gemspec,  '-g', 'Generate a .gemspec'
+    option :strategy, '-f', 'Strategy for collecting files [glob|git] in .gemspec'
     option :scaffold, '-s', 'Scaffold lib/[gem_name]/version.rb README test/'
-    option :github,   '-h', 'Init a git repo, create on github and push'
-
-    @arguments = ''
-    @usage = "#{program_name}"
+    option :github,   '-h', 'Bootstrap a git repo, create on github and push'
   end
 
   def execute
@@ -29,21 +24,28 @@ class Gem::Commands::InitCommand < Gem::Command
     create_repo    if options[:github]
   end
 
+  def write_gemspec
+    GemspecCommand.new.invoke
+  end
+
   def write_scaffold
+    say 'scaffolding lib/ README test/'
     `mkdir lib test`
     `touch README`
-    Version.new(options).write
+    write_version
   end
-
-  def write_gemspec
-    Gemspec.new(options).write
+  
+  def write_version
+    version = Version.new(options)
+    say "Creating #{version.filename}"
+    version.write
   end
 
   def create_repo
     options = { :login => github_user, :token => github_token, :name  => gem_name }
     options = options.map { |name, value| "-F '#{name}=#{value}'" }.join(' ')
     
-    say 'Initializing git repository'
+    say 'Bootstrapializing git repository'
     `git init`
     
     say 'Staging files'

data/lib/rubygems/commands/gemspec_command.rb

@@ -0,0 +1,22 @@
+require 'gem_release/helpers'
+
+class Gem::Commands::GemspecCommand < Gem::Command
+  include GemRelease
+  include Helpers, CommandOptions
+
+  OPTIONS = { :strategy => 'git' }
+
+  attr_reader :arguments, :usage
+
+  def initialize
+    super 'bootstrap', 'Bootstrap a new gem source repository', OPTIONS
+
+    option :strategy, '-f', 'Strategy for collecting files [glob|git] in .gemspec'
+  end
+
+  def execute
+    gemspec = Gemspec.new(options)
+    say "Creating #{gemspec.filename}"
+    gemspec.write
+  end
+end

data/lib/rubygems/commands/release_command.rb

@@ -4,16 +4,17 @@ require 'rubygems/commands/tag_command'
 require 'gem_release/helpers'
 
 class Gem::Commands::ReleaseCommand < Gem::Command
-  include GemRelease::Helpers, Gem::Commands
+  include GemRelease, Gem::Commands
+  include Helpers, CommandOptions
+
+  OPTIONS = { :tag => false }
 
   attr_reader :arguments, :usage
 
   def initialize
-    super('release', 'Build a gem from a gemspec and push to rubygems.org', :tag => false)
-    add_option('-t', '--tag', "Create a git tag and push --tags to origin. Defaults to #{options[:tag]}.") do |tag, options|
-      options[:tag] = tag
-    end
-    @arguments = "gemspec - optional gemspec file, will use the first *.gemspec if not specified"
+    super 'release', 'Build a 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]"
   end
 
@@ -22,7 +23,7 @@ class Gem::Commands::ReleaseCommand < Gem::Command
     push
     remove
     tag if options[:tag]
-    say "All done, thanks buddy.\n"
+    say "All is good, thanks buddy.\n"
   end
 
   protected
@@ -39,7 +40,7 @@ class Gem::Commands::ReleaseCommand < Gem::Command
       `rm #{gem_filename}`
       say "Deleting left over gem file #{gem_filename}"
     end
-    
+
     def tag
       TagCommand.new.invoke
     end

data/lib/rubygems/commands/tag_command.rb

@@ -1,14 +1,13 @@
 require 'gem_release/helpers'
 
 class Gem::Commands::TagCommand < Gem::Command
-  include GemRelease::Helpers
+  include GemRelease
+  include Helpers, CommandOptions
 
   attr_reader :arguments, :usage
 
   def initialize
     super 'tag', 'Create a git tag and push --tags to origin'
-    @arguments = '' 
-    @usage = "#{program_name}"
   end
 
   def execute

data/lib/rubygems_plugin.rb

@@ -1,6 +1,7 @@
 require 'rubygems/command_manager'
 require 'gem_release'
 
-Gem::CommandManager.instance.register_command :init
+Gem::CommandManager.instance.register_command :gemspec
+Gem::CommandManager.instance.register_command :bootstrap
 Gem::CommandManager.instance.register_command :release
 Gem::CommandManager.instance.register_command :tag

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 +02:00
+date: 2010-04-05 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -37,7 +37,8 @@ files:
 - lib/gem_release/templates/gemspec.erb
 - lib/gem_release/templates/version.erb
 - lib/gem_release/version.rb
-- lib/rubygems/commands/init_command.rb
+- lib/rubygems/commands/bootstrap_command.rb
+- lib/rubygems/commands/gemspec_command.rb
 - lib/rubygems/commands/release_command.rb
 - lib/rubygems/commands/tag_command.rb
 - lib/rubygems_plugin.rb