diff --git a/clamp-0.6.3.gemspec b/clamp-0.6.3.gemspec index 8f51cc3..acab485 100644 --- clamp-0.6.3.gemspec +++ clamp-0.6.3.gemspec @@ -43,6 +43,7 @@ - lib/clamp/command.rb - lib/clamp/errors.rb - lib/clamp/help.rb +- lib/clamp/messages.rb - lib/clamp/option/declaration.rb - lib/clamp/option/definition.rb - lib/clamp/option/parsing.rb diff --git a/lib/clamp/attribute/instance.rb b/lib/clamp/attribute/instance.rb index 8f51cc3..acab485 100644 --- lib/clamp/attribute/instance.rb +++ lib/clamp/attribute/instance.rb @@ -72,7 +72,7 @@ def default_from_environment begin take(value) rescue ArgumentError => e - command.send(:signal_usage_error, "$#{attribute.environment_variable}: #{e.message}") + command.send(:signal_usage_error, Clamp.message(:env_argument_error, :env => attribute.environment_variable, :message => e.message)) end end diff --git a/lib/clamp/command.rb b/lib/clamp/command.rb index c6c50f4..52187ab 100644 --- lib/clamp/command.rb +++ lib/clamp/command.rb @@ -1,3 +1,4 @@ +require 'clamp/messages' require 'clamp/errors' require 'clamp/help' require 'clamp/option/declaration' @@ -91,7 +92,7 @@ def help def handle_remaining_arguments unless remaining_arguments.empty? - signal_usage_error "too many arguments" + signal_usage_error Clamp.message(:too_many_arguments) end end diff --git a/lib/clamp/help.rb b/lib/clamp/help.rb index e09731a..1e57530 100644 --- lib/clamp/help.rb +++ lib/clamp/help.rb @@ -61,7 +61,7 @@ def string end def add_usage(invocation_path, usage_descriptions) - puts "Usage:" + puts usage_heading usage_descriptions.each do |usage| puts " #{invocation_path} #{usage}".rstrip end @@ -87,6 +87,12 @@ def add_list(heading, items) end end + protected + + def usage_heading + "Usage:" + end + private def puts(*args) diff --git a/lib/clamp/messages.rb b/lib/clamp/messages.rb new file mode 100644 index 0000000..61cce94 --- /dev/null +++ lib/clamp/messages.rb @@ -0,0 +1,39 @@ +module Clamp + + def self.messages=(messages) + @user_defined_messages = messages + end + + def self.message(key, options={}) + @user_defined_messages ||= {} + msg = @user_defined_messages[key] || messages[key] + format_string(msg, options) + end + + def self.messages + { + :too_many_arguments => "too many arguments", + :option_required => "option '%