smith 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f1a64e720f6d09734b66a3bf1f39b56ec81aed8
-  data.tar.gz: baafcf0aa8e1f048ea9ef250adc8475d8aa53408
+  metadata.gz: 60291ee6d180d1883c743e69e17c590f350c29ee
+  data.tar.gz: 9c2e93dad014cdc16a813c38c3ffc3402d68a81e
 SHA512:
-  metadata.gz: afca0d267739a592b25876133fa70fd0f2f03f962e22a3a4af35efa67b28cb9b47068526142e707db7afa7a496734c8f396c8b884ec0d3295c1706a5f7ab7f94
-  data.tar.gz: 0365407a67ab65dc32d41bbf91b316db1dde05851f6191df1a49bfcba611246efc09291f06abba2286c499f60f0807c484226ec5314b6fc315d773b712279a41
+  metadata.gz: 0ade57bcee554e10eac994c33f3ce32660d19e8938d25fb49e91c1e6c3c7494823f7c2bb3bad0734e9852a076ad04ad46b4f015d0822e6768f77ed8ed7cb951c
+  data.tar.gz: d3c2507f28b378a2d74924ee0d04ff03dd6605e2153587284cd0526ccd64549855eab4267f132e506b4e2a8fa452b984972fdf659a6940c641a0b869ba021683

data/lib/smith.rb

@@ -195,7 +195,6 @@ module Smith
         end
       end
     end
-
   end
 end
 

data/lib/smith/bootstrap.rb

@@ -41,7 +41,8 @@ module Smith
 
     def load_agent
       path = agent_directories(@agent_name)
-      logger.debug { "Loading #{@agent_name} from: #{path.dirname}" }
+      logger.info { "Loading #{@agent_name}" }
+      logger.debug { "Loading #{@agent_name} from: #{path}" }
       add_agent_load_path(path)
       load path
 
@@ -49,7 +50,7 @@ module Smith
         @agent = class_from_name(@agent_name).new(@agent_uuid)
       rescue NameError => e
         # TODO: include the class name from the path.
-        logger.fatal { "Cannot instantiate agent. The class name: #{@agent_name} probably didn't match the path" }
+        logger.fatal { "Cannot instantiate agent. File #{path} exists but doesn't contain the Class: #{@agent_name}." }
         terminate!
         false
       end
@@ -66,9 +67,7 @@ module Smith
     # See the note at the in main.
     def terminate!(exception=nil)
 
-      @agent.__send__(:__exception_handler, exception) if @agent
-      logger.error { format_exception(exception) }
-      logger.error { "Terminating: #{@agent_uuid}." }
+      run_exception_handler(exception)
 
       if Smith.running?
         send_dead_message
@@ -111,12 +110,23 @@ module Smith
       end
     end
 
-    def format_exception(exception)
-      str = "#{exception.class.to_s}: #{exception.message}\n\t"
-      if exception.backtrace
-        str << exception.backtrace[0..-1].join("\n\t")
+    # Format any excptions
+    # @param e [Exception] the exeption to format
+    # @return [String] formated exception
+    def format_exception(e)
+      "#{e.class.to_s}: #{e.inspect}\n\t".tap do
+        str << e.backtrace[0..-1].join("\n\t") if e.backtrace
+      end
+    end
+
+    # Run the on_exception proc defined in the agent.
+    # @param e [Exception] the exeption to handle
+    def run_exception_handler(exception)
+      if exception && @agent
+        @agent.__send__(:__exception_handler, exception)
+        logger.error { format_exception(exception) }
+        logger.error { "Terminating: #{@agent_uuid}." }
       end
-      str
     end
 
     # Add the ../lib to the load path. This assumes the directory
@@ -131,10 +141,15 @@ module Smith
     # TODO think this through some more.
     def add_agent_load_path(path)
       path = path.dirname.dirname.join('lib')
-      # The load path may be a pathname or a string. Change to strings.
-      unless $:.detect { |p| p.to_s == path.to_s }
-        logger.debug { "Adding #{path} to load path" }
-        $: << path
+
+      Smith.agent_directories.each do |path|
+        lib_path = path.parent.join('lib')
+        if lib_path.exist?
+          logger.info { "Adding #{lib_path} to load path" }
+          $LOAD_PATH << path
+        else
+          logger.info { "No lib directory for: #{path.parent}." }
+        end
       end
     end
   end

data/lib/smith/commands/common.rb

@@ -2,12 +2,28 @@
 module Smith
   module Commands
     module Common
