drydock 0.4.0 → 0.5.0

data/CHANGES.txt

@@ -1,8 +1,36 @@
 DRYDOCK, CHANGES
 
+#### TODO ###############################
+
+* Support putting descriptions into resource file (or __END__)
+* Define aliases with "command [:name, :alias]"
+* Add Drydock::Console, Drydock::Window, Drydock::Cursor
+* Generate scripts in the form: script-action
+  * globals can be configured with env vars.
+  * Motivation to stick to a single environment (just stage)
+* Add convenience methods for system calls: sh, write, read 
+
+
+#### 0.5 (2009-03-11) ###############################
+
+* NEW: Checks that the command class is a subclass of Drydock::Command
+* CHANGE: Cleaned up show-commands screen
+* FIXED: Help didn't work when using command alias
+* NEW: Named argv values.
+* CHANGE: argv are now part of the Command class (not passed to command blocks)
+* CHANGE: "project" now automatically requires the lowercase name of the project
+and gracefully continues if the require failed. 
+* CHANGE: Drydock will look for different validation method, based on the method 
+being executed. If a validation method is found it's executed and
+must return a true valid (it can also raise its own exceptions).
+* NEW: command actions. These are boolean switches with a twist. Drydock looks
+for command_action or action_command methods. Saves checking the switches
+and sending to other methods manually.
+
+
 #### 0.4 (2009-02-28) ###############################
 
-* FIX: Bug, "interning empty string" error when bare "option" is used
+* FIXED: "interning empty string" error when bare "option" is used
 * NEW: Calls valid? method (if present) before calling command block.
 * NEW: "capture" method. Auto capture STDOUT to obj.stdout etc...
 * NEW: Automatically calls init and print_header methods before the command

data/README.rdoc

@@ -1,10 +1,10 @@
-= Drydock - v0.4
+= Drydock - v0.5
 
 Inspired by github-gem and bmizerany-frylock.
 
 == Overview
 
-Drydock is a seaworthy DSL for command line apps. It is contained in a single .rb which can be copied directly into your project. 
+Drydock is a seaworthy DSL for command line apps. It's contained in a single .rb file so it's easy to copy directly into your project. 
 
 == Install
 
@@ -32,41 +32,41 @@ See bin/example for more.
   end
 
   desc "A friendly welcome to the Drydock"
-	command :welcome do
-	  puts "Welcome to Drydock."
-	  puts "For available commands:"
-	  puts "#{$0} show-commands"
-	end
-	
+  command :welcome do
+    puts "Welcome to Drydock."
+    puts "For available commands:"
+    puts "#{$0} show-commands"
+  end
+  
+  
+  usage "USAGE: #{$0} laugh [-f]"
+  desc "The captain commands his crew to laugh"
+  option :f, :faster, "A boolean value. Go even faster!"
+  command :laugh do |obj|
+  # +obj+ is an instance of Drydock::Command. The options you define are available
+  # via obj.option.name 
+
+    answer = !obj.option.faster ? "Sort of" : "Yes! I'm literally laughing as fast as possible."
+
+    puts "Captain Stubing: Are you laughing?"
+    puts "Dr. Bricker: " << answer
+  end
   
-	usage "USAGE: #{$0} laugh [-f]"
-	desc "The captain commands his crew to laugh"
-	option :f, :faster, "A boolean value. Go even faster!"
-	command :laugh do |obj|
-	# +obj+ is an instance of Drydock::Command. The options you define are available
-	# via obj.option.name 
-
-	  answer = !obj.option.faster ? "Sort of" : "Yes! I'm literally laughing as fast as possible."
-
-	  puts "Captain Stubing: Are you laughing?"
-	  puts "Dr. Bricker: " << answer
-	end
-	
   
