clap 0.0.1 → 0.0.2

data/README.markdown

@@ -16,7 +16,7 @@ Usage
 Using Clap is simple: just pass `ARGV` and a hash of flags, and it will extract
 the arguments as needed.
 
-    Clap.run(ARGV,
+    Clap.run ARGV,
       "-a" => lambda { |param| ... },
       "-b" => lambda { ... }
 
@@ -26,7 +26,7 @@ an array of strings.
 If you want your command line application to require a file or display a
 version number, you can configure it like this:
 
-    Clap.run(%w(-r foo -v),
+    Clap.run %w(-r foo -v),
       "-r" => lambda { |file| require file },
       "-v" => lambda { puts VERSION }
 
@@ -37,7 +37,7 @@ of the passed lambda.
 Another example, for an application that takes a `-v` flag and also a list of
 files:
 
-    files = Clap.run(%w(-v foo bar),
+    files = Clap.run %w(-v foo bar),
       "-v" => lambda { puts VERSION }
 
     files == %w(foo bar)

data/clap.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "clap"
-  s.version           = "0.0.1"
+  s.version           = "0.0.2"
   s.summary           = "Command line argument parsing for simple applications."
   s.description       = "Clap is a small library that can be bundled with your command line application. It covers the simple case of executing code based on the flags or parameters passed, and it does so with just under 30 lines of code."
   s.authors           = ["Michel Martens"]

data/lib/clap.rb

@@ -1,5 +1,5 @@
 class Clap
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   attr :argv
   attr :opts
@@ -9,7 +9,7 @@ class Clap
   end
 
   def initialize(argv, opts)
-    @argv = argv.reverse.dup
+    @argv = argv.dup
     @opts = opts
   end
 
@@ -17,13 +17,24 @@ class Clap
     args = []
 
     while argv.any?
-      item = argv.pop
 
-      if opts[item]
+      item = argv.shift
+      flag = opts[item]
+
+      if flag
+
+        # Work around lambda semantics in 1.8.7.
+        arity = [flag.arity, 0].max
+
+        # Raise if there are not enough parameters
+        # available for the flag.
+        if argv.size < arity
+          raise ArgumentError
+        end
 
         # Call the lambda with N items from argv,
         # where N is the lambda's arity.
-        opts[item].call(*argv.pop(opts[item].arity))
+        flag.call(*argv.shift(arity))
       else
 
         # Collect the items that don't correspond to

data/test/clap_test.rb

@@ -1,10 +1,15 @@
 require File.expand_path("../lib/clap", File.dirname(__FILE__))
 
-test "flag with argument" do
+test "flag with one argument" do
   result = Clap.run %w(-x y), "-x" => lambda { |flag| assert flag == "y" }
   assert result == []
 end
 
+test "flag with more than one argument" do
+  result = Clap.run %w(-x y z), "-x" => lambda { |y, z| assert [y, z] == %w(y z) }
+  assert result == []
+end
+
 test "flag with wrong number of arguments" do
   assert_raise(ArgumentError) do
     Clap.run %w(-x), "-x" => lambda { |flag| }
@@ -16,6 +21,11 @@ test "extract flags with parameters" do
   assert result == %w(a b c)
 end
 
+test "extract flags with zero arity" do
+  result = Clap.run %w(a b -x c), "-x" => lambda { || }
+  assert result == %w(a b c)
+end
+
 test "extract flags with no parameters" do
   result = Clap.run %w(a b -x c), "-x" => lambda {}
   assert result == %w(a b c)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Michel Martens
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 -03:00
+date: 2010-10-14 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency