commandant 0.2.1 → 0.2.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Rein Henrichs
+Copyright (c) 2010 Rein Henrichs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -24,7 +24,7 @@ what you want and none of what you don't. If you don't like it, don't use it.
 === Provides:
 
 * <tt>basic hello</tt>
-* <tt>basic argprint foo bar bazz
+* <tt>basic argprint foo bar bazz</tt>
 
 == Note on Patches/Pull Requests
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/commandant.rb

@@ -55,7 +55,7 @@ module Commandant
   #   end
   #
   #   Commandant.run "argprint foo bizz bazz"
-  def command(name, description="", &command)
+  def command(name, description=nil, &command)
     Command.new(name, description, &command)
   end
   module_function :command
@@ -68,8 +68,11 @@ module Commandant
   # @raise [UnknownCommand] command is unknown and no :main command is available
   def run(cmdline=ARGV)
     name, *args = cmdline
-    name, args = :main, [name, *args] if name.nil? || COMMANDS[name.to_sym].nil? && COMMANDS[:main]
-    Commandant.call name.to_sym, args.compact
+    name = name.to_sym if name
+
+    name, *args = :main, name, *args unless COMMANDS[name]
+
+    Commandant.call name, args.compact
   end
   module_function :run
 

data/spec/commandant_spec.rb

@@ -63,7 +63,7 @@ describe Commandant do
     end
 
     it "defaults to the :main command, if available" do
-      Commandant.run(%w{ some args }).should == 'main called with ["some", "args"]'
+      Commandant.run(%w{ some args }).should == 'main called with [:some, "args"]'
     end
 
     it "runs the main command if no arguments are passed" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Rein Henrichs