hammer_cli 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c64a799978261a9f78c6ce7642a7cb82473cbb0a
-  data.tar.gz: 5893a4bfe3980b8794ea988c3895871625f1de47
+  metadata.gz: dc846bf971738baff5d9a47ba375a4faa698ddff
+  data.tar.gz: ec7445b7048131184372d9d6aabfa00c2bc27d77
 SHA512:
-  metadata.gz: 18db270151afec8b1da636d4a3aa9088090c1b4de705102d8ca877c2c5cccbba65acbaa21f12dcbd2abb685f1bb2e684d6324afab555e6172857544c1c704215
-  data.tar.gz: 2c860c0406767e951e0d63d11d2c2e4e5c9d992148710110941982f3a0a9e295a8faf0c2983de1a97b5ba864b5f0aec66c851918e561132f99253c6b83e2edee
+  metadata.gz: 49c74f5aad4024fd6074135d1d779e2bcf6b9debafddb2879672e938c1c0da0901c88719b70a9872145539d878c3d8660777bb535017436095790c6b2ea4662e
+  data.tar.gz: e84343ad493a84d1fb21e8e1cf7e36ffd63b6737fa4179b531b132a3ca3e2f050e969e40b905ad672f2c2f145e111754431fda7f89f3edb17df3b773b6490be2

data/bin/hammer

@@ -37,7 +37,8 @@ if preparser.verbose?
   root_logger.appenders = root_logger.appenders << ::Logging.appenders.stderr(:layout => HammerCLI::Logger::COLOR_LAYOUT)
 end
 
-hammer_version = Gem.loaded_specs['hammer_cli'].version.to_s
+require 'hammer_cli/version'
+hammer_version = HammerCLI.version.to_s
 logger.info "Initialization of Hammer CLI (#{hammer_version}) has started..."
 
 # log which config was loaded (now when we have logging)
@@ -49,18 +50,12 @@ end
 require 'hammer_cli'
 
 # load modules set in config
-modules = HammerCLI::Settings.get(:modules) || []
-modules.each do |m|
-  begin
-    require m
-  rescue => e
-    logger.error "Error while loading module #{m}"
-    handler = HammerCLI::ExceptionHandler.new(:context => {}, :adapter => :base)
-    handler.handle_exception(e)
-    exit HammerCLI::EX_SOFTWARE
-  end
-  module_version = Gem.loaded_specs[m].version.to_s
-  logger.info "Extension module #{m} (#{module_version}) loaded"
+begin
+  HammerCLI::Modules.load_all
+rescue => e
+  handler = HammerCLI::ExceptionHandler.new(:context => {}, :adapter => :base)
+  handler.handle_exception(e)
+  exit HammerCLI::EX_SOFTWARE
 end
 
 exit HammerCLI::MainCommand.run || HammerCLI::EX_OK

data/lib/hammer_cli/main.rb

@@ -14,9 +14,8 @@ module HammerCLI
 
     option "--version", :flag, "show version" do
       puts "hammer (%s)" % HammerCLI.version
-      modules = HammerCLI::Settings.get(:modules) || []
-      modules.each do |m|
-        module_version = Gem.loaded_specs[m].version.to_s
+      HammerCLI::Modules.names.each do |m|
+        module_version = HammerCLI::Modules.find_by_name(m).version
         puts " * #{m} (#{module_version})"
       end
       exit(HammerCLI::EX_OK)

data/lib/hammer_cli/modules.rb

@@ -0,0 +1,51 @@
+
+module HammerCLI
+
+  class Modules
+
+    def self.names
+      HammerCLI::Settings.get(:modules) || []
+    end
+
+    def self.find_by_name(name)
+      possible_names = [
+        name.camelize,
+        name.camelize.gsub("Cli", "CLI")
+      ]
+
+      possible_names.each do |n|
+        return Object.const_get(n) if Object.const_defined?(n)
+      end
+      return nil
+    end
+
+    def self.load(name)
+      begin
+        require_module(name)
+      rescue Exception => e
+        logger.error "Error while loading module #{name}"
+        raise e
+      end
+
+      version = find_by_name(name).version
+      logger.info "Extension module #{name} (#{version}) loaded"
+    end
+
+    def self.require_module(name)
+      require name
+    end
+
+    def self.load_all
+      HammerCLI::Modules.names.each do |m|
+        Modules.load(m)
+      end
+    end
+
+    protected
+    def self.logger
+      Logging.logger['Modules']
+    end
+
+  end
+
+end