-	class JohnWestSmokedOysters < Drydock::Command 
-	  # You can write your own command classes by inheriting from Drydock::Command
-	  # and referencing it in the command definition.
-	  def ahoy!; p "matey"; end
-	end
-
-	desc "Do something with John West's Smoked Oysters"
-	command :oysters => JohnWestSmokedOysters do |obj|
-	  p obj  # => #<JohnWestSmokedOysters:0x42179c ... >
-	end
-
-	desc "My way of saying hello!"
-	command :ahoy! => JohnWestSmokedOysters
-	# If you don't provide a block, Drydock will call JohnWestSmokedOysters#ahoy!
+  class JohnWestSmokedOysters < Drydock::Command 
+    # You can write your own command classes by inheriting from Drydock::Command
+    # and referencing it in the command definition.
+    def ahoy!; p "matey"; end
+  end
+
+  desc "Do something with John West's Smoked Oysters"
+  command :oysters => JohnWestSmokedOysters do |obj|
+    p obj  # => #<JohnWestSmokedOysters:0x42179c ... >
+  end
+
+  desc "My way of saying hello!"
+  command :ahoy! => JohnWestSmokedOysters
+  # If you don't provide a block, Drydock will call JohnWestSmokedOysters#ahoy!
 
   
 == More Information

data/bin/example

@@ -4,11 +4,17 @@
 # 
 # This is a functioning script so you can copy it, run it, 
 # and just generally be a longshoreman about things. This is
-# a Drydock after all. 
+# a drydock after all. 
 #
-# If you're reading this via the Rdocs you won't see the code. Try:
+# If you're reading this via the Rdocs you won't see the code. See:
+#
+# http://github.com/delano/drydock/blob/drydock-0.5.0/bin/example
+#
+# For an example of a complex command-line application using 
+# Drydock, see:
+#
+# http://github.com/solutious/rudy
 #
-# http://github.com/delano/drydock/blob/master/bin/example
 
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..')), 'lib'
 
@@ -33,9 +39,8 @@ end
 
 desc "A friendly welcome to the Drydock"
 command :welcome do
-  puts "Welcome to Drydock."
-  puts "For available commands:"
-  puts "#{$0} show-commands"
+  puts "Welcome to Drydock.", $/
+  puts "For available commands: #{$0} show-commands"
 end
 
 usage "USAGE: #{$0} laugh [-f]"
@@ -63,8 +68,7 @@ end
 
 usage "#{$0} [-s] [-vv] date"
 desc "Display the current date"
-command :date do |obj, argv| 
-# +argv+ is an array containing the unnamed arguments
+command :date do |obj| 
   require 'time'
   now = Time.now
   puts "(Not verbose enough. Try adding a -v.)" if (obj.global.verbose || 0) == 1
@@ -75,14 +79,15 @@ end
 
 ignore :options
 desc "This command ignores options"
-command :rogue do |obj, argv|
+command :rogue do |obj|
 # You can use ignore :options to tell Drydock to not process the 
 # command-specific options. 
-  if argv.empty?
+# Unnamed arguments are available from obj.argv
+  if obj.argv.empty?
     puts "Had you supplied some arguments, I would have ignored them."
   else
     puts "Hi! You supplied some arguments but I ignored them."
-    puts "They're all still here in this array: %s" % argv.join(', ')
+    puts "They're all still here in this array: %s" % obj.argv.join(', ')
   end
 end
 
@@ -102,9 +107,10 @@ command :ahoy! => JohnWestSmokedOysters
 # If you don't provide a block, Drydock will call JohnWestSmokedOysters#ahoy!
 
 
+require 'yaml'
 
-usage 'ruby bin/example process -c -d " " -t 15 http://solutious.com/'
-usage 'echo "http://solutious.com/" | ruby bin/example process -c -d " " -t 15'
+usage 'ruby bin/example uri -c -d " " -t 15 http://solutious.com/'
+usage 'echo "http://solutious.com/" | ruby bin/example uri -c -d " " -t 15'
 desc "Check for broken URIs"
 option :c, :check, "Check response codes for each URI"
 option :d, :delim, String, "Output delimiter"
@@ -114,18 +120,23 @@ option :t, :timeout, Float, "Timeout value for HTTP request" do |v|
   v = 10 if (v > 10)
   v
 end
