thunder 0.6.0 → 0.6.1

data/bin/thunder-spec

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path("../../lib", __FILE__)
-
 require 'thunder'
 require 'pp'
 

data/lib/thunder.rb

@@ -155,9 +155,9 @@ module Thunder
     # @api private
     # Registers a method as a thunder task
     def method_added(method)
-      add_command(method.to_sym)
-      thunder[:commands][method][:params] = instance_method(method).parameters
-      thunder[:commands][method][:arity] = instance_method(method).arity
+      add_command(method.to_sym) do |command|
+        command[:params] = instance_method(method).parameters
+      end
     end
 
     # Set the options processor.
@@ -225,12 +225,13 @@ module Thunder
     # @param command [Symbol,String] the command that transfers processing to the provided handler
     # @param handler [Thunder] the handler that processes the request
     def subcommand(command, handler)
-      add_command(command.to_sym)
-      thunder[:commands][command.to_sym][:subcommand] = handler
+      add_command(command.to_sym) do |subcommand|
+        subcommand[:subcommand] = handler
+      end
     end
 
     private
-    def add_command(command)
+    def add_command(command, &block)
       attributes = [:usage, :description, :options, :long_description]
       return unless attributes.reduce(nil) { |a, key| a || thunder[key] }
       thunder[:commands][command] = {
@@ -239,6 +240,13 @@ module Thunder
       attributes.each do |key|
         thunder[:commands][command][key] = thunder.delete(key)
       end
+      if block
+        if block.arity == 0
+          block.call
+        else
+          block.call thunder[:commands][command]
+        end
+      end
     end
   end
 end

data/lib/thunder/version.rb

@@ -1,4 +1,4 @@
 module Thunder
   # Version string for gemspec
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thunder
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies: []
 description: Thunder does command line interfaces. Nothing more, nothing less.
 email: steven.karas@gmail.com
 executables:
-- thunder-spec
 - thunder-completion
+- thunder-spec
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/thunder/help/default.rb
-- lib/thunder/version.rb
 - lib/thunder/options/optparse.rb
 - lib/thunder/options/trollop.rb
+- lib/thunder/version.rb
 - lib/thunder.rb
 - spec/spec_thunder.rb
-- Rakefile
 - DESIGN.md
+- Rakefile
 - README.md
-- bin/thunder-spec
 - bin/thunder-completion
+- bin/thunder-spec
 homepage: http://stevenkaras.github.com/thunder
 licenses: []
 post_install_message: