clive 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/clive.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clive}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Hawxwell"]

data/lib/clive/command.rb

@@ -169,17 +169,11 @@ class Clive
           r << [:flag, flag]
         else
           if k == :word
-            if r.last
-              case r.last[0]
-              when :flag
-                if r.last[2]
-                  r << [:argument, v]
-                else
-                  r.last[2] = v
-                end
-              else
-                r << [:argument, v]
-              end
+            # add to last flag?
+            if r.last && r.last[0] == :flag && r.last[2].nil?
+              r.last[2] = v
+            else
+              r << [:argument, v]
             end
           else
             raise InvalidOption.new(v)

data/test/bin_test

@@ -48,6 +48,6 @@ c = Clive.new do
 
 end
 
-c.parse(ARGV)
+p c.parse(ARGV)
 p options
 

data/test/test_clive.rb

@@ -147,6 +147,21 @@ class TestClive < Test::Unit::TestCase
       assert_equal r, opts
     end
     
+    should "recognise an argument" do
+      c = Clive.new do
+        bool(:v, :verbose, "Run verbosely") {}
+      end
+      args = c.parse ["argument"]
+      assert_equal ["argument"], args
+    end
+    
+    should "recognise multiple arguments" do
+      c = Clive.new do
+        bool(:v, :verbose, "Run verbosely") {}
+      end
+      args = c.parse ["argument", "and", "another"]
+      assert_equal ["argument", "and", "another"], args
+    end
     
     should "parse a mixture properly" do
       opts = {}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clive
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Joshua Hawxwell