hammer_cli 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc846bf971738baff5d9a47ba375a4faa698ddff
-  data.tar.gz: ec7445b7048131184372d9d6aabfa00c2bc27d77
+  metadata.gz: ec98bfd08b8af7d5ec4dd2a7e7b215e1c3d348e4
+  data.tar.gz: 51fc2a97810bd8c8fed855eaee2b3b438b495a18
 SHA512:
-  metadata.gz: 49c74f5aad4024fd6074135d1d779e2bcf6b9debafddb2879672e938c1c0da0901c88719b70a9872145539d878c3d8660777bb535017436095790c6b2ea4662e
-  data.tar.gz: e84343ad493a84d1fb21e8e1cf7e36ffd63b6737fa4179b531b132a3ca3e2f050e969e40b905ad672f2c2f145e111754431fda7f89f3edb17df3b773b6490be2
+  metadata.gz: 6ea9c6240e80c754ee6391cb6be396527a720c7cf85e21b09d618e7cc35f9fdadd0765eac52f48656c819d60e03a3a46a0be7fc0b5cda538cd93c42db46c70f8
+  data.tar.gz: 176c84972b1b107252f2d93828596ff693f1b7156d8d920e5b58ec363cab85bee0e8fa777603a6b4fb4ed005b3cece2321cce25165d0b65a10ba006459ac47d5

data/doc/creating_commands.md

