clip 0.0.5 → 0.0.6

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.6 / 2008-07-10
+
+* Fixed a bug with getting the 'remainder' when only flags are declared.
+
 === 0.0.5 / 2008-06-12
 
 * Removed sample_parser from bin (technomancy)

data/lib/clip.rb

@@ -13,7 +13,7 @@ def Clip(args=ARGV)
 end
 
 module Clip
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 
   ##
   # Indicates that the parser was incorrectly configured in the
@@ -139,35 +139,30 @@ module Clip
         puts help
         exit 0
       end
-      param, value = nil, nil
+      option = nil
     
       args.each do |token|
         case token
         when /^-(-)?\w/
           consumed << token
           param = token.sub(/^-(-)?/, '').sub('-', '_').to_sym
-          value = nil
-        else
-          if param
-            consumed << token
-            value = token
+          option = options[param]
+          unless option
+            @errors[param] = "Unrecognized parameter"
+            @valid = false
+            next
           end
-        end
 
-        option = options[param]
-        if option
-          if (value.nil? && option.kind_of?(Flag)) || value
-            option.process(self, value)
+          if option.kind_of?(Flag)
+            option.process(self, nil)
+            option = nil
           end
         else
-          @errors[param] = "Unrecognized parameter"
-          @valid = false
-          next
-        end
-
-        unless value.nil?
-          param = nil
-          value = nil
+          if option
+            consumed << token
+            option.process(self, token)
+            option = nil
+          end
         end
       end
 

data/spec/clip_spec.rb

@@ -186,12 +186,32 @@ describe Clip do
     end
   end
 
-  describe "Additional arguments" do
+  describe "Remaining arguments" do
     it "should be made available" do
       parser = parse('--files foo alpha bravo')
       parser.files.should == %w[foo]
       parser.remainder.should == %w[alpha bravo]
     end
+
+    it "should be available when only flags are declared" do
+      opts = Clip('foobar') do |p|
+        p.flag 'v', 'verbose'
+        p.flag 'd', 'debug'
+      end
+      opts.remainder.should == ['foobar']
+      opts.should_not be_verbose
+      opts.should_not be_debug
+    end
+
+    it "should be available when flags are declared and parsed" do
+      opts = Clip('-v foobar') do |p|
+        p.flag 'v', 'verbose'
+        p.flag 'd', 'debug'
+      end
+      opts.remainder.should == ['foobar']
+      opts.should be_verbose
+      opts.should_not be_debug
+    end
   end
 
   describe "Declaring bad options and flags" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clip
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Alex Vollmer
@@ -9,17 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-13 00:00:00 -07:00
+date: 2008-07-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.7.0
     version: 
 description: You like command-line parsing, but you hate all of the bloat. Why should you have to create a Hash, then create a parser, fill the Hash out then throw the parser away (unless you want to print out a usage message) and deal with a Hash? Why, for Pete's sake, should the parser and the parsed values be handled by two different objects?
 email: 
@@ -59,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: clip
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Command-line parsing made short and sweet