Merge pull request #7 from jekyll/default_command

Add ability to specify command

Author: parkr

lib/mercenary/command.rb

@@ -45,6 +45,25 @@ def description(desc = nil)
       @description
     end
 
+    # Public: Sets the default command
+    #
+    # command_name - the command name to be executed in the event no args are
+    #                present
+    #
+    # Returns the default command if there is one, `nil` otherwise
+    def default_command(command_name = nil)
+      if command_name
+        if commands.has_key?(command_name)
+          @default_command = commands[command_name] if command_name
+          @default_command
+        else
+          raise ArgumentError.new("'#{command_name}' couldn't be found in this command's list of commands.")
+        end
+      else
+        @default_command
+      end
+    end
+
     # Public: Adds an option switch
     #
     # sym - the variable key which is used to identify the value of the switch
@@ -148,7 +167,11 @@ def process_options(opts, config)
     #
     # Returns nothing
     def execute(argv = [], config = {})
-      actions.each { |a| a.call(argv, config) }
+      if actions.empty? && !default_command.nil?
+        default_command.execute
+      else
+        actions.each { |a| a.call(argv, config) }
+      end
     end
 
     # Public: Check if this command has a subcommand

lib/mercenary/program.rb

@@ -46,7 +46,7 @@ def go(argv)
 
       logger.debug("Parsed config: #{@config.inspect}")
 
-      cmd.actions.each { |a| a.call(argv, @config) }
+      cmd.execute(argv, @config)
     end
   end
 end

spec/command_spec.rb

@@ -4,13 +4,18 @@
 
   context "a basic command" do
     let(:command) { Mercenary::Command.new(:my_name) }
+    let(:parent)  { Mercenary::Command.new(:my_parent) }
+    let(:with_sub) do
+      c = Mercenary::Command.new(:i_have_subcommand)
+      add_sub.call(c)
+      c
+    end
     let(:command_with_parent) do
       Mercenary::Command.new(
         :i_have_parent,
         parent
       )
     end
-    let(:parent)  { Mercenary::Command.new(:my_parent) }
     let(:add_sub) do
       Proc.new do |c|
         c.command(:sub_command) { |p| }
@@ -50,6 +55,15 @@
       expect(command.options).to eq([opt])
       expect(command.map).to include({opt.first => name})
     end
+
+    it "raises an ArgumentError if I specify a default_command that isn't there" do
+      c = command # some weird NameError with the block below?
+      expect { c.default_command(:nope) }.to raise_error(ArgumentError)
+    end
+
+    it "sets the default_command" do
+      expect(with_sub.default_command(:sub_command).name).to eq(:sub_command)
+    end
   end
 
 end