Add -t and --trace to Command's default flags

examples/trace.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), *%w{ .. lib })
+
+require "mercenary"
+
+# This example sets the logging mode of mercenary to
+# debug. Logging messages from "p.logger.debug" will
+# be output to STDOUT.
+
+Mercenary.program(:trace) do |p|
+
+ p.version "2.0.1"
+ p.description 'An example of traces in Mercenary'
+ p.syntax 'trace <subcommand>'
+
+ p.action do |_, _|
+ raise ArgumentError.new("YOU DID SOMETHING TERRIBLE YOU BUFFOON")
+ end
+
+end

lib/mercenary/command.rb

@@ -8,6 +8,7 @@ class Command
  attr_accessor :actions
  attr_reader :map
  attr_accessor :parent
+ attr_reader :trace
 
  # Public: Creates a new Command
  #
@@ -17,12 +18,13 @@ class Command
  #
  # Returns nothing
  def initialize(name, parent = nil)
- @name = name
- @options = []
- @commands = {}
- @actions = []
- @map = {}
- @parent = parent
+ @name = name
+ @options = []
+ @commands = {}
+ @actions = []
+ @map = {}
+ @parent = parent
+ @trace = false
  end
 
  # Public: Sets or gets the command version
@@ -133,7 +135,7 @@ def logger(level = nil)
  @logger = Logger.new(STDOUT)
  @logger.level = level || Logger::INFO
  @logger.formatter = proc do |severity, datetime, progname, msg|
- "#{ident} (#{severity}): #{msg}\n"
+ "#{identity} (#{severity}): #{msg}\n"
  end
  end
 
@@ -191,6 +193,10 @@ def add_default_options(opts)
  abort
  end
 
+ opts.on('-t', '--trace', 'Show full backtrace if an error occurs') do
+ @trace = true
+ end
+
  opts.on_tail("-h", "--help", "Show this message") do
  puts self
  exit

lib/mercenary/program.rb

@@ -31,7 +31,16 @@ def go(argv)
 
  logger.debug("Parsed config: #{@config.inspect}")
 
- cmd.execute(argv, @config)
+ begin
+ cmd.execute(argv, @config)
+ rescue => e
+ if cmd.trace
+ raise e
+ else
+ logger.error e.message
+ abort
+ end
+ end
  end
  end
 end