@@ -97,7 +97,9 @@ for the full list of available exit codes.
 Our new command has only one option so far. It's `-h` which is built in for every command by default.
 Option declaration is the same as in clamp so please read it's
 [documentation](https://github.com/mdub/clamp/#declaring-options)
-on that topic.
+on that topic. However unlike in Clamp, the option accessors in Hammer are created with prefix 'option_', to avoid
+conflict with methods of the commands. So to access value of an `--name` option you have to call `option_name()`
+
 
 Example option usage could go like this:
 ```ruby
@@ -106,7 +108,7 @@ class HelloCommand < HammerCLI::AbstractCommand
   option '--name', "NAME", "Name of the person you want to greet"
 
   def execute
-    print_message "Hello %s!" % (name || "World")
+    print_message "Hello %s!" % (option_name || "World")
     HammerCLI::EX_OK
   end
 end
@@ -135,20 +137,20 @@ Hammer provides extended functionality for validating options.
 First of all there is a dsl for validating combinations of options:
 ```ruby
 validate_options do
-  all(:name, :surname).required  # requires all the options
-  option(:age).required          # requires a single option,
+  all(:option_name, :option_surname).required  # requires all the options
+  option(:option_age).required          # requires a single option,
                                  # equivalent of :required => true in option declaration
-  any(:email, :phone).required   # requires at least one of the options
+  any(:option_email, :option_phone).required   # requires at least one of the options
 
   # Tt is possible to create more complicated constructs.
   # This example requires either the full address or nothing
-  if any(:street, :city, :zip).exist?
-    all(:street, :city, :zip).required
+  if any(:option_street, :option_city, :option_zip).exist?
+    all(:option_street, :option_city, :option_zip).required
   end
 
   # Here you can reject all address related option when --no-address is passed
-  if option(:no_address).exist?
-    all(:street, :city, :zip).rejected
+  if option(:option_no_address).exist?
+    all(:option_street, :option_city, :option_zip).rejected
   end
 end
 
@@ -159,6 +161,8 @@ Another option-related feature is a set of normalizers for specific option types
 option values. Each normalizer has a description of the format it accepts. This description is printed
 in commands' help.
 
+See [our tutorial](option_normalizers.md#option-normalizers) if you want to create your custom normalizer.
+
 ##### _List_
 
 Parses comma separated strings to a list of values.
@@ -220,7 +224,7 @@ module HammerCLIHello
       option '--name', "NAME", "Name of the person you want to greet"
 
       def execute
-        print_message "Hello %s!" % (name || "World")
+        print_message "Hello %s!" % (option_ name || "World")
         HammerCLI::EX_OK
       end
     end
@@ -303,7 +307,7 @@ a message in a log for debugging purposes.
 
 
 ### Removing subcommands
-If your plugin needs to disable existing subcommand, you can use `remove_subcommand` for this. 
+If your plugin needs to disable existing subcommand, you can use `remove_subcommand` for this.
 
 ```ruby
   HammerCLI::MainCommand.remove_subcommand 'say'

data/doc/developer_docs.md

@@ -10,3 +10,4 @@ Contents:
  - [Creating commands](creating_commands.md#create-your-first-command)
  - [Creating ApiPie commands](creating_apipie_commands.md#creating-commands-for-restful-api-with-apipie)
  - [Development tips](development_tips.md#development-tips)
+ - [Option normalizers](option_normalizers.md#option-normalizers)

data/doc/option_normalizers.md

@@ -0,0 +1,96 @@
+Option normalizers
+------------------
+
+The goal of option normalizers is to:
+ - provide description of valid option values
+ - check format and preprocess values passed by users
+ - offer value completion
+
+Every normalizer must be descendant of `HammerCLI::Options::Normalizers::AbstractNormalizer`.
+
+Example usage:
+```ruby
+option "--enabled", "ENABLED", "Should the host be enabled?",
+  :format => HammerCLI::Options::Normalizers::Bool.new
+```
+
+#### Description of valid values
+There is method `description` that should return a help string. It's value is used in output of `-h`,
+which can then look for example like this:
+
+```
+--enabled ENABLED             Should the host be enabled?
+                              One of true/false, yes/no, 1/0.
+```
+
+Abstract normalizer returns empty string by default.
+
+
+#### Check and format passed values
+
+Normalizer's method `format` is used for such checks. The method behaves as a filter taking
+string value as it's input and returning value of any type.
+
+If the value is not valid `ArgumentError` with an appropriate message should be risen.
+Implementation in `Bool` normalizer is a good example of such functionality:
+
+```ruby
+def format(bool)
+  bool = bool.to_s
+  if bool.downcase.match(/^(true|t|yes|y|1)$/i)
+    return true
+  elsif bool.downcase.match(/^(false|f|no|n|0)$/i)
+    return false
+  else
+    raise ArgumentError, "value must be one of true/false, yes/no, 1/0"
+  end
+end
+```
+
+
+#### Value completion
+
+Normalizers can also provide completion of option values via method `complete`. It takes one argument - current option value at the time the completion was requested. In the simplest cases the method returns array of all possible values. More complex completions can use the current value argument for building the return values.
+
+We distinguish two types of offered completion strings:
+
+**Terminal completions**
+- used in most cases
+- the value is terminal and the completion finishes when it is selected
+- terminal strings have to end with a blank space
+
+**Partial complations**
+- used to offer completion pieces, eg. directory names when completing file path
+- the completion continues until a terminal string is selected
+- the values have to end with any character but blank space
+
+Completing file paths demonstrate the difference nicely:
+```ruby
+# "hammer some command --file /etc/f"
+file_normalizer.complete("/etc/f")
+[
+  "/etc/foreman/", # partial completion, can continue with the directory contents
+  "/etc/foo/",     # -- || --
+  "/etc/foo.conf " # terminal, the completion can't continue
+]
+```
+Example of a simple completion method for boolean values:
+```ruby
+def complete(value)
+  ["yes ", "no "]
+end
+```
+Example of a method completing file paths:
+```ruby
+def complete(value)
+  Dir[value.to_s+'*'].collect do |file|
+    if ::File.directory?(file)
+      file+'/'
+    else
+      file+' '
+    end
+  end
+end
+```
+
+See more examples in [normalizers.rb](../lib/hammer_cli/options/normalizers.rb).

data/lib/hammer_cli/abstract.rb

@@ -240,6 +240,5 @@ module HammerCLI
     def options
       all_options.reject {|key, value| value.nil? }
     end
-
   end
 end

data/lib/hammer_cli/apipie/command.rb

@@ -1,3 +1,4 @@
+require File.join(File.dirname(__FILE__), '../abstract')
 require File.join(File.dirname(__FILE__), 'options')
 require File.join(File.dirname(__FILE__), 'resource')
 
@@ -8,24 +9,13 @@ module HammerCLI::Apipie
     include HammerCLI::Apipie::Resource
     include HammerCLI::Apipie::Options
 
-    def initialize(*args)
-      super
-      setup_identifier_options
-    end
-
-    def setup_identifier_options
-      self.class.identifier_option(:id, "resource id")
-      self.class.identifier_option(:name, "resource name")
-      self.class.identifier_option(:label, "resource label")
-    end
-
     def self.identifiers(*keys)
       @identifiers ||= {}
       keys.each do |key|
         if key.is_a? Hash
           @identifiers.merge!(key)
         else
-          @identifiers.update(key => key)
+          @identifiers.update(key => HammerCLI.option_accessor_name(key))
         end
       end
     end
@@ -74,6 +64,12 @@ module HammerCLI::Apipie
 
     private
 
+    def self.setup_identifier_options
+      identifier_option(:id, "resource id")
+      identifier_option(:name, "resource name")
+      identifier_option(:label, "resource label")
+    end
+
     def self.identifier_option(name, desc)
       attr_name = declared_identifiers[name]
       option "--"+name.to_s, name.to_s.upcase, desc, :attribute_name => attr_name if self.identifier? name

data/lib/hammer_cli/apipie/options.rb

@@ -19,25 +19,33 @@ module HammerCLI::Apipie
       params.each do |p|
         if p["expected_type"] == "hash"
           opts[p["name"]] = method_options_for_params(p["params"], include_nil)
-        elsif respond_to?(p["name"], true)
-          opts[p["name"]] = send(p["name"])
         else
-          opts[p["name"]] = nil
+          opts[p["name"]] = get_option_value(p["name"])
         end
       end
       opts.reject! {|key, value| value.nil? } unless include_nil
       opts
     end
 
+    def get_option_value(opt_name)
+      if respond_to?(HammerCLI.option_accessor_name(opt_name), true)
+        send(HammerCLI.option_accessor_name(opt_name))
+      else
+        nil
+      end
+    end
+
     module ClassMethods
 
       def apipie_options(options={})
-        raise "Specify apipie resource first." unless resource_defined?
+        setup_identifier_options
+        if resource_defined?
+          filter = options[:without] || []
+          filter = Array(filter)
+          filter += declared_identifiers.keys
 
-        filter = options[:without] || []
-        filter = Array(filter)
-
-        options_for_params(resource.docs_for(action)["params"], filter)
+          options_for_params(resource.docs_for(action)["params"], filter)
+        end
       end
 
       protected

data/lib/hammer_cli/apipie/resource.rb

@@ -33,9 +33,9 @@ module HammerCLI::Apipie
       self.new(definition.resource_class, config)
     end
 
-    def call(method_name, params=nil)
+    def call(method_name, params=nil, headers=nil)
       Logging.logger[resource_class.name].debug "Calling '#{method_name}' with params #{params.ai}" if HammerCLI::Settings.get(:log_api_calls)
-      result = instance.send(method_name, params)
+      result = instance.send(method_name, params, headers)
       Logging.logger[resource_class.name].debug "Method '#{method_name}' responded with #{result[0].ai}" if HammerCLI::Settings.get(:log_api_calls)
       result
     end
@@ -83,6 +83,7 @@ module HammerCLI::Apipie
       end
 
       def module_resource
+        return nil unless self.name
         enclosing_module = self.name.split("::")[0..-2].inject(Object) { |mod, cls| mod.const_get cls }
 
         if enclosing_module.respond_to? :resource

data/lib/hammer_cli/main.rb

@@ -27,7 +27,7 @@ module HammerCLI
       :format => HammerCLI::Options::Normalizers::Bool.new,
       :context_target => :interactive
 
-    option ["--csv"], :flag, "Output as CSV (same as --adapter=csv)"
+    option ["--csv"], :flag, "Output as CSV (same as --output=csv)"
     option ["--output"], "ADAPTER", "Set output format. One of [%s]" %
       HammerCLI::Output::Output.adapters.keys.join(', '),
       :context_target => :adapter
@@ -44,7 +44,7 @@ module HammerCLI
       exit(HammerCLI::EX_OK)
     end
 
-    def csv=(csv)
+    def option_csv=(csv)
       context[:adapter] = :csv
     end
 

data/lib/hammer_cli/modules.rb

@@ -19,16 +19,28 @@ module HammerCLI
       return nil
     end
 
-    def self.load(name)
+    def self.load!(name)
       begin
         require_module(name)
+      rescue LoadError => e
+        logger.error "Module #{name} not found"
+        raise e
       rescue Exception => e
         logger.error "Error while loading module #{name}"
+        logger.error e
+        puts "Warning: An error occured while loading module #{name}"
         raise e
       end
 
       version = find_by_name(name).version
       logger.info "Extension module #{name} (#{version}) loaded"
+      true
+    end
+
+    def self.load(name)
+      load! name
+    rescue Exception => e
+      false
     end
 
     def self.require_module(name)

data/lib/hammer_cli/options/option_definition.rb

@@ -1,6 +1,19 @@
 require 'clamp'
 
 module HammerCLI
+
+  def self.option_accessor_name(*name)
+    if name.length > 1
+      name.map { |n| _option_accessor_name(n) }
+    else
+      _option_accessor_name(name.first)
+    end
+  end
+
+  def self._option_accessor_name(name)
+    "option_#{name.to_s}".gsub('-', '_')
+  end
+
   module Options
 
     class OptionDefinition < Clamp::Option::Definition
@@ -71,6 +84,12 @@ module HammerCLI
         end
       end
 
+      private
+
+      def infer_attribute_name
+        HammerCLI.option_accessor_name(super)
+      end
+
     end
 
   end

data/lib/hammer_cli/output/formatters.rb

@@ -1,12 +1,12 @@
 module HammerCLI::Output
   module Formatters
 
-    # Registry for formatters    
+    # Registry for formatters
     class FormatterLibrary
       def initialize(formatter_map={})
 
         @_formatters = {}
-        formatter_map.each do |type, formatters| 
+        formatter_map.each do |type, formatters|
           register_formatter(type, *Array(formatters))
         end
       end
@@ -14,7 +14,7 @@ module HammerCLI::Output
       def register_formatter(type, *formatters)
         if @_formatters[type].nil?
           @_formatters[type] = FormatterContainer.new *formatters
-        else 
+        else
           formatters.each { |f| @_formatters[type].add_formatter(f) }
         end
       end
@@ -30,7 +30,7 @@ module HammerCLI::Output
     # as we expect them to serialize the value.
     #
     #   - by format: :flat x :data
-    #   - by output: :file X :screen 
+    #   - by output: :file X :screen
 
     # abstract formatter
     class FieldFormatter
@@ -99,7 +99,13 @@ module HammerCLI::Output
       end
 
       def format(list)
-        list.join(", ") if list
+        if list.is_a? Array
+          list.join(", ")
+        elsif list
+          list.to_s
+        else
+          ""
+        end
       end
     end
 

data/lib/hammer_cli/validator.rb

@@ -94,7 +94,7 @@ module HammerCLI
     end
 
     def all(*to_check)
-      AllConstraint.new(@options, to_check)
+      AllConstraint.new(@options, to_check.flatten(1))
     end
 
     def option(to_check)
@@ -102,7 +102,7 @@ module HammerCLI
     end
 
     def any(*to_check)
-      AnyConstraint.new(@options, to_check)
+      AnyConstraint.new(@options, to_check.flatten(1))
     end
 
     def run(&block)

data/lib/hammer_cli/version.rb

@@ -1,5 +1,5 @@
 module HammerCLI
   def self.version
-    @version ||= Gem::Version.new '0.0.14'
+    @version ||= Gem::Version.new '0.0.15'
   end
 end

data/test/unit/abstract_test.rb

@@ -101,7 +101,7 @@ describe HammerCLI::AbstractCommand do
       test_command_class.option(['--password'], 'PASSWORD', 'Password')
       test_command = test_command_class.new("")
       test_command.run ['--password=pass']
-      @log_output.readline.strip.must_equal "INFO  HammerCLI::AbstractCommand : Called with options: {\"password\"=>\"***\"}"
+      @log_output.readline.strip.must_equal "INFO  HammerCLI::AbstractCommand : Called with options: {\"option_password\"=>\"***\"}"
     end
 
     class TestLogCmd < HammerCLI::AbstractCommand
@@ -282,7 +282,7 @@ describe HammerCLI::AbstractCommand do
     class CmdOD1 < HammerCLI::AbstractCommand
       output do
         label 'Label' do
-        end        
+        end
       end
     end
 

data/test/unit/apipie/command_test.rb

@@ -30,50 +30,52 @@ describe HammerCLI::Apipie::Command do
 
     class Cmd1 < HammerCLI::Apipie::Command
       identifiers :id, :name, :label
+      apipie_options
     end
 
     class Cmd2 < Cmd1
       identifiers :id
+      apipie_options
     end
 
     it "must not set any option by default" do
-      cmd
+      cmd_class.apipie_options
       cmd_class.declared_options.must_equal []
     end
 
     it "can set option --id" do
       cmd_class.identifiers :id
-      cmd
+      cmd_class.apipie_options
       option_switches.must_equal [["--id"]]
-      option_attribute_names.must_equal ["id"]
+      option_attribute_names.must_equal [HammerCLI.option_accessor_name("id")]
     end
 
     it "can set option --name" do
       cmd_class.identifiers :name
-      cmd
+      cmd_class.apipie_options
       option_switches.must_equal [["--name"]]
-      option_attribute_names.must_equal ["name"]
+      option_attribute_names.must_equal [HammerCLI.option_accessor_name("name")]
     end
 
     it "can set option --label" do
       cmd_class.identifiers :label
-      cmd
+      cmd_class.apipie_options
       option_switches.must_equal [["--label"]]
-      option_attribute_names.must_equal ["label"]
+      option_attribute_names.must_equal [HammerCLI.option_accessor_name("label")]
     end
 
     it "can set multiple identifiers" do
       cmd_class.identifiers :id, :name, :label
-      cmd
+      cmd_class.apipie_options
       option_switches.must_equal [["--id"], ["--label"], ["--name"]]
-      option_attribute_names.must_equal ["id", "label", "name"]
+      option_attribute_names.must_equal HammerCLI.option_accessor_name("id", "label", "name")
     end
 
     it "can change option reader" do
-      cmd_class.identifiers :name, :id => :id_read_method
-      cmd
+      cmd_class.identifiers :name, :id => :option_id_read_method
+      cmd_class.apipie_options
       option_switches.must_equal [["--id"], ["--name"]]
-      option_attribute_names.must_equal ["id_read_method", "name"]
+      option_attribute_names.must_equal HammerCLI.option_accessor_name("id_read_method", "name")
     end
 
     it "can override inentifiers in inherrited classes" do
@@ -84,11 +86,13 @@ describe HammerCLI::Apipie::Command do
 
       it "must require one of declared identifiers" do
         cmd_class.identifiers :id, :name
+        cmd_class.apipie_options
         cmd.run(["--id=1"]).must_equal HammerCLI::EX_OK
       end
 
       it "must raise exception when no attribute is passed" do
         cmd_class.identifiers :id, :name
+        cmd_class.apipie_options
         cmd.run([]).must_equal HammerCLI::EX_USAGE
       end
 
@@ -172,7 +176,7 @@ describe HammerCLI::Apipie::Command do
       end
 
       it "should set correct attribute name" do
-        option.attribute_name.must_equal 'se_arch_val_ue'
+        option.attribute_name.must_equal HammerCLI.option_accessor_name('se_arch_val_ue')
       end
 
       it "should set description with html tags stripped" do
@@ -189,7 +193,7 @@ describe HammerCLI::Apipie::Command do
       let(:required_options) { cmd_class.declared_options.reject{|opt| !opt.required?} }
 
       it "should set required flag for the required options" do
-        required_options.map(&:attribute_name).sort.must_equal ["array_param"]
+        required_options.map(&:attribute_name).sort.must_equal [HammerCLI.option_accessor_name("array_param")]
       end
     end
 
@@ -200,11 +204,11 @@ describe HammerCLI::Apipie::Command do
       end
 
       it "should create options for all parameters except the hash" do
-        cmd_class.declared_options.map(&:attribute_name).sort.must_equal ["array_param", "name", "provider"]
+        cmd_class.declared_options.map(&:attribute_name).sort.must_equal HammerCLI.option_accessor_name("array_param", "name", "provider")
       end
 
       it "should name the options correctly" do
-        cmd_class.declared_options.map(&:attribute_name).sort.must_equal ["array_param", "name", "provider"]
+        cmd_class.declared_options.map(&:attribute_name).sort.must_equal HammerCLI.option_accessor_name("array_param", "name", "provider")
       end
     end
 
@@ -222,17 +226,17 @@ describe HammerCLI::Apipie::Command do
 
       it "should parse comma separated string to array" do
         cmd.run(["--array-param=valA,valB,valC"])
-        cmd.array_param.must_equal ['valA', 'valB', 'valC']
+        cmd.get_option_value(:array_param).must_equal ['valA', 'valB', 'valC']
       end
 
       it "should parse string to array of length 1" do
         cmd.run(["--array-param=valA"])
-        cmd.array_param.must_equal ['valA']
+        cmd.get_option_value(:array_param).must_equal ['valA']
       end
 
       it "should parse empty string to empty array" do
         cmd.run(['--array-param='])
-        cmd.array_param.must_equal []
+        cmd.get_option_value(:array_param).must_equal []
       end
 
     end
@@ -245,22 +249,22 @@ describe HammerCLI::Apipie::Command do
 
       it "should skip filtered options" do
         cmd_class.apipie_options :without => ["provider", "name"]
-        cmd_class.declared_options.map(&:attribute_name).sort.must_equal ["array_param"]
+        cmd_class.declared_options.map(&:attribute_name).sort.must_equal [HammerCLI.option_accessor_name("array_param")]
       end
 
       it "should skip filtered options defined as symbols" do
         cmd_class.apipie_options :without => [:provider, :name]
-        cmd_class.declared_options.map(&:attribute_name).sort.must_equal ["array_param"]
+        cmd_class.declared_options.map(&:attribute_name).sort.must_equal [HammerCLI.option_accessor_name("array_param")]
       end
 
       it "should skip single filtered option in array" do
         cmd_class.apipie_options :without => ["provider"]
-        cmd_class.declared_options.map(&:attribute_name).sort.must_equal ["array_param", "name"]
+        cmd_class.declared_options.map(&:attribute_name).sort.must_equal HammerCLI.option_accessor_name("array_param", "name")
       end
 
       it "should skip single filtered option" do
         cmd_class.apipie_options :without => "provider"
-        cmd_class.declared_options.map(&:attribute_name).sort.must_equal ["array_param", "name"]
+        cmd_class.declared_options.map(&:attribute_name).sort.must_equal HammerCLI.option_accessor_name("array_param", "name")
       end
 
     end

data/test/unit/modules_test.rb

@@ -61,22 +61,83 @@ describe HammerCLI::Modules do
   end
 
   describe "load a module" do
-    it "must require a module" do
-      HammerCLI::Modules.expects(:require_module).with("hammer_cli_tom")
-      HammerCLI::Modules.load("hammer_cli_tom")
+    describe "success" do
+      before :each do
+        HammerCLI::Modules.stubs(:require_module)
+      end
+
+      it "must require a module" do
+        HammerCLI::Modules.expects(:require_module).with("hammer_cli_tom")
+        HammerCLI::Modules.load("hammer_cli_tom")
+      end
+
+      it "must log module's name and version" do
+        HammerCLI::Modules.expects(:require_module).with("hammer_cli_tom")
+        HammerCLI::Modules.load("hammer_cli_tom")
+        @log_output.readline.strip.must_equal "INFO  Modules : Extension module hammer_cli_tom (0.0.1) loaded"
+      end
+
+      it "must return true when load succeeds" do
+        HammerCLI::Modules.load("hammer_cli_tom").must_equal true
+      end
+
+      it "must return true when load! succeeds" do
+        HammerCLI::Modules.load!("hammer_cli_tom").must_equal true
+      end
     end
 
-    it "must log module's name and version" do
-      HammerCLI::Modules.expects(:require_module).with("hammer_cli_tom")
-      HammerCLI::Modules.load("hammer_cli_tom")
-      @log_output.readline.strip.must_equal "INFO  Modules : Extension module hammer_cli_tom (0.0.1) loaded"
+    describe "module not found" do
+      before :each do
+        HammerCLI::Modules.stubs(:require_module).raises(LoadError)
+        @error_msg = "ERROR  Modules : Module hammer_cli_tom not found"
+      end
+
+      it "must log an error if the load! fails" do
+        proc { HammerCLI::Modules.load!("hammer_cli_tom") }.must_raise LoadError
+        @log_output.readline.strip.must_equal @error_msg
+      end
+
+      it "must log an error if the load fails" do
+        HammerCLI::Modules.load("hammer_cli_tom")
+        @log_output.readline.strip.must_equal @error_msg
+      end
+
+      it "must return false when load fails" do
+        HammerCLI::Modules.load("hammer_cli_tom").must_equal false
+      end
     end
-  end
 
-    it "must log an error if the load fails" do
-      proc { HammerCLI::Modules.load("hammer_cli_tom") }.must_raise LoadError
-      @log_output.readline.strip.must_equal "ERROR  Modules : Error while loading module hammer_cli_tom"
+    describe "module runtime exception" do
+      before :each do
+        HammerCLI::Modules.stubs(:require_module).raises(RuntimeError)
+        @error_msg = "ERROR  Modules : Error while loading module hammer_cli_tom"
+        @warning_msg = "Warning: An error occured while loading module hammer_cli_tom"
+      end
+
+      it "must log an error if the load! fails" do
+        proc {
+          proc {
+            HammerCLI::Modules.load!("hammer_cli_tom")
+          }.must_output("#{@warning_msg}\n", "")
+        }.must_raise RuntimeError
+        @log_output.readline.strip.must_equal @error_msg
+      end
+
+      it "must log an error if the load fails" do
+        proc {
+          HammerCLI::Modules.load("hammer_cli_tom")
+        }.must_output("#{@warning_msg}\n", "")
+        @log_output.readline.strip.must_equal @error_msg
+      end
+
+      it "must return false when load fails" do
+        proc {
+          HammerCLI::Modules.load("hammer_cli_tom").must_equal false
+        }.must_output("#{@warning_msg}\n", "")
+      end
     end
 
+  end
+
 end
 

data/test/unit/output/formatters_test.rb

@@ -43,7 +43,7 @@ describe HammerCLI::Output::Formatters::FormatterContainer do
     container = HammerCLI::Output::Formatters::FormatterContainer.new(TestFormatter.new)
     container.format('').must_equal '.'
   end
-    
+
   it "has format method" do
     container = HammerCLI::Output::Formatters::FormatterContainer.new
     container.respond_to?(:format).must_equal true
@@ -72,7 +72,7 @@ describe HammerCLI::Output::Formatters::DateFormatter do
   it "returns empty string on wrong value" do
     formatter = HammerCLI::Output::Formatters::DateFormatter.new
     formatter.format('wrong value').must_equal ""
-  end  
+  end
 end
 
 describe HammerCLI::Output::Formatters::ListFormatter do
@@ -80,4 +80,14 @@ describe HammerCLI::Output::Formatters::ListFormatter do
     formatter = HammerCLI::Output::Formatters::ListFormatter.new
     formatter.format([1, 2]).must_equal '1, 2'
   end
+
+  it "returns empty string when the input is nil" do
+    formatter = HammerCLI::Output::Formatters::ListFormatter.new
+    formatter.format(nil).must_equal ''
+  end
+
+  it "returns string value when the input is not a list" do
+    formatter = HammerCLI::Output::Formatters::ListFormatter.new
+    formatter.format('some string').must_equal 'some string'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -134,6 +134,7 @@ extra_rdoc_files:
 - doc/development_tips.md
 - doc/developer_docs.md
 - doc/creating_commands.md
+- doc/option_normalizers.md
 - doc/design.png
 - doc/design.uml
 - doc/writing_a_plugin.md
@@ -206,6 +207,7 @@ files:
 - doc/development_tips.md
 - doc/developer_docs.md
 - doc/creating_commands.md
+- doc/option_normalizers.md
 - doc/design.png
 - doc/design.uml
 - doc/writing_a_plugin.md