clamp 0.4.0 → 0.5.0

data/lib/clamp/command.rb

@@ -71,11 +71,7 @@ module Clamp
     # This method is designed to be overridden in sub-classes.
     #
     def execute
-      if @subcommand
-        @subcommand.execute
-      else
-        raise "you need to define #execute"
-      end
+      raise "you need to define #execute"
     end
 
     # @return [String] usage documentation for this command

data/lib/clamp/subcommand/execution.rb

@@ -0,0 +1,20 @@
+module Clamp
+  class Subcommand
+
+    module Execution
+
+      # override default Command behaviour
+
+      def execute
+        # delegate to subcommand
+        @subcommand.run(remaining_arguments)
+      end
+
+      def handle_remaining_arguments
+        # no-op, because subcommand will handle them
+      end
+
+    end
+
+  end
+end

data/lib/clamp/subcommand/parsing.rb

@@ -1,3 +1,5 @@
+require 'clamp/subcommand/execution'
+
 module Clamp
   class Subcommand
 
@@ -9,8 +11,7 @@ module Clamp
         return false unless self.class.has_subcommands?
         subcommand_name = parse_subcommand_name
         @subcommand = instatiate_subcommand(subcommand_name)
-        @subcommand.parse(remaining_arguments)
-        remaining_arguments.clear
+        self.extend(Subcommand::Execution)
       end
 
       private

data/lib/clamp/version.rb

@@ -1,3 +1,3 @@
 module Clamp
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.0".freeze
 end

data/spec/clamp/command_group_spec.rb

@@ -9,15 +9,19 @@ describe Clamp::Command do
 
     given_command "flipflop" do
 
+      def execute
+        puts message
+      end
+
       subcommand "flip", "flip it" do
-        def execute
-          puts "FLIPPED"
+        def message
+          "FLIPPED"
         end
       end
 
       subcommand "flop", "flop it\nfor extra flop" do
-        def execute
-          puts "FLOPPED"
+        def message
+          "FLOPPED"
         end
       end
 
@@ -43,20 +47,6 @@ describe Clamp::Command do
 
     end
 
-    describe "#parse" do
-
-      describe "with too many arguments" do
-
-        it "raises a UsageError" do
-          lambda do
-            @command.parse(["flip", "extra", "args"])
-          end.should raise_error(Clamp::UsageError, "too many arguments")
-        end
-
-      end
-
-    end
-
     describe "#help" do
 
       it "shows subcommand parameters in usage" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clamp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies: []
 description: ! "Clamp provides an object-model for command-line utilities.  \nIt handles
   parsing of command-line options, and generation of usage help.\n"
@@ -43,6 +43,7 @@ files:
 - lib/clamp/parameter/parsing.rb
 - lib/clamp/subcommand.rb
 - lib/clamp/subcommand/declaration.rb
+- lib/clamp/subcommand/execution.rb
 - lib/clamp/subcommand/parsing.rb
 - lib/clamp/version.rb
 - spec/clamp/command_group_spec.rb
@@ -65,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1903818616036317857
+      hash: 1042041036949173101
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -74,10 +75,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1903818616036317857
+      hash: 1042041036949173101
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: a minimal framework for command-line utilities