data/lib/hammer_cli/utils.rb

@@ -15,4 +15,9 @@ class String
     end
   end
 
+  def camelize()
+    return self if self !~ /_/ && self =~ /[A-Z]+.*/
+    split('_').map{|e| e.capitalize}.join
+  end
+
 end

data/lib/hammer_cli/version.rb

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

data/lib/hammer_cli.rb

@@ -1,5 +1,6 @@
 require 'hammer_cli/utils'
 require 'hammer_cli/version'
+require 'hammer_cli/modules'
 require 'hammer_cli/exit_codes'
 require 'hammer_cli/settings'
 require 'hammer_cli/validator'

data/test/unit/modules_test.rb

@@ -0,0 +1,82 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+
+describe HammerCLI::Modules do
+
+  module HammerCLITom
+    def self.version
+      Gem::Version.new "0.0.1"
+    end
+  end
+
+  module HammerCliJerry
+    def self.version
+      Gem::Version.new "0.0.2"
+    end
+  end
+
+  before :each do
+    HammerCLI::Settings.clear
+    HammerCLI::Settings.load({
+      :modules => ["hammer_cli_tom", "hammer_cli_jerry"]
+    })
+
+    @log_output = Logging::Appenders['__test__']
+    @log_output.reset
+  end
+
+  describe "names" do
+    it "must return list of modules" do
+      HammerCLI::Modules.names.must_equal ["hammer_cli_tom", "hammer_cli_jerry"]
+    end
+
+    it "must return empty array by default" do
+      HammerCLI::Settings.clear
+      HammerCLI::Modules.names.must_equal []
+    end
+  end
+
+  describe "find by name" do
+    it "must return nil if the module does not exist" do
+      HammerCLI::Modules.find_by_name("hammer_cli_unknown").must_equal nil
+    end
+
+    it "must must find the module" do
+      HammerCLI::Modules.find_by_name("hammer_cli_jerry").must_equal HammerCliJerry
+    end
+
+    it "must find the module with capital CLI in it's name" do
+      HammerCLI::Modules.find_by_name("hammer_cli_tom").must_equal HammerCLITom
+    end
+  end
+
+  describe "load all modules" do
+
+    it "must call load for each module" do
+      HammerCLI::Modules.expects(:load).with("hammer_cli_tom")
+      HammerCLI::Modules.expects(:load).with("hammer_cli_jerry")
+      HammerCLI::Modules.load_all
+    end
+
+  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")
+    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
+  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"
+    end
+
+end
+

data/test/unit/utils_test.rb

@@ -31,5 +31,18 @@ describe String do
 
   end
 
+
+  context "camelize" do
+
+    it "should camelize string with underscores" do
+      "one_two_three".camelize.must_equal "OneTwoThree"
+    end
+
+    it "should not camelize string with dashes" do
+      "one-two-three".camelize.must_equal "One-two-three"
+    end
+
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -154,6 +154,7 @@ files:
 - lib/hammer_cli/exception_handler.rb
 - lib/hammer_cli/output.rb
 - lib/hammer_cli/shell.rb
+- lib/hammer_cli/modules.rb
 - lib/hammer_cli/utils.rb
 - lib/hammer_cli/output/adapter/table.rb
 - lib/hammer_cli/output/adapter/base.rb
@@ -185,6 +186,7 @@ files:
 - test/unit/exception_handler_test.rb
 - test/unit/main_test.rb
 - test/unit/test_helper.rb
+- test/unit/modules_test.rb
 - test/unit/abstract_test.rb
 - test/unit/output/adapter/base_test.rb
 - test/unit/output/adapter/csv_test.rb
@@ -246,6 +248,7 @@ test_files:
 - test/unit/exception_handler_test.rb
 - test/unit/main_test.rb
 - test/unit/test_helper.rb
+- test/unit/modules_test.rb
 - test/unit/abstract_test.rb
 - test/unit/output/adapter/base_test.rb
 - test/unit/output/adapter/csv_test.rb