smith 0.6.5.2 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28e4e29c427b83d0923d75bdf2789e01dfec90ff
-  data.tar.gz: ec4ecc625c7c52fc8079d9eb9e97bb5c56af40fb
+  metadata.gz: ac264c23960916b555109d48e592a8560447182f
+  data.tar.gz: 424cd6d244fbdce54cffce746aeb4f81635515e8
 SHA512:
-  metadata.gz: a8d70474e776f60812b052223c253790e4e29ef69b48dfda51dc52513bffa3798b2135db4759131ea9174fa10ec70895f9ffbc4b0aa5852ff2c26c0d869183d9
-  data.tar.gz: 4658f5f3d511ad13374cf4fc99cddd46a10aaa483f846acfacf5c61aeae5c170ef95002015d85a36d954b0cada657b84c4ab9145bc9d39566c52b81a1eeff592
+  metadata.gz: 9e73b594b540c6d136a5e9ed783531aa378603b28a0f1caa408e40a0f412d7583437b42b21fbcb14ec7566a6f339183a20f5dc51b7e823ea8970dd5ff8b98ff9
+  data.tar.gz: 894a371746a71b6af111614db36c5a6f9f58e6f070f2bbb2b1e16f6eba97904d16f1fd334e56ea335bd4058de372adff0b7123c4365eb8b1dfd206a750d3cfc0

data/lib/smith/agent.rb

@@ -89,7 +89,7 @@ module Smith
           queue = agent.instance_variable_get(:@signal_handler_queue)
           signal = queue.pop
 
-          agent.send(:logger).debug { "Running signal handlers for agent: #{agent.name}: #{signal}" }
+          # agent.send(:logger).debug { "Running signal handlers for agent: #{agent.name}: #{signal}" }
           handlers[signal].each { |handler| handler.call(signal) }
         end
       })
@@ -108,7 +108,6 @@ module Smith
       @signal_handlers[signal].insert((position == :beginning) ? 0 : -1, blk)
 
       Signal.trap(signal) {
-        logger.debug { "Got signal: #{signal}" }
         @signal_handler_pipe_writer.write_nonblock('.')
         @signal_handler_queue << signal
       }

data/lib/smith/agent_process.rb

@@ -9,6 +9,8 @@ module Smith
   class AgentProcess
 
     include Smith::Logger
+    include Utils
+
     extend Forwardable
 
     class AgentState < ::Protobuf::Message
@@ -75,7 +77,7 @@ module Smith
       end
 
       event :kill do
-        transition [:null, :unknown, :starting, :acknowledge_start, :stopping, :acknowledge_stop, :running, :dead] => :null
+        transition [:null, :unknown, :checked, :starting, :acknowledge_start, :stopping, :acknowledge_stop, :running, :dead] => :null
       end
     end
 
@@ -131,9 +133,7 @@ module Smith
     end
 
     def exists?
-      Smith.agent_paths.detect do |path|
-        Pathname.new(path).join("#{name.snake_case}.rb").exist?
-      end
+      agent_path(name)
     end
 
     def to_s

data/lib/smith/bootstrap.rb

@@ -8,7 +8,6 @@ $:.unshift(Pathname.new(__FILE__).dirname.parent.expand_path)
 
 require 'smith'
 require 'smith/agent'
-# require 'smith/synchronous_agent'
 
 module Smith
   class AgentBootstrap
@@ -16,6 +15,7 @@ module Smith
     attr_reader :agent
 
     include Logger
+    include Utils
 
     def initialize(name, uuid)
       Dir.chdir('/')
@@ -27,7 +27,6 @@ module Smith
       Thread.abort_on_exception = true
       @agent_name = name
       @agent_uuid = uuid
-      @agent_filename = agent_path(name)
     end
 
     def signal_handlers
@@ -41,20 +40,19 @@ module Smith
     end
 
     def load_agent
