clint 0.1.1 → 0.1.2

data/lib/clint.rb

@@ -139,24 +139,26 @@ class Clint
     # Execute the subcommand as a class method.
     if klass.singleton_methods(false).include? subcommand.to_s
       arity = klass.method(subcommand).arity
-      if @args.length != arity && -@args.length - 1 != arity
-        usage
-        exit 1
-      end
-      begin
-        klass.send subcommand, *(@args + [@options])
-      rescue ArgumentError
-        klass.send subcommand, *@args
+      if @args.length == arity || -@args.length - 1 == arity
+        begin
+          klass.send subcommand, *(@args + [@options])
+        rescue ArgumentError
+          klass.send subcommand, *@args
+        end
+        exit 0
       end
-      exit 0
     end
 
     # Execute the subcommand as an instance method.
-    if 1 > @args.length
+    arity = klass.allocate.method(:initialize).arity
+    if 0 > arity
+      arity = arity.abs - 1
+    end
+    if arity > @args.length
       usage
       exit 1
     end
-    instance = klass.new(@args.shift)
+    instance = klass.new(@args.slice!(0, arity))
     if instance.public_methods(false).include? subcommand.to_s
       arity = instance.method(subcommand).arity
       if @args.length != arity && -@args.length - 1 != arity

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Richard Crowley
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 +00:00
+date: 2010-03-03 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -54,6 +54,10 @@ description: |
   
   Due to limitations in the Ruby 1.8 grammar, all methods that could act as subcommands must not declare default argument values except `options={}` if desired.
   
+  ## THEME SONG
+  
+  Leo Arnaud and John Williams - "Bugler's Dream"
+  
   ## AUTHOR
   
   Richard Crowley <r@rcrowley.org>