thunder 0.5.2 → 0.5.3

data/README.md

@@ -7,6 +7,10 @@ Usage
 
     gem install thunder
 
+or if you're running [ruby 1.8.7](http://www.ruby-lang.org/en/news/2011/10/06/plans-for-1-8-7):
+
+    gem install thunder-1.8.7
+
 see '[sample](http://github.com/stevenkaras/thunder/blob/master/sample)' for a quick overview of all features
 
 Philosophy
@@ -21,13 +25,13 @@ Goals
 -----
 Provide a simple, DRY syntatic sugar library that provides the necessary services to create command line mappings to ruby methods. It will not provide any other services.
 
-Development Phases
+Notable features as of the current release:
 
-1. call a method from the command line
-2. provide options and arguments 
-3. provide help/banner formatter
-4. provide yardoc integration
-5. provide a bash-completion script
+  * options parsing for commands
+  * default commands
+  * subcommands (ala git)
+  * integrated help system
+  * bash completion script generator
 
 Development
 -----------
@@ -35,4 +39,4 @@ If you'd like to contribute, fork, commit, and request a pull. I'll get around t
 
 License
 -------
-MIT License
+MIT License

data/bin/thunder-completion

@@ -3,8 +3,8 @@
 require 'thunder'
 require 'erb'
 
-def thunder_commands(bolt)
-  bolt[:commands].map(&:first).map(&:to_s)
+def thunder_commands(spec)
+  spec[:commands].map(&:first).map(&:to_s)
 end
 
 def thunder_options(command)
@@ -19,53 +19,63 @@ def thunder_options(command)
   return result
 end
 
-module Thunder
-  def start(args=ARGV.dup, options={})
-    template = ERB.new <<-TEMPLATE, nil, "%"
-#!/bin/bash
+def indent(text, amount, indent=" ")
+  result = ""
+  text.lines do |line|
+    result << indent * amount + line
+  end
+  return result
+end
 
-% progname = File.basename(ARGV.first)
-__<%= progname %>_commands() {
-    echo "<%= thunder_commands(thunder).join(" ") %>"
-}
-% thunder[:commands].each do |name, command|
+def thunder_completion(depth, spec)
+    template = ERB.new <<-TEMPLATE, nil, "%>"
+if ((COMP_CWORD == <%= depth+1 %>)); then
+    # display only commands
+    words="<%= thunder_commands(spec).join(" ") %>"
+else
+    case ${COMP_WORDS[<%= depth+1 %>]} in
+% spec[:commands].each do |name, command|
 %   name = name.to_s
+    <%= name %>)
+%   if name == "help"
+        words="<%= thunder_commands(spec).join(" ") %>"
+%   end
 %   if command[:options]
-
-__<%= progname %>_<%= name %>_options() {
-    echo "<%= thunder_options(command).join(" ") %>"
-}
+        if [[ ${COMP_WORDS[COMP_CWORD]:0:1} == "-" ]]; then
+            words="<%= thunder_options(command).join(" ") %>"
+        fi
+%   end
+%   if command[:subcommand]
+<%= indent(thunder_completion(depth+1, command[:subcommand].class.thunder), 8) %>
 %   end
+        ;;
 % end
+    esac
+fi
+    TEMPLATE
+    return template.result(binding)
+end
 
-__<%= progname %>_complete() {
-  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
+module Thunder
+  def start(args=ARGV.dup, options={})
+    template = ERB.new <<-TEMPLATE, nil, "%>"
+#!/bin/bash
+
+% progname = File.basename(ARGV.first)
+__<%= progname %>_completion() {
+    local words=""
+<%= indent(thunder_completion(0, self.class.thunder), 4) %>
     COMPREPLY=($(compgen -W "$words" -- ${COMP_WORDS[COMP_CWORD]}))
 }
 
-complete -o default -o nospace -F __<%= progname %>_complete <%= progname %>
-
+complete -o default -o nospace -F __<%= progname %>_completion <%= progname %>
     TEMPLATE
-    context = (proc { |thiz, thunder|
-      binding
-    }).call(self, self.class.thunder)
-    puts template.result(context)
+    puts template.result(binding)
   end
 end
 
 if ARGV.size != 1
-  puts "Usage: thunder-completion THUNDER_SCRIPT"
+  puts "Usage: #{File.basename(__FILE__)} THUNDER_SCRIPT"
   puts
   puts "Prints out the suggested template for a bash completion script for the given thunder script"
   exit 1

data/bin/thunder-spec

@@ -18,7 +18,7 @@ def renderThunderSpec(spec)
 end
 
 if ARGV.size != 1
-  puts "Usage: thunder-spec THUNDER_SCRIPT"
+  puts "Usage: #{File.basename(__FILE__)} THUNDER_SCRIPT"
   puts
   puts "Dumps the thunder spec to the command line for debugging and analysis"
   exit 1

data/lib/thunder/help/default.rb

@@ -54,7 +54,7 @@ Usage:
       end
 
       # determine the preamble
-      # 
+      #
       # @return [String] the preamble
       def determine_preamble
         preamble = "#{File.basename($0)}"
@@ -80,15 +80,15 @@ Usage:
       # @param separator [String]
       # @return [String] a two-column table
       def render_table(data, separator = " # ")
-        column_width = data.group_by do |data|
-          data.first.size
+        column_width = data.group_by do |row|
+          row.first.size
         end.max.first
         "".tap do |output|
-          data.each do |line|
-            output << "%-#{column_width}s#{separator}%s\n" % line
+          data.each do |row|
+            output << "%-#{column_width}s#{separator}%s\n" % row
           end
         end
       end
     end
   end
-end
+end

data/lib/thunder/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thunder
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Thunder does command line interfaces. Nothing more, nothing less.
 email: steven.karas@gmail.com