-      @agent_filename = agent_path(@agent_name)
-      logger.debug { "Loading #{@agent_name} from: #{@agent_filename.dirname}" }
-      add_agent_load_path
-      load @agent_filename
-      @agent = Kernel.const_get(@agent_name).new(@agent_uuid)
-    end
-
-    def agent_path(name)
-      file_name = "#{name.snake_case}.rb"
-      Smith.agent_paths.each do |path|
-        p = Pathname.new(path).join(file_name)
-        return p if p.exist?
+      path = agent_path(@agent_name)
+      logger.debug { "Loading #{@agent_name} from: #{path.dirname}" }
+      add_agent_load_path(path)
+      load path
+
+      begin
+        @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" }
+        terminate!
+        false
       end
-      return nil
     end
 
     def start!
@@ -128,8 +126,8 @@ module Smith
     #
     # This needs to be better thought out.
     # TODO think this through some more.
-    def add_agent_load_path
-      path = @agent_filename.dirname.dirname.join('lib')
+    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" }
@@ -158,9 +156,10 @@ bootstrapper = Smith::AgentBootstrap.new(name, uuid)
 # is an exception the reactor is not going going to be running.
 begin
   Smith.start do
-    bootstrapper.load_agent
-    bootstrapper.signal_handlers
-    bootstrapper.start!
+    if bootstrapper.load_agent
+      bootstrapper.signal_handlers
+      bootstrapper.start!
+    end
   end
   bootstrapper.shutdown
 rescue Exception => e

data/lib/smith/commands/agency/group.rb

@@ -0,0 +1,29 @@
+require_relative '../common'
+
+module Smith
+  module Commands
+    class Group < CommandBase
+
+      include Common
+
+      def execute
+        group do |value|
+          responder.succeed(value)
+        end
+      end
+
+      # Returns the agents in a group.
+      def group(&blk)
+        begin
+          blk.call(agent_group(target.first).join(' '))
+        rescue RuntimeError => e
+          blk.call(e.message)
+        end
+      end
+
+      def options_spec
+        banner "Lists the agents in a group."
+      end
+    end
+  end
+end

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

@@ -30,7 +30,7 @@ module Smith
               on_work = ->(message, iter) do
 
                 error_handler = -> (e) do
-                  if options[:no_fail]
+                  if options[:ignore_errors]
                     logger.error { "#{e} #{message.strip}" }
                     iter.call
                   else
@@ -90,14 +90,14 @@ module Smith
       def options_spec
         banner "Send a message to a queue. The ACL can also be specified."
 
-        opt :type,    "message type", :type => :string, :default => 'default', :short => :t
-        opt :message, "the message, as json", :type => :string, :short => :m
-        opt :file,    "read messages from the named file", :type => :string, :short => :f
-        opt :number,  "the number of times to send the message", :type => :integer, :default => 1, :short => :n
-        opt :reply,   "set a reply listener.", :short => :r
-        opt :timeout, "timeout when waiting for a reply", :type => :integer, :depends => :reply, :default => Smith.config.smith.timeout
-        opt :dynamic, "send message to a dynamic queue", :type => :boolean, :default => false, :short => :d
-        opt :no_fail, "continue to process input data if there is an error", :type => :boolean, :default => false
+        opt :type,          "message type", :type => :string, :default => 'default', :short => :t
+        opt :message,       "the message, as json", :type => :string, :short => :m
+        opt :file,          "read messages from the named file", :type => :string, :short => :f
+        opt :number,        "the number of times to send the message", :type => :integer, :default => 1, :short => :n
+        opt :reply,         "set a reply listener.", :short => :r
+        opt :timeout,       "timeout when waiting for a reply", :type => :integer, :depends => :reply, :default => Smith.config.smith.timeout
+        opt :dynamic,       "send message to a dynamic queue", :type => :boolean, :default => false, :short => :d
+        opt :ignore_errors, "continue to process input data if there is an error", :type => :boolean, :default => false
 
         conflicts :reply, :number, :file
         conflicts :message, :file

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

