clamp 0.1.6 → 0.1.7

data/lib/clamp/attribute.rb

@@ -0,0 +1,37 @@
+module Clamp
+  
+  class Attribute
+
+    attr_reader :description, :attribute_name, :default_value
+
+    def help_rhs
+      rhs = description
+      if defined?(@default_value)
+        rhs += " (default: #{@default_value.inspect})"
+      end
+      rhs
+    end
+    
+    def help
+      [help_lhs, help_rhs]
+    end
+    
+    def ivar_name
+      "@#{attribute_name}"
+    end
+    
+    def read_method
+      attribute_name
+    end
+    
+    def default_method
+      "default_#{read_method}"
+    end
+    
+    def write_method
+      "#{attribute_name}="
+    end
+
+  end
+  
+end

data/lib/clamp/attribute_declaration.rb

@@ -11,34 +11,27 @@ module Clamp
     end
     
     def define_reader_for(attribute)
-      reader_name = attribute.attribute_name
-      reader_name += "?" if attribute.respond_to?(:flag?) && attribute.flag?
-      ivar_name = "@#{attribute.attribute_name}"
-      define_method(reader_name) do
-        if instance_variable_defined?(ivar_name)
-          instance_variable_get(ivar_name)
-        elsif parent_command && parent_command.respond_to?(reader_name)
-          parent_command.send(reader_name)
-        elsif respond_to?("default_#{attribute.attribute_name}")
-          send("default_#{attribute.attribute_name}")
+      define_method(attribute.read_method) do
+        if instance_variable_defined?(attribute.ivar_name)
+          instance_variable_get(attribute.ivar_name)
+        elsif respond_to?(attribute.default_method)
+          send(attribute.default_method)
         end
       end
     end
 
     def define_default_for(attribute)
-      if attribute.respond_to?(:default_value)
-        define_method("default_#{attribute.attribute_name}") do
-          attribute.default_value
-        end
+      define_method(attribute.default_method) do
+        attribute.default_value
       end
     end
 
     def define_writer_for(attribute, &block)
-      define_method("#{attribute.attribute_name}=") do |value|
+      define_method(attribute.write_method) do |value|
         if block
           value = instance_exec(value, &block)
         end
-        instance_variable_set("@#{attribute.attribute_name}", value)
+        instance_variable_set(attribute.ivar_name, value)
       end
     end
 

data/lib/clamp/command.rb

@@ -88,7 +88,6 @@ module Clamp
     protected
     
     attr_accessor :context
-    attr_accessor :parent_command
 
     private
 

data/lib/clamp/option.rb

@@ -1,6 +1,8 @@
+require 'clamp/attribute'
+
 module Clamp
 
-  class Option
+  class Option < Attribute
 
     def initialize(switches, type, description, options = {})
       @switches = Array(switches)
@@ -14,7 +16,7 @@ module Clamp
       end
     end
 
-    attr_reader :switches, :type, :description, :default_value
+    attr_reader :switches, :type
 
     def attribute_name
       @attribute_name ||= long_switch.sub(/^--(\[no-\])?/, '').tr('-', '_')
@@ -35,6 +37,14 @@ module Clamp
     def flag_value(switch)
       !(switch =~ /^--no-(.*)/ && switches.member?("--\[no-\]#{$1}"))
     end
+
+    def read_method
+      if flag?
+        super + "?"
+      else
+        super
+      end
+    end
     
     def extract_value(switch, arguments)
       if flag?
@@ -44,14 +54,10 @@ module Clamp
       end
     end
     
-    def help
+    def help_lhs
       lhs = switches.join(", ")
       lhs += " " + type unless flag?
-      rhs = description
-      if defined?(@default_value)
-        rhs += " (default: #{@default_value.inspect})"
-      end
-      [lhs, rhs]
+      lhs
     end
 
     private

data/lib/clamp/option/declaration.rb

@@ -22,8 +22,6 @@ module Clamp
         recognised_options.find { |o| o.handles?(switch) }
       end
 
-      protected 
-
       def declared_options
         my_declared_options + inherited_declared_options
       end

data/lib/clamp/parameter.rb

@@ -1,6 +1,8 @@
+require 'clamp/attribute'
+
 module Clamp
 
-  class Parameter
+  class Parameter < Attribute
 
     def initialize(name, description, options = {})
       @name = name
@@ -14,14 +16,10 @@ module Clamp
       end
     end
 
-    attr_reader :name, :description, :attribute_name, :default_value
+    attr_reader :name, :attribute_name
     
-    def help
-      rhs = description
-      if defined?(@default_value)
-        rhs += " (default: #{@default_value.inspect})"
-      end
-      [name, rhs]
+    def help_lhs
+      name
     end
 
     def consume(arguments)

data/lib/clamp/subcommand/execution.rb

@@ -9,7 +9,12 @@ module Clamp
         signal_usage_error "no subcommand specified" unless subcommand_name
         subcommand_class = find_subcommand_class(subcommand_name)
         subcommand = subcommand_class.new("#{invocation_path} #{subcommand_name}", context)
-        subcommand.parent_command = self
+        self.class.declared_options.each do |option|
+          option_set = instance_variable_defined?(option.ivar_name)
+          if option_set && subcommand.respond_to?(option.write_method)
+            subcommand.send(option.write_method, self.send(option.read_method))
+          end
+        end
         subcommand.run(subcommand_arguments)
       end
 

data/lib/clamp/version.rb

@@ -1,3 +1,3 @@
 module Clamp
-  VERSION = "0.1.6".freeze
+  VERSION = "0.1.7".freeze
 end

data/spec/clamp/command_group_spec.rb

@@ -118,39 +118,37 @@ describe Clamp::Command do
 
       @command_class = Class.new(Clamp::Command) do
 
-        option "--direction", "DIR", "which way"
+        option "--direction", "DIR", "which way", :default => "home"
 
-        subcommand "walk", "step carefully in the appointed direction" do
+        subcommand "move", "move in the appointed direction" do
 
           def execute
-            if direction
-              puts "walking #{direction}"
-            else
-              puts "wandering #{context[:default_direction]} by default"
-            end
+            motion = context[:motion] || "walking"
+            puts "#{motion} #{direction}"
           end
 
         end
 
       end
 
-      @command = @command_class.new("go", :default_direction => "south")
+      @command = @command_class.new("go")
 
     end
 
     it "accepts parents options (specified after the subcommand)" do
-      @command.run(["walk", "--direction", "north"])
+      @command.run(["move", "--direction", "north"])
       stdout.should =~ /walking north/
     end
 
     it "accepts parents options (specified before the subcommand)" do
-      @command.run(["--direction", "north", "walk"])
+      @command.run(["--direction", "north", "move"])
       stdout.should =~ /walking north/
     end
 
     it "has access to command context" do
-      @command.run(["walk"])
-      stdout.should =~ /wandering south by default/
+      @command = @command_class.new("go", :motion => "wandering")
+      @command.run(["move"])
+      stdout.should =~ /wandering home/
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clamp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Mike Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 +11:00
+date: 2011-01-30 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -40,6 +40,7 @@ files:
 - examples/fubar
 - examples/speak
 - lib/clamp.rb
+- lib/clamp/attribute.rb
 - lib/clamp/attribute_declaration.rb
 - lib/clamp/command.rb
 - lib/clamp/errors.rb