-command :uri do |obj, argv, stdin|
-# +cmd+ is the string used to evoke this command. Useful with alias_command (see below).
-# +stdin+ is either an IO object or a custom object defined with a stdin block (see below)
+argv :uris
+command :uri do |obj|
+# This command processes the output of the stdin block (below this definition).
+# The output of that block is available as obj.stdin. If there is no stdin block
+# obj.stdin will be STDIN's IO object.
 
   require 'net/http'
   require 'uri'
   require 'timeout'
   
-  uris = [stdin, argv].flatten        # Combine the argv and stdin arrays
+  uris = []
+  uris += obj.stdin if obj.stdin
+  uris += obj.argv.uris if obj.argv.uris
+  
   delim = obj.option.delim || ','
   timeout = obj.option.timeout || 5
-  code = :notchecked                  # The default code when :check is false
+  code = :notchecked                      # The default code when :check is false
   
   if uris.empty?
     puts "Frylock: You didn't provide any URIs. "
@@ -137,6 +148,10 @@ command :uri do |obj, argv, stdin|
     code = response_code(uri, timeout) if (obj.option.check)
     puts [index+1, uri, code].join(delim)
   end
+  
+  # NOTE: The alias used to evoke this command is available
+  # via obj.alias
+  
 end
 alias_command :checkuri, :uri
 

data/drydock.gemspec

@@ -1,13 +1,17 @@
 @spec = Gem::Specification.new do |s|
   s.name = %q{drydock}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
+  s.date = %q{2009-03-11}
   s.specification_version = 1 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.authors = ["Delano Mandelbaum"]