@@ -7,24 +7,16 @@ module Smith
         when 0
           responder.succeed("No queue specified. Please specify a queue.")
         else
-          @on_error = proc do |ch,channel_close|
-            case channel_close.reply_code
-            when 404
-              responder.succeed("No such queue: [#{channel_close.reply_code}]: #{channel_close.reply_text}")
-            when 406
-              responder.succeed("Queue not empty: [#{channel_close.reply_code}]: #{channel_close.reply_text}.")
-            else
-              responder.succeed("Unknown error: [#{channel_close.reply_code}]: #{channel_close.reply_text}")
-            end
-          end
-
-          target.each do |queue_name|
+          worker = ->(queue_name, iter) do
             delete_queue(queue_name) do |delete_ok|
-              delete_exchange(queue_name) do |delete_ok|
-                responder.succeed((options[:verbose]) ? delete_ok.message_count.to_s : nil)
-              end
+              delete_exchange(queue_name, &iter)
             end
           end
+
+          # FIXME: Return errors to the caller rather than doing nothing or logging errors
+          done = -> { responder.succeed }
+
+          EM::Iterator.new(target).each(worker, done)
         end
       end
 
@@ -33,14 +25,26 @@ module Smith
       def options_spec
         banner "Display or remove a message from the named queue."
 
-        opt    :force,   "force the removal even if there are messages on the queue", :short => :f
-        opt    :verbose, "print the number of messages deleted", :short => :v
+        opt :force,         "force the removal even if there are messages on the queue", :short => :f
+        opt :ignore_errors, "ignore any errors.", :default => false
+        opt :log_errors,  "print any errors messages.", :default => false
       end
 
-      def delete_exchange(exchange_name, &blk)
-        AMQP::Channel.new(Smith.connection) do |channel,ok|
-          channel.on_error(&@on_error)
-          channel.direct("smith.#{exchange_name}", :passive => true) do |exchange|
+      # Delete an exchange.
+      #
+      # @param name [String] name of the exchange.
+      # @yield calls the block when the exchange has been deleted
+      # @yieldparam [AMQ::Protocol::Channel::Close] the amqp close message
+      # FIXME: remove duplication
+      def delete_exchange(name, &blk)
+        AMQP::Channel.new(Smith.connection) do |channel, ok|
+
+          channel.on_error do |channel, channel_close|
+            handler = (options[:ignore_errors]) ? blk : nil
+            log_error(channel, channel_close, &handler)
+          end
+
+          channel.direct("smith.#{name}", :passive => true) do |exchange|
             exchange_options = (options[:force]) ? {} : {:if_unused => true}
             exchange.delete(exchange_options) do |delete_ok|
               blk.call(delete_ok)
@@ -49,9 +53,19 @@ module Smith
         end
       end
 
+      # Delete an queue.
+      #
+      # @param 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)
-        AMQP::Channel.new(Smith.connection) do |channel,ok|
-          channel.on_error(&@on_error)
+        AMQP::Channel.new(Smith.connection) do |channel, ok|
+          channel.on_error do |channel, channel_close|
+            handler = (options[:ignore_errors]) ? blk : nil
+            log_error(channel, channel_close, &handler)
+          end
+
           channel.queue("smith.#{queue_name}", :passive => true) do |queue|
             queue_options = (options[:force]) ? {} : {:if_unused => true, :if_empty => true}
             queue.delete(queue_options) do |delete_ok|
@@ -61,6 +75,21 @@ module Smith
         end
       end
 
