drydock 0.5.2 → 0.5.3

data/CHANGES.txt

@@ -3,10 +3,16 @@ DRYDOCK, CHANGES
 #### TODO ###############################
 
 * Support putting descriptions into resource file (or __END__)
-* Define aliases with "command [:name, :alias]"
+* Inline commands aliases. command :cmd1, :cmd2 do; ...; end
 
 
-#### 0.5.2 (2009-04-05) #############################
+#### 0.5.3 (2009-04-05) #############################
+
+* FIXED: Command actions were not being handled correctly. Added rdocs to 
+clarify the code.
+
+
+#### 0.5.2 (2009-04-04) #############################
 
 * ADDED: before and after blocks now receive a primed reference to the 
 command object (which gives them access to the globals and options)
@@ -65,6 +71,7 @@ and sending to other methods manually.
 * UPDATED: Rdocs
 * CHANGE: added method command_aliaz to mirror aliaz_command
 
+
 #### 0.3 (2009-02-05) ###############################
 
 * Added support for custom Drydock::Commands objects

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Delano Mandelbaum
+Copyright (c) 2008-2009 Delano Mandelbaum, Solutious Inc.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.rdoc

@@ -80,7 +80,6 @@ See bin/example for more.
 * Delano Mandelbaum (delano@solutious.com)
 * Bernie Kopell (bernie@solutious.com)
 
-
 == License
 
 See LICENSE.txt

data/drydock.gemspec

@@ -1,6 +1,6 @@
 @spec = Gem::Specification.new do |s|
   s.name = %q{drydock}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
   s.date = %q{2009-04-05}
   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

@@ -151,10 +151,13 @@ module Drydock
     #
     def call  
       self.print_header if self.respond_to? :print_header
+      
+      # Execute the command block if it exists
       if @b 
         run_validation
         @b.call(self) 
-        
+      
+      # Otherwise check to see if an action was specified
       elsif !(chosen = find_action(self.option)).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]]
@@ -170,9 +173,12 @@ module Drydock
         run_validation(meth)
         self.send(meth)
         
+      # No block and no action. We'll try for the method name in the Drydock::Command class. 
       elsif self.respond_to? @cmd.to_sym
         run_validation(@cmd)
         self.send(@cmd)
+        
+      # Well, then I have no idea what you want me to do!
       else
         raise "The command #{@alias} has no block and #{self.class} has no #{@cmd} method!"
       end
@@ -211,7 +217,9 @@ module Drydock
     def find_action(options)
       options = options.marshal_dump if options.is_a?(OpenStruct)
       boolkeys = options.keys.select { |n| options[n] == true } || []
-      (@actions || []) & boolkeys # an array of requested actions (or empty)
+      boolkeys = boolkeys.collect { |n| n.to_s } # @agents contains Strings. 
+      # Returns the elements in @actions that are also found in boolkeys
+      (@actions || []) & boolkeys 
     end
     private :find_action
     
@@ -489,11 +497,11 @@ module Drydock
     current_command_option_names << option_parser(args, &b)
   end
   
-  # Define an command-specific action.
+  # Define a command-specific action.
   #
-  # This is functionality very similar to option, but with an exciting and buoyant twist:
+  # This is functionally 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 
+  # When an action is specified on the command line Drydock looks for command_action or 
   # action_command methods in the command class. 
   #
   #     action :E, :eat, "Eat something"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drydock
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Delano Mandelbaum