delano-drydock 0.6.3 → 0.6.5

data/CHANGES.txt

@@ -5,6 +5,12 @@ DRYDOCK, CHANGES
 * Support putting descriptions into resource file (or __END__)
 
 
+#### 0.6.5 (2009-05-21) #############################
+
+* ADDED: "with_args" support for default command. When specified, 
+arguments can be passed to the default command with run in the 
+short form. e.g. "script arg1 arg2" == "script cmdname arg1 arg2"
+
 #### 0.6.3 (2009-05-10) #############################
 
 * ADDED: show-commands now displays a note about which command is the default

data/README.rdoc

@@ -31,7 +31,7 @@ See bin/example for more.
   # variables defined here will be available to all commands.
   end
 
-  desc "A friendly welcome to the Drydock"
+  about "A friendly welcome to the Drydock"
   command :welcome do
     puts "Welcome to Drydock."
     puts "For available commands:"
@@ -39,7 +39,7 @@ See bin/example for more.
   end
   
   usage "USAGE: #{$0} laugh [-f]"
-  desc "The captain commands his crew to laugh"
+  about "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
@@ -58,12 +58,12 @@ See bin/example for more.
     def ahoy!; p "matey"; end
   end
 
-  desc "Do something with John West's Smoked Oysters"
+  about "Do something with John West's Smoked Oysters"
   command :oysters => JohnWestSmokedOysters do |obj|
     p obj  # => #<JohnWestSmokedOysters:0x42179c ... >
   end
 
-  desc "My way of saying hello!"
+  about "My way of saying hello!"
   command :ahoy! => JohnWestSmokedOysters
   # If you don't provide a block, Drydock will call JohnWestSmokedOysters#ahoy!
 

data/drydock.gemspec

@@ -1,6 +1,6 @@
 @spec = Gem::Specification.new do |s|
   s.name = %q{drydock}
-  s.version = "0.6.3"
+  s.version = "0.6.5"
   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=
 

data/lib/drydock.rb

@@ -371,6 +371,7 @@ module Drydock
   @@command_actions = []
   
   @@default_command = nil
+  @@default_command_with_args = false
   
   @@commands = {}
   @@command_descriptions = []
@@ -455,10 +456,19 @@ module Drydock
   #       # ...
   #     end
   #
-  def default(cmd=nil, &b)
+  # If +with_args+ is specified, the default command will receive all unknown
+  # values as arguments. This is necessary to define explicitly because drydock
+  # parses arguments expecting a command name. If the default command accepts
+  # arguments and with_args is not specified, drydock will raise an unknown
+  # command exception for the first argument.
+  #
+  def default(cmd=nil, with_args=false, &b)
     raise "Calling default requires a command name or a block" unless cmd || b
     # Creates the command and returns the name or just stores given name
     @@default_command = (b) ? command(cmd || :default, &b).cmd : canonize(cmd)
+    # IDEA: refactor out the argument parser to support different types of CLI
+    @@default_command_with_args = with_args ? true : false
+    @@default_command
   end
   
   # Is +cmd+ the default command?
@@ -467,6 +477,10 @@ module Drydock
     (@@default_command == canonize(cmd))
   end
   
+  # 
+  def default_with_args?; @@default_command_with_args; end
+  
+  
   # Define a block for processing STDIN before the command is called. 
   # The command block receives the return value of this block as obj.stdin:
   #
@@ -844,13 +858,21 @@ module Drydock
     global_options = command_options = {}
     cmd = nil     
     
+    argv_copy = argv.clone # See: @@default_command_with_args below
+    
     global_options = @@global_opts_parser.getopts(argv)
     cmd_name = (argv.empty?) ? @@default_command : argv.shift
     
     unless command?(cmd_name)
-      raise UnknownCommand.new(cmd_name)  unless trawler?
-      raise UnknownCommand.new(@@trawler) unless command?(@@trawler)
-      command_alias(@@trawler, cmd_name)
+      # If requested, send all unknown arguments to the default command
+      if @@default_command_with_args
+        cmd_name = @@default_command
+        argv = argv_copy
+      else
+        raise UnknownCommand.new(cmd_name)  unless trawler?
+        raise UnknownCommand.new(@@trawler) unless command?(@@trawler)
+        command_alias(@@trawler, cmd_name)
+      end
     end
     
     cmd = get_command(cmd_name) 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delano-drydock
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: []