+      # Get's called when there is a channel error.
+      #
+      # @param channel [AMQP::Channel] the channel that errored
+      # @param channel_close [AMQ::Protocol::Channel::Close] the amqp close message
+      #        which contains details of why the channel was claosed.
+      def log_error(channel, channel_close, &blk)
+        base_error_msg = "#{channel_close.reply_code}, #{channel_close.reply_text}."
+        if blk
+          logger.error { "#{base_error_msg}. Ignoring as requested" } if options[:log_errors]
+          blk.call
+        else
+          responder.succeed(base_error_msg)
+        end
+      end
+
       def extract_queue(message)
         match = /.*?'(.*?)'.*$/.match(message) #[1]
         if match && match[1]

data/lib/smith/messaging/factory.rb

@@ -1,16 +1,18 @@
 # -*- encoding: utf-8 -*-
-module Smith
 
+module Smith
   module ACL
     class Factory
       include Logger
 
+      extend Utils
+
       class << self
         def create(type, content=nil, &blk)
           if type.respond_to?(:serialize_to_string)
             return type
           else
-            clazz = (type.is_a?(::Protobuf::Message)) ? type : get_clazz(type)
+            clazz = (type.is_a?(::Protobuf::Message)) ? type : class_from_name(type)
 
             if blk
               clazz.new.tap { |m| blk.call(m) }
@@ -19,10 +21,6 @@ module Smith
             end
           end
         end
-
-        def get_clazz(type)
-          type.to_s.split(/::/).inject(Kernel) { |acc, t| acc.const_get(t) }
-        end
       end
     end
   end

data/lib/smith/utils.rb

@@ -0,0 +1,42 @@
+module Smith
+  module Utils
+
+    # Searches the agent load path for agents. If there are multiple agents
+    # with the same name in different directories the first wins.
+    #
+    # @param name [String] the name of the agent.
+    # @return [Pathname] the path of the agent.
+    def agent_path(name)
+      Smith.agent_paths.each do |path|
+        p = path_from_class(path, name)
+        return p if p.exist?
+      end
+      return nil
+    end
+
+    # Constructs a path from a root and a fully qualified class.
+    #
+    # @param root [Pathname] the root path.
+    # @param clazz [String] the fully qualified class.
+    # @@return [Pathname] the path
+    def path_from_class(root, clazz)
+      parts = clazz.split(/::/).map(&:snake_case)
+      parts[-1] = "#{parts[-1]}.rb"
+      Pathname.new(root).join(*parts)
+    end
+
+    def class_name_from_path(root, path)
+      relative_path = path.relative_path_from(root)
+      parts = relative_path.split
+      parts.map { |p| p.to_s.camel_case }.join('::')
+    end
+
+    # Performs a Kernel.const_get on each element of the class.
+    #
+    # @param name [String]
+    # @return [Class] the agent class
+    def class_from_name(name)
+      name.to_s.split(/::/).inject(Kernel) { |acc, t| acc.const_get(t) }
+    end
+  end
+end

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.6.5.2"
+  VERSION = "0.6.7"
 end

data/lib/smith.rb

@@ -208,6 +208,7 @@ module Smith
   end
 end
 
+require 'smith/utils'
 require 'smith/amqp_errors'
 require 'smith/object_count'
 require 'smith/cache'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.6.5.2
+  version: 0.6.7
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -205,6 +205,7 @@ files:
 - lib/smith/command.rb
 - lib/smith/command_base.rb
 - lib/smith/commands/agency/agents.rb
+- lib/smith/commands/agency/group.rb
 - lib/smith/commands/agency/kill.rb
 - lib/smith/commands/agency/list.rb
 - lib/smith/commands/agency/logger.rb
@@ -253,6 +254,7 @@ files:
 - lib/smith/messaging/util.rb
 - lib/smith/object_count.rb
 - lib/smith/queue_definitions.rb
+- lib/smith/utils.rb
 - lib/smith/version.rb
 homepage: http://github.com/filterfish/smith2
 licenses:
@@ -279,3 +281,4 @@ signing_key:
 specification_version: 4
 summary: Multi-agent framework
 test_files: []
+has_rdoc: false