clamp 0.1.4 → 0.1.5

data/README.markdown

@@ -203,7 +203,7 @@ All Clamp commands support a "`--help`" option, which outputs brief usage docume
 
     Options:
         --loud                        say it loud
-        -n, --iterations N            say it N times
+        -n, --iterations N            say it N times (default: 1)
         --help                        print help
 
 Contributing to Clamp

data/lib/clamp/option/parsing.rb

@@ -11,6 +11,15 @@ module Clamp
           switch = remaining_arguments.shift
           break if switch == "--"
 
+          case switch
+          when /^(-\w)(.+)$/ # combined short options
+            switch = $1
+            remaining_arguments.unshift("-#{$2}")
+          when /^(--[^=]+)=(.*)/
+            switch = $1
+            remaining_arguments.unshift($2)
+          end
+            
           option = find_option(switch)
           value = option.extract_value(switch, remaining_arguments)
 

data/lib/clamp/version.rb

@@ -1,3 +1,3 @@
 module Clamp
-  VERSION = "0.1.4".freeze
+  VERSION = "0.1.5".freeze
 end

data/spec/clamp/command_spec.rb

@@ -122,9 +122,9 @@ describe Clamp::Command do
   describe "with options declared" do
 
     before do
-      @command.class.option "--flavour", "FLAVOUR", "Flavour of the month"
-      @command.class.option "--color", "COLOR", "Preferred hue"
-      @command.class.option "--[no-]nuts", :flag, "Nuts (or not)"
+      @command.class.option ["-f", "--flavour"], "FLAVOUR", "Flavour of the month"
+      @command.class.option ["-c", "--color"], "COLOR", "Preferred hue"
+      @command.class.option ["-n", "--[no-]nuts"], :flag, "Nuts (or not)"
       @command.class.parameter "[ARG] ...", "extra arguments", :attribute_name => :arguments
     end
 
@@ -154,6 +154,45 @@ describe Clamp::Command do
 
       end
 
+      describe "with short options" do
+
+        before do
+          @command.parse(%w(-f strawberry -c blue))
+        end
+
+        it "recognises short options as aliases" do
+          @command.flavour.should == "strawberry"
+          @command.color.should == "blue"
+        end
+        
+      end
+
+      describe "with combined short options" do
+
+        before do
+          @command.parse(%w(-nf strawberry))
+        end
+
+        it "works as though the options were separate" do
+          @command.flavour.should == "strawberry"
+          @command.nuts?.should == true
+        end
+        
+      end
+      
+      describe "with option arguments attached using equals sign" do
+
+        before do
+          @command.parse(%w(--flavour=strawberry --color=blue))
+        end
+
+        it "works as though the option arguments were separate" do
+          @command.flavour.should == "strawberry"
+          @command.color.should == "blue"
+        end
+      
+      end
+      
       describe "with option-like things beyond the arguments" do
 
         it "treats them as positional arguments" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clamp
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Mike Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 +11:00
+date: 2010-12-02 00:00:00 +11:00
 default_executable: 
 dependencies: []