-  s.date = %q{2008-08-17}
-  s.description = %q{A seaworthy DSL for writing command line apps inspired by Blake Mizerany's Frylock}
+  s.description = %q{A seaworthy DSL for writing command line apps}
+  s.summary = s.description
   s.email = %q{delano@solutious.com}
+
+  # = MANIFEST =
+  # git ls-files
   s.files = %w(
     CHANGES.txt
     LICENSE.txt
@@ -17,13 +21,14 @@
     drydock.gemspec
     lib/drydock.rb
   )
+
+  #  s.add_dependency ''
+
   s.has_rdoc = true
   s.homepage = %q{http://github.com/delano/drydock}
   s.extra_rdoc_files = %w[README.rdoc LICENSE.txt CHANGES.txt]
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Drydock: a seaworthy DSL for command-line apps", "--main", "README.rdoc"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Drydock: #{s.description}", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.1.1}
-  s.summary = %q{A seaworthy DSL for writing command line apps}
-  
   s.rubyforge_project = "drydock"
 end

data/lib/drydock.rb

@@ -3,34 +3,64 @@ require 'ostruct'
 require 'stringio'
 
 module Drydock
+  class FancyArray < Array #:nodoc:
+    attr_reader :fields
+    def add_field(n)
+      @fields ||= []
+      field_name = n
+      eval <<-RUBY, binding, '(Drydock::FancyArray)', 1
+      def #{n}
+        if self.size > @fields.size && '#{n}'.to_sym == @fields.last
+          self[#{@fields.size}..-1]
+        else
+          self[#{@fields.size}]
+        end
+      end
+      RUBY
+      @fields << n
+      n
+    end
+    def fields=(*args)
+      args.flatten.each do |field|
+        add_field(field)
+      end
+    end
+  end
+  
+    
   # The base class for all command objects. There is an instance of this class
   # for every command defined. Global and command-specific options are added
   # as attributes to this class dynamically. 
   # 
-  # i.e. "example -v date -f yaml"
+  #     i.e. "example -v select --location kumamoto"
   #
   #     global :v, :verbose, "I want mooooore!"
-  #     option :f, :format, String, "Long date format"
-  #     command :date do |obj|
-  #         puts obj.global.verbose  #=> true
-  #         puts obj.option.format  #=> "yaml"
+  #     option :l, :location, String, "Source location"
+  #     command :select do |obj|
+  #       puts obj.global.verbose   #=> true
+  #       puts obj.option.location  #=> "kumamoto"
+  #     end
+  #
+  # You can sub-class it to create your own: 
+  #
+  #     class Malpeque < Drydock::Command
+  #       # ... sea to it
   #     end
   #
-  # You can inherit from this class to create your own: EatFood < Drydock::Command.
-  # And then specific your class in the command definition:
+  # And then specify your class in the command definition:
   #
-  #     command :eat => EatFood do |obj|; ...; end
+  #     command :eat => Malpeque do |obj|
+  #       # ... do stuff with your obj
+  #     end
   #
   class Command
-    VERSION = 0.4
+    VERSION = 0.5
       # The canonical name of the command (the one used in the command definition). If you 
       # inherit from this class and add a method named +cmd+, you can leave omit the block
       # in the command definition. That method will be called instead. See bin/examples.
     attr_reader :cmd
       # The name used to evoke this command (it's either the canonical name or the alias used).
     attr_reader :alias
-      # A friendly description of the command. 
-    attr_accessor :desc
       # The block that will be executed when this command is evoked. If the block is nil
       # it will check if there is a method named +cmd+. If so, that will be executed.
     attr_reader :b
@@ -38,6 +68,15 @@ module Drydock
     attr_reader :option
       # An OpenStruct object containing the global options specified at run-time.
     attr_reader :global
+      # A friendly description of the command. 
+    attr_accessor :desc
+      # An array of action names specified in the command definition
+    attr_accessor :actions
+      # An instance of Drydock::FancyArray. Acts like an array of unnamed arguments
+      # but also allows field names if supplied. 
+    attr_accessor :argv  
+      # Either an IO handle to STDIN or the output of the Drydock#stdin handler. 
+    attr_reader :stdin
     
     # The default constructor sets the short name of the command
     # and stores a reference to the block (if supplied).
@@ -49,6 +88,9 @@ module Drydock
     def initialize(cmd, &b)
       @cmd = (cmd.kind_of?(Symbol)) ? cmd : cmd.to_sym
       @b = b
+      @actions = []
+      @argv = Drydock::FancyArray.new # an array with field names
+      @stdin = STDIN
       @option = OpenStruct.new
       @global = OpenStruct.new
       
@@ -65,13 +107,13 @@ module Drydock
     # 
     # Calls self.init before calling the block. Implement this method when 
     #
-    # +cmd_str+ is the short name used to evoke this command. It will equal @cmd
-    # unless an alias was used used to evoke this command.
-    # +argv+ an array of unnamed arguments. If ignore :options was declared this
-    # will contain the arguments exactly as they were defined on the command-line.
-    # +stdin+ contains the output of stdin do; ...; end otherwise it's a STDIN IO handle.
-    # +global_options+ a hash of the global options specified on the command-line
-    # +options+ a hash of the command-specific options specific on the command-line.
+    # <li>+cmd_str+ is the short name used to evoke this command. It will equal @cmd
+    # unless an alias was used used to evoke this command.</li>
+    # <li>+argv+ an array of unnamed arguments. If ignore :options was declared this</li>
+    # will contain the arguments exactly as they were defined on the command-line.</li>
+    # <li>+stdin+ contains the output of stdin do; ...; end otherwise it's a STDIN IO handle.</li>
+    # <li>+global_options+ a hash of the global options specified on the command-line</li>
+    # <li>+options+ a hash of the command-specific options specific on the command-line.</li>
     def call(cmd_str=nil, argv=[], stdin=[], global_options={}, options={})
       @alias = cmd_str.nil? ? @cmd : cmd_str
 
@@ -83,15 +125,35 @@ module Drydock
         self.option.send("#{n}=", v)    # ... and also the command options
       end
       
-      self.init         if self.respond_to? :init     # Must be called first!
-      self.print_header if respond_to? :print_header
-      self.valid?       if respond_to? :'valid?'
       
-      block_args = [self, argv, stdin]
+      @argv << argv    # TODO: Using += returns an Array instead of FancyArray
+      @argv.flatten!   # NOTE: << creates @argv[[]]
+      @stdin = stdin
+      
+      self.init         if self.respond_to? :init     # Must be called first!
+      self.print_header if self.respond_to? :print_header
       
       if @b 
-        @b.call(*block_args[0..(@b.arity-1)]) # send only as many args as defined
+        run_validation
+        @b.call(self) 
+        
+      elsif !(chosen = find_action(options)).empty?
+        raise "Only one action at a time please! I can't #{chosen.join(' AND ')}." if chosen.size > 1
+        criteria = [[@cmd, chosen.first], [chosen.first, @cmd]]
+        meth = name = nil
+        # Try command_action, then action_command
+        criteria.each do |tuple|
+          name = tuple.join('_')
+          meth = name if self.respond_to?(name)  
+        end
+        
+        raise "#{self.class} needs a #{name} method!" unless meth
+        
+        run_validation(meth)
+        self.send(meth)
+        
       elsif self.respond_to? @cmd.to_sym
+        run_validation(@cmd)
         self.send(@cmd)
       else
         raise "The command #{@alias} has no block and #{self.class} has no #{@cmd} method!"
@@ -101,6 +163,40 @@ module Drydock
       
     end
     
+    # <li>+meth+ The method name used to determine the name of the validation method.
+    # If not supplied, the validation method is "valid?" otherwise it's "meth_valid?"</li>
+    # If the command class doesn't have the given validation method, we'll just continue
+    # on our way.
+    #
+    # Recognized validation methods are:
+    #
+    #     def valid?                  # if we're executing a command block
+    #     def command_valid?          # if we're executing an object method
+    #     def command_action_valid?   # if the main meth is command_action
+    #     def action_command_valid?   # if the main meth is action_command
+    #
+    # This method raises a generic exception when the validation method returns false. 
+    # However, <strong>it's more appropriate for the validation methods to raise 
+    # detailed exceptions</strong>. 
+    #
+    def run_validation(meth=nil)
+      vmeth = meth ? [meth, 'valid?'].join('_') : 'valid?'
+      is_valid = self.respond_to?(vmeth) ? self.send(vmeth) : true
+      raise "Your request is not valid. See #{$0} #{@cmd} -h" unless is_valid
+    end
+    private :run_validation
+    
+    # Compares the list of known actions to the list of boolean switches supplied
+    # on the command line (if any). 
+    # <li>+options+ is a hash of the named command line arguments (created by 
+    # OptionParser#getopts)</li>
+    # Returns an array of action names (empty if no action was supplied)
+    def find_action(options)
+      boolkeys = options.keys.select { |n| options[n] == true } || []
+      (@actions || []) & boolkeys # an array of requested actions (or empty)
+    end
+    private :find_action
+    
     # Print the list of available commands to STDOUT. This is used as the 
     # "default" command unless another default commands is supplied. You 
     # can also write your own Drydock::Command#show_commands to override
@@ -108,17 +204,25 @@ module Drydock
     def show_commands
       project = " for #{Drydock.project}" if Drydock.project?
       puts "Available commands#{project}:", ""
-      Drydock.commands.keys.sort{ |a,b| a.to_s <=> b.to_s }.each do |cmd|
-        msg = Drydock.commands[cmd].desc
-        
+      cmds = {}
+      Drydock.commands.keys.each do |cmd|
+        pretty = Drydock.decanonize(cmd)
         # Out to sea
+        cmds[Drydock.commands[cmd].cmd] ||= {}
         unless cmd === Drydock.commands[cmd].cmd
-          msg = "See: #{Drydock.decanonize(Drydock.commands[cmd].cmd)} (this is an alias)" 
+          (cmds[Drydock.commands[cmd].cmd][:aliases] ||= []) << pretty
+          next
         end
-        
-        puts " %16s: %s" % [Drydock.decanonize(cmd), msg]
+        cmds[cmd][:desc] = Drydock.commands[cmd].desc
+        cmds[cmd][:pretty] = cmd
       end
-
+      
+      cmds.keys.sort{ |a,b| a.to_s <=> b.to_s }.each do |cmd|
+        p = cmds[cmd]
+        puts " %16s: %s" % [p[:pretty], p[:desc]]
+        puts " %17s (%s: %s)" % ['', "aliases", cmds[cmd][:aliases].join(', ')] if cmds[cmd][:aliases]
+      end
+      
       puts 
       puts "%6s: %s" % ["Try", "#{$0} -h"] 
       puts "%6s  %s" % ["", "#{$0} COMMAND -h"]
@@ -170,23 +274,6 @@ module Drydock
   
   VERSION = 0.4
   
- private
-  # Disabled. We're going basic, using a module and include/extend. 
-  # Stolen from Sinatra!
-  #def delegate(*args)
-  #  args.each do |m|
-  #    eval(<<-end_eval, binding, "(__Drydock__)", __LINE__)
-  #      def #{m}(*args, &b)
-  #        Drydock.#{m}(*args, &b)
-  #      end
-  #    end_eval
-  #  end
-  #end
-  #
-  #delegate :before, :after, :alias_command, :desc
-  #delegate :global_option, :global_usage, :usage, :commands, :command
-  #delegate :debug, :option, :stdin, :default, :ignore, :command_alias
-  
   @@project = nil
   
   @@debug = false
@@ -198,6 +285,7 @@ module Drydock
 
   @@command_opts_parser = []
   @@command_option_names = []
+  @@command_actions = []
   
   @@default_command = nil
   
@@ -205,6 +293,7 @@ module Drydock
   @@command_descriptions = []
   @@command_index = 0
   @@command_index_map = {}
+  @@command_argv_names = []  # an array of names for values of argv
   
   @@capture = nil     # contains one of :stdout, :stderr
   @@captured = nil
@@ -231,11 +320,31 @@ module Drydock
     @@debug
   end
   
+  # Provide names for CLI arguments, in the order they appear. 
+  #
+  #     $ yourscript sample malpeque zinqy
+  #     argv :name, :flavour
+  #     command :sample do |obj|
+  #       obj.argv.name        # => malpeque
+  #       obj.argv.flavour     # => zinqy
+  #     end
+  #
+  def argv(*args)
+    @@command_argv_names[@@command_index] ||= []
+    @@command_argv_names[@@command_index] += args.flatten
+  end
+  
   # The project of the script. This is currently only used when printing
   # list of commands (see: Drydock::Command#show_commands). It may be 
   # used elsewhere in the future. 
   def project(txt=nil)
+    
     return @@project unless txt
+    
+    begin
+      require txt.downcase
+    rescue LoadError
+    end
     @@project = txt
   end
   
@@ -255,7 +364,7 @@ module Drydock
   #       # ...
   #     end
   #
-  #     default :hullinspector do   # This one will b named "hullinspector"
+  #     default :hullinspector do   # This one will be named "hullinspector"
   #       # ...
   #     end
   #
@@ -266,9 +375,11 @@ module Drydock
   end
   
   # Define a block for processing STDIN before the command is called. 
-  # The command block receives the return value of this block in a named argument:
+  # The command block receives the return value of this block as obj.stdin:
   #
-  #     command :task do |obj, argv, stdin|; ...; end
+  #     command :task do |obj|; 
+  #       obj.stdin   # => ...
+  #     end
   #
   # If a stdin block isn't defined, +stdin+ above will be the STDIN IO handle. 
   def stdin(&b)
@@ -358,9 +469,23 @@ module Drydock
     current_command_option_names << option_parser(args, &b)
   end
   
-
-  
-  
+  # Define an command-specific action.
+  #
+  # This is functionality very similar to option, but with an exciting and buoyant twist:
+  # Drydock keeps track of actions for each command (in addition to treating it like an option).
+  # When an action is specifiec on the command line Drydock looks for command_action or 
+  # action_command methods in the command class. 
+  #
+  #     action :E, :eat, "Eat something"
+  #     command :oysters => Fresh::Oysters
+  #
+  #     # Drydock will look for Fresh::Oysters#eat_oysters and Fresh::Oysters#oysters_eat.
+  #
+  def action(*args, &b)
+    ret = option(*args, &b) # returns an array of all the current option names
+    current_command_action << ret.last # the most recent is last
+  end
+    
   # Define a command. 
   # 
   #     command :task do
@@ -376,15 +501,24 @@ module Drydock
   #
   def command(*cmds, &b)
     cmd = cmds.first
+    
     if cmd.is_a? Hash
-      c = cmd.values.first.new(cmd.keys.first, &b)
+      raise "#{cmd.values.first} is not a subclass of Drydock::Command" unless cmd.values.first.ancestors.member?(Drydock::Command)
+      c = cmd.values.first.new(cmd.keys.first, &b) # A custom class was specified
+    # TODO: handle command [:task, :alias] => Class
+    #elsif cmd.is_a? Array
+    #  p cmd
     else
       c = Drydock::Command.new(cmd, &b)
     end
     
     @@command_descriptions[@@command_index] ||= ""
+    @@command_actions[@@command_index] ||= []
+    @@command_argv_names[@@command_index] ||= []
     
     c.desc = @@command_descriptions[@@command_index]
+    c.actions = @@command_actions[@@command_index]
+    c.argv.fields = @@command_argv_names[@@command_index]
     
     # Default Usage Banner. 
     # Without this, there's no help displayed for the command. 
@@ -406,8 +540,8 @@ module Drydock
   #
   # Either name can be used on the command-line:
   #
-  #    $ script task [options]
-  #    $ script pointer [options]
+  #    $ yourscript task [options]
+  #    $ yourscript pointer [options]
   #
   # Inside of the command definition, you have access to the
   # command name that was used via obj.alias. 
@@ -499,20 +633,6 @@ module Drydock
     !@@capture.nil?
   end
   
-  # Grab the options parser for the current command or create it if it doesn't exist.
-  # Returns an instance of OptionParser.
-  def get_current_option_parser
-    (@@command_opts_parser[@@command_index] ||= OptionParser.new)
-  end
-  
-  # Grabs the options parser for the given command. 
-  # +arg+ can be an index or command name.
-  # Returns an instance of OptionParser.
-  def get_option_parser(arg)
-    index = arg.is_a?(String) ? get_command_index(arg) : arg
-    (@@command_opts_parser[index] ||= OptionParser.new)
-  end
-  
   # Returns true if a command with the name +cmd+ has been defined. 
   def command?(cmd)
     name = canonize(cmd)
@@ -649,10 +769,28 @@ module Drydock
     (@@command_option_names[@@command_index] ||= [])
   end
   
+  def current_command_action
+    (@@command_actions[@@command_index] ||= [])
+  end
+  
   def get_command_index(cmd)
     @@command_index_map[canonize(cmd)] || -1
   end
   
+  # Grab the options parser for the current command or create it if it doesn't exist.
+  # Returns an instance of OptionParser.
+  def get_current_option_parser
+    (@@command_opts_parser[@@command_index] ||= OptionParser.new)
+  end
+  
+  # Grabs the options parser for the given command. 
+  # +arg+ can be an index or command name.
+  # Returns an instance of OptionParser.
+  def get_option_parser(arg)
+    index = arg.is_a?(String) ? get_command_index(arg) : arg
+    (@@command_opts_parser[index] ||= OptionParser.new)
+  end
+  
   #
   # These are the "reel" defaults
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drydock
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-17 00:00:00 -04:00
+date: 2009-03-11 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: A seaworthy DSL for writing command line apps inspired by Blake Mizerany's Frylock
+description: A seaworthy DSL for writing command line apps
 email: delano@solutious.com
 executables: []
 
@@ -38,7 +38,7 @@ rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
-- "Drydock: a seaworthy DSL for command-line apps"
+- "Drydock: A seaworthy DSL for writing command line apps"
 - --main
 - README.rdoc
 require_paths: