clamp 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0222cf7a03642506d668988d57a60b992accc073
-  data.tar.gz: 9d0314d698965b297003ebca1ad6a31183c91fac
+  metadata.gz: c8d58bd5db9ac6b414b75d34a947149720909757
+  data.tar.gz: d61add398880941423c32234e2e9c1d57a1c38f3
 SHA512:
-  metadata.gz: c9cbcdeded12d74963a8a00681f715640d185f6a0ee6faa285cf9b03b8f00721115a35664602f06b2ea40e8fd670be3546338f624b24feae7d450f1a659ad9e0
-  data.tar.gz: 4d304f351b33bd4eeb034837b3174d06898dd02eb5349db2142be751634b5885b0bc2160654b7af3a97392582fcab705968c2b7de72b37bb1828b885eef6c76e
+  metadata.gz: 7df1c2418b54a047af268ca936cabc828ecc2ac2f24bb9ca7a0b8a83768dd9b03679178d61ae79b18cd5a932626c5ae5da3d98d353d8517f2f668b00f4971cb4
+  data.tar.gz: 9298c454fd95f1ad91e4a852fabf51bc0ebb3b915c6164a0f2e012625b2ed1a8e170244c376ec6a54580583c471d3b7a0bd1cab45d5ac1a0437bc739989b819a

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.6.5 (2015-05-02)
+
+* Catch signals and exit appropriately.
+
 ## 0.6.4 (2015-02-26)
 
 * Ensure computed defaults are only computed once.

data/lib/clamp/command.rb

@@ -140,6 +140,8 @@ module Clamp
         rescue Clamp::ExecutionError => e
           $stderr.puts "ERROR: #{e.message}"
           exit(e.status)
+        rescue SignalException => e
+          exit(128 + e.signo)
         end
       end
 

data/lib/clamp/subcommand/declaration.rb

@@ -35,6 +35,16 @@ module Clamp
         recognised_subcommands.find { |sc| sc.is_called?(name) }
       end
 
+      def find_subcommand_class(*names)
+        names.inject(self) do |command_class, name|
+          if command_class
+            if subcommand = command_class.find_subcommand(name)
+              subcommand.subcommand_class
+            end
+          end
+        end
+      end
+
       def parameters_before_subcommand
         parameters.take_while { |p| p != @subcommand_parameter }
       end

data/lib/clamp/version.rb

@@ -1,3 +1,3 @@
 module Clamp
-  VERSION = "0.6.4".freeze
+  VERSION = "0.6.5".freeze
 end

data/spec/clamp/command_group_spec.rb

@@ -66,6 +66,15 @@ describe Clamp::Command do
 
     end
 
+    describe ".find_subcommand_class" do
+
+      it "finds subcommand classes" do
+        flip_class = command_class.find_subcommand_class("flip")
+        expect(flip_class.new("xx").message).to eq("FLIPPED")
+      end
+
+    end
+
   end
 
   context "with an aliased subcommand" do
@@ -112,9 +121,14 @@ describe Clamp::Command do
       subcommand "foo", "Foo!" do
 
         subcommand "bar", "Baaaa!" do
+
+          def self.this_is_bar
+          end
+
           def execute
             puts "FUBAR"
           end
+
         end
 
       end
@@ -126,6 +140,14 @@ describe Clamp::Command do
       expect(stdout).to match /FUBAR/
     end
 
+    describe ".find_subcommand_class" do
+
+      it "finds nested subcommands" do
+        expect(command_class.find_subcommand_class("foo", "bar")).to respond_to(:this_is_bar)
+      end
+
+    end
+
   end
 
   context "with a default subcommand" do

data/spec/spec_helper.rb

@@ -37,8 +37,11 @@ end
 module CommandFactory
 
   def given_command(name, &block)
+    let(:command_class) do
+      Class.new(Clamp::Command, &block)
+    end
     let(:command) do
-      Class.new(Clamp::Command, &block).new(name)
+      command_class.new(name)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clamp
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies: []
 description: |
   Clamp provides an object-model for command-line utilities.