+
+      # Returns the fully qualified class of all agents in a group. The group
+      # //must// be a sub-directory in the agents directory. Only sym-links are
+      # considered. The group directory is recursively searched and addeed to
+      # the ilst of agents for that group if it passed all checks.
+      #
+      # @param group [String] the group name
+      #
+      # @return [Array<Class>] the class of each agent in the group
       def agent_group(group)
-        agents = Smith.agent_directories.map do |path|
-          group_dir = path.join(group)
-          if group_dir.exist? && group_dir.directory?
-            agents = Pathname.glob(group_dir.join("*_agent.rb"))
-            agents.map {|a| Extlib::Inflection.camelize(a.basename(".rb").to_s)}
+        agents = Smith.agent_directories.map do |agent_directory|
+          group_directory = agent_directory.join(group)
+
+          if group_directory.exist? && group_directory.directory?
+            agents = Pathname.glob(group_directory.join("*.rb")).map(&:expand_path)
+
+            agents.each_with_object([]) do |agent, acc|
+              if agent.symlink?
+                expanded_agent_path = resolve_agent_path(group_directory, agent)
+                acc << Utils.class_name_from_path(expanded_agent_path, agent_directory)
+              end
+            end
           else
             nil
           end
@@ -16,6 +32,12 @@ module Smith
         raise RuntimeError, "Group does not exist: #{group}" if agents == [nil]
         agents.compact.flatten
       end
+
+      private
+
+      def resolve_agent_path(group_directory, agent)
+        agent.readlink.expand_path(group_directory)
+      end
     end
   end
 end

data/lib/smith/commands/smithctl/rm.rb

@@ -53,10 +53,11 @@ module Smith
         end
       end
 
-      # Delete an queue.
+      # Delete a queue.
       #
-      # @param name [String] name of the queue.
+      # @param queue_name [String] name of the queue.
       # @yield calls the block when the queue has been deleted
+      #
       # @yieldparam [AMQ::Protocol::Channel::Close] the amqp close message
       # FIXME: remove duplication
       def delete_queue(queue_name, &blk)

data/lib/smith/config.rb

@@ -152,16 +152,16 @@ module Smith
 
     # Loads and merges multiple toml files.
     #
-    # @params [String] the default toml file
-    # @params [String] the user supplied toml file
+    # @param default [String] the default toml file
+    # @param secondary [String] the user supplied toml file
     # @return [ConfigHash] the merge toml files.
-    def load_tomls(default, main)
-      load_toml(default).deep_merge(load_toml(main))
+    def load_tomls(default, secondary)
+      load_toml(default).deep_merge(load_toml(secondary))
     end
 
     # Load the toml file specified
     #
-    # @param [Pathname] the path of the toml file
+    # @param path [Pathname] the path of the toml file
     # @return [ConfigHash] the toml file
     def load_toml(path)
       ConfigHash.new(TOML.parse(path.read, :symbolize_keys => true))

data/lib/smith/utils.rb

@@ -24,12 +24,16 @@ module Smith
       parts[-1] = "#{parts[-1]}.rb"
       Pathname.new(root).join(*parts)
     end
+    module_function :path_from_class
 
-    def class_name_from_path(root, path)
+    # Returns a Constant based on the pathname.
+    def class_name_from_path(path, root=Pathname.new('.'))
       relative_path = path.relative_path_from(root)
-      parts = relative_path.split
+      parts = split_path(relative_path.sub_ext(''))
+
       parts.map { |p| p.to_s.camel_case }.join('::')
     end
+    module_function :class_name_from_path
 
     # Performs a Kernel.const_get on each element of the class.
     #
@@ -38,7 +42,19 @@ module Smith
     def class_from_name(name)
       name.to_s.split(/::/).inject(Kernel) { |acc, t| acc.const_get(t) }
     end
+    module_function :class_from_name
+
+
+    # Slipts a path into it's component parts.
+    #
+    # @param pathname [Pathname] the path to split.
+    def split_path(pathname)
+      pathname.each_filename.inject([]) { |acc, p| acc << p }
+    end
+    module_function :split_path
 
+    # Check for the existance of a directory and create if it doesn't exist.
+    # @param dir [Pathname]
     def check_and_create_directory(dir)
       dir.tap do
         dir.exist? || dir.mkpath

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -323,4 +323,4 @@ signing_key:
 specification_version: 4
 summary: Multi-agent framework
 test_files: []
-has_rdoc: false
+has_rdoc: