thunder 0.5.1 → 0.5.2

data/bin/thunder-completion

@@ -25,20 +25,33 @@ module Thunder
 #!/bin/bash
 
 % progname = File.basename(ARGV.first)
-__<%= progname %>_command_list() {
-  echo "<%= thunder_commands(thunder).join(" ") %>"
+__<%= progname %>_commands() {
+    echo "<%= thunder_commands(thunder).join(" ") %>"
 }
-
-#TODO: get the options to be completed as well
 % thunder[:commands].each do |name, command|
-%   next unless command[:options]
-__<%= progname %>_<%= name.to_s %>_options_list() {
-  echo "<%= thunder_options(command).join(" ") %>"
+%   name = name.to_s
+%   if command[:options]
+
+__<%= progname %>_<%= name %>_options() {
+    echo "<%= thunder_options(command).join(" ") %>"
 }
+%   end
 % end
 
 __<%= progname %>_complete() {
-    COMPREPLY=($(compgen -W "$(__<%= progname %>_command_list)" -- ${COMP_WORDS[COMP_CWORD]}))
+  local words=""
+    if [[ ${COMP_WORDS[COMP_CWORD]:0:1} == "-" ]]; then
+        if ((COMP_CWORD == 1)); then
+            words=
+        else
+            local command="__<%= progname %>_${COMP_WORDS[1]}_options"
+            words=$($command)
+        fi
+    elif ((COMP_CWORD == 1)); then
+        # display only commands
+        words=$(__<%= progname %>_commands)
+    fi
+    COMPREPLY=($(compgen -W "$words" -- ${COMP_WORDS[COMP_CWORD]}))
 }
 
 complete -o default -o nospace -F __<%= progname %>_complete <%= progname %>

data/bin/thunder-spec

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'thunder'
+require 'pp'
+
+module Thunder
+  def start(args=ARGV.dup, options={})
+    spec = self.class.thunder
+    pp renderThunderSpec(spec)
+  end
+end
+
+def renderThunderSpec(spec)
+  spec[:commands].each do |name, command|
+    command[:subcommand] = renderThunderSpec(command[:subcommand].class.thunder) if command[:subcommand]
+  end
+  spec
+end
+
+if ARGV.size != 1
+  puts "Usage: thunder-spec THUNDER_SCRIPT"
+  puts
+  puts "Dumps the thunder spec to the command line for debugging and analysis"
+  exit 1
+end
+
+load File.expand_path(ARGV.first)

data/lib/thunder.rb

@@ -134,15 +134,8 @@ module Thunder
     # @api private
     # Registers a method as a thunder task
     def method_added(method)
-      attributes = [:usage, :description, :options, :long_description]
-      return unless attributes.reduce(nil) { |a, key| a || thunder[key] }
-      thunder[:commands][method] = {
-        name: method,
-      }
-      attributes.each do |key|
-        thunder[:commands][method][key] = thunder[key]
-        thunder[key] = nil
-      end
+      add_command(method.to_sym)
+      thunder[:commands][method][:params] = instance_method(method).parameters
     end
 
     # Set the options processor.
@@ -196,7 +189,6 @@ module Thunder
     # @example
     #   option "verbose", desc: "print extra information"
     def option(name, options={})
-    #TODO: have this generate YARDoc for the option (as it should match a method option)
       name = name.to_sym
       options[:name] = name
       options[:short] ||= name[0]
@@ -211,9 +203,20 @@ 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)
-      method_added(command.to_sym)
+      add_command(command.to_sym)
       thunder[:commands][command.to_sym][:subcommand] = handler
     end
 
+    private
+    def add_command(command)
+      attributes = [:usage, :description, :options, :long_description]
+      return unless attributes.reduce(nil) { |a, key| a || thunder[key] }
+      thunder[:commands][command] = {
+        name: command,
+      }
+      attributes.each do |key|
+        thunder[:commands][command][key] = thunder.delete(key)
+      end
+    end
   end
 end

data/lib/thunder/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thunder
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-01 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
 extensions: []
 extra_rdoc_files: []
@@ -27,6 +28,7 @@ files:
 - Rakefile
 - DESIGN.md
 - README.md
+- bin/thunder-spec
 - bin/thunder-completion
 homepage: http://stevenkaras.github.com/thunder
 licenses: []