smith 0.5.7 → 0.5.8

data/bin/smithctl

@@ -10,6 +10,8 @@ module Smith
 
     include Logger
 
+    AGENCY_TIMEOUT = 60
+
     def initialize
       log_level(:info)
     end
@@ -59,7 +61,7 @@ module Smith
     def agency_command(command, args, &blk)
       Messaging::Sender.new('agency.control', :auto_delete => true, :durable => false, :persistent => true,  :strict => true).ready do |sender|
 
-        sender.timeout(8) { puts "Timeout. Is the agency still running"; Smith.stop(true) }
+        sender.timeout(AGENCY_TIMEOUT) { puts "Timeout. Is the agency still running"; Smith.stop(true) }
 
         payload = ACL::Payload.new(:agency_command).content(:command => command, :args => args)
 

data/lib/smith.rb

@@ -226,6 +226,7 @@ require_relative 'smith/agent_cache'
 require_relative 'smith/agent_process'
 require_relative 'smith/agent_monitoring'
 require_relative 'smith/command'
+require_relative 'smith/command_base'
 require_relative 'smith/messaging/amqp_options'
 require_relative 'smith/messaging/queue_factory'
 require_relative 'smith/messaging/payload'

data/lib/smith/acl_compiler.rb

@@ -2,6 +2,13 @@
 require 'pp'
 require 'protobuf/compiler/compiler'
 
+# There doesn't seem to be a way to turn of printing. The code is generally run
+# like this: log_writing unless silent but there is no way of setting silent!
+# So monkey patch it.
+class Protobuf::Visitor::Base
+  def log_writing(filename, message="writing..."); end
+end
+
 module Smith
   class ACLCompiler
 
@@ -15,14 +22,16 @@ module Smith
     # Compile any protocol buffer files. This checks the timestamp
     # to see if the file needs compiling.
     def compile
-      logger.debug { "Protocol buffer cache path: #{@cache_path}" }
-      Smith.acl_path.each do |path|
-        results = {}
-        path_glob(path) do |p|
-          if should_compile?(p)
-            logger.info { "Compiling: #{p}" }
-            # TODO put some error handling here.
-            Protobuf::Compiler.compile(p.basename, p.dirname, @cache_path)
+      fork do
+        logger.debug { "Protocol buffer cache path: #{@cache_path}" }
+        Smith.acl_path.each do |path|
+          results = {}
+          path_glob(path) do |p|
+            if should_compile?(p)
+              logger.info { "Compiling: #{p}" }
+              # TODO put some error handling here.
+              Protobuf::Compiler.compile(p.basename, p.dirname, @cache_path)
+            end
           end
         end
       end

data/lib/smith/agent_process.rb

@@ -99,7 +99,7 @@ module Smith
       agent_process.pid = fork do
 
         # Detach from the controlling terminal
-        unless sess_id = Process.setsid
+        unless Process.setsid
           raise 'Cannot detach from controlling terminal'
         end
 

data/lib/smith/command.rb

@@ -24,9 +24,10 @@ module Smith
       clazz = Commands.const_get(Extlib::Inflection.camelize(command)).new
 
       begin
-        options, target = parse_options(clazz, args)
 
-        vars.merge(:options => options, :target => target).each do |k,v|
+        clazz.parse_options(args)
+
+        vars.each do |k,v|
           clazz.instance_eval <<-EOM, __FILE__, __LINE__ + 1
             instance_variable_set(:"@#{k}", v)
             def #{k}=(z); @#{k} = z; end
@@ -37,34 +38,20 @@ module Smith
         clazz.execute
 
       rescue Trollop::CommandlineError => e
-        vars[:responder].value(parser_help(clazz, :prefix => "Error: #{e.message}.\n"))
+        vars[:responder].value(clazz.format_help(:prefix => "Error: #{e.message}.\n"))
       rescue Trollop::HelpNeeded
-        vars[:responder].value(parser_help(clazz))
+        vars[:responder].value(clazz.format_help)
       end
     end
 
-    # Banner callback. This is called when the parser is called.
-    # I'm sure there is a better way of doing this.
-    def self.banner(command)
-      "smithctl #{command} OPTIONS [Agents]"
-    end
-
-    private
-
     # Determine whether the command is an agency or smithctl command and load
     # accordingly.
-    def self.load_command(cmd)
-      require command_path(cmd)
-    end
-
-    # Check to see if the command is an agency or smithctl command.
-    def self.agency?
-      Smith.constants.include?(:Agency)
+    def self.load_command(command)
+      require command_path(command)
     end
 
-    # Return the full path of the ruby class.
-    def self.command_path(command)
-      send("#{command_type(command)}_path").join(command)
+    def self.instantiate(command)
+      Commands.const_get(Extlib::Inflection.camelize(command)).new
     end
 
     # What type of command is it?
@@ -79,6 +66,18 @@ module Smith
       end
     end
 
+    private
+
+    # Check to see if the command is an agency or smithctl command.
+    def self.agency?
+      Smith.constants.include?(:Agency)
+    end
+
+    # Return the full path of the ruby class.
+    def self.command_path(command)
+      send("#{command_type(command)}_path").join(command)
+    end
+
     # Is the command an agency command?
     def self.agency_command?(cmd)
      agency_path.join(cmd).sub_ext('.rb').exist?
@@ -103,26 +102,5 @@ module Smith
     def self.base_path
       @c64a6f4f ||= Smith.root_path.join('lib').join("smith").join('commands')
     end
-
-    # Uses the options_parser method in the specific command class to procees
-    # any options associated with that command. If no options_parser method
-    # exits then an empty Array is returned. Any members of the args array
-    # that are not parsed by the options parser are return as the target, i.e.
-    # the agent(s) that the command is to operate on.
-    def self.parse_options(clazz, args)
-      if clazz.respond_to?(:options_parser)
-        [clazz.options_parser.parse(args), args]
-      else
-        [{}, args]
-      end
-    end
-
-    def self.parser_help(clazz, opts={})
-      StringIO.new.tap do |help|
-        help.puts opts[:prefix] if opts[:prefix]
-        clazz.options_parser.educate(help)
-        help.rewind
-      end.read
-    end
   end
 end

data/lib/smith/command_base.rb

@@ -0,0 +1,64 @@
+# -*- encoding: utf-8 -*-
+
+require 'trollop'
+
+module Smith
+  class CommandBase
+    class UnkownCommandError < RuntimeError; end
+
+    attr_reader :options, :target
+
+    include Logger
+
+    def initialize
+      @parser = Trollop::Parser.new
+      options_spec
+    end
+
+    def parse_options(args)
+      @options = @parser.parse(args)
+      @target = args
+    end
+
+    def format_help(opts={})
+      StringIO.new.tap do |help|
+        help.puts opts[:prefix] if opts[:prefix]
+        @parser.educate(help)
+        help.rewind
+      end.read
+    end
+
+    def banner(banner=nil, opts={})
+      if banner.nil?
+        @banner
+      else
+        @banner = banner
+        @parser.banner((opts[:no_template]) ? banner : banner_template(banner))
+      end
+    end
+
+    protected
+
+    def opt(*opt_spec)
+      @parser.opt(*opt_spec)
+    end
+
+    def options_spec
+      banner "You should really set a proper banner notice for this command."
+    end
+
+    private
+
+    def banner_template(text)
+      return <<-EOS
+
+  #{text}
+
+  Usage:
+    smithctl #{self.class.to_s.split('::').last.downcase} OPTIONS
+
+OPTIONS are:
+      EOS
+    end
+  end
+end

data/lib/smith/commands/agency/{version.rb → agency_version.rb}

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 module Smith
   module Commands
-    class Version < Command
+    class AgencyVersion < CommandBase
       def execute
         version_file = Smith.root_path.join('VERSION')
 
@@ -12,11 +12,12 @@ module Smith
         end
       end
 
-      def options_parser
-        Trollop::Parser.new do
-          banner  Command.banner('version')
-          opt     :git, "run git describe, assuming git is installed", :short => :g
-        end
+      private
+
+      def options_spec
+        banner "Display the agency version."
+
+        opt    :git, "run git describe, assuming git is installed", :short => :g
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 module Smith
   module Commands
-    class Agents < Command
+    class Agents < CommandBase
       def execute
         responder.value do
           # FIXME make sure that if the path doesn't exist don't blow up.
@@ -23,6 +23,12 @@ module Smith
           (agent_paths.empty?) ? "" : agent_paths.sort.join(" ")
         end
       end
+
+      private
+
+      def options_spec
+        banner "List all available agents."
+      end
     end
   end
 end

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

@@ -1,13 +1,19 @@
 # -*- encoding: utf-8 -*-
 module Smith
   module Commands
-    class Kill < Command
+    class Kill < CommandBase
       def execute
         target.each do |agent_name|
           agents[agent_name].kill
         end
         responder.value
       end
+
+      private
+
+      def options_spec
+        banner "Kill an agent/agents."
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 module Smith
   module Commands
-    class List < Command
+    class List < CommandBase
       def execute
         responder.value do
           if options[:all]
@@ -29,14 +29,6 @@ module Smith
         end
       end
 
-      def options_parser
-        Trollop::Parser.new do
-          banner  Command.banner('list')
-          opt     :long,                "the number of times to send the message", :short => :l
-          opt     :all,                 "show all agents in all states", :short => :a
-        end
-      end
-
       private
 
       def long_format(agents)
@@ -60,6 +52,13 @@ module Smith
           acc << sprintf("#{col_widths.inject("") { |spec,w| spec << "%-#{w + 2}s"}}\n", *e)
         end
       end
+
+      def options_spec
+        banner "List the running agents."
+
+        opt    :long, "the number of times to send the message", :short => :l
+        opt    :all,  "show all agents in all states", :short => :a
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 module Smith
   module Commands
-    class Logger < Command
+    class Logger < CommandBase
       def execute
         responder.value do
           if options[:level].nil?
@@ -36,14 +36,6 @@ module Smith
         end
       end
 
-      def options_parser
-        Trollop::Parser.new do
-          banner  Command.banner('logger')
-          opt     :level,               "the log level you want to set", :type => :string, :short => :l
-          opt     :trace,               "turn trace on or off", :type => :boolean, :short => :t
-        end
-      end
-
       private
 
       def send_agent_control_message(agent, message)
@@ -51,6 +43,13 @@ module Smith
           sender.publish(ACL::Payload.new(:agent_command).content(message))
         end
       end
+
+      def options_spec
+        banner "Change the log and trace level of the agents or the agency."
+
+        opt    :level, "the log level you want to set", :type => :string, :short => :l
+        opt    :trace, "turn trace on or off", :type => :boolean, :short => :t
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 module Smith
   module Commands
-    class Metadata < Command
+    class Metadata < CommandBase
       def execute
         responder.value do
           target.inject([]) do |acc,agent_name|
@@ -9,6 +9,12 @@ module Smith
           end.join("\n")
         end
       end
+
+      private
+
+      def options_spec
+        banner "Display an agent/agents metadata."
+      end
     end
   end
 end

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

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-require_relative 'common'
+require_relative '../common'
 
 # This is a meta-command. It doesn't implement anything it simply sends
 # messages to one or many existing commands to do the work.
 
 module Smith
   module Commands
-    class Restart < Command
+    class Restart < CommandBase
 
       include Common
 
@@ -26,13 +26,12 @@ module Smith
         end
       end
 
+      private
 
-      def options_parser
-        command = self.class.to_s.split(/::/).last.downcase
-        Trollop::Parser.new do
-          banner  Command.banner(command)
-          opt     :group,     "Start everything in the specified group", :type => :string, :short => :g
-        end
+      def options_spec
+        banner "Restart an agent/agents."
+
+        opt    :group,     "Start everything in the specified group", :type => :string, :short => :g
       end
     end
   end

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

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 
-require_relative 'common'
+require_relative '../common'
 
 module Smith
   module Commands
-    class Start < Command
+    class Start < CommandBase
 
       include Common
 
@@ -49,13 +49,13 @@ module Smith
         end
       end
 
-      def options_parser
-        command = self.class.to_s.split(/::/).last.downcase
-        Trollop::Parser.new do
-          banner  Command.banner(command)
-          opt     :kill,     "Reset the state of the agent before starting", :short => :k
-          opt     :group,     "Start everything in the specified group", :type => :string, :short => :g
-        end
+      private
+
+      def options_spec
+        banner "Start an agent/agents or group of agents."
+
+        opt    :kill,  "Reset the state of the agent before starting", :short => :k
+        opt    :group, "Start everything in the specified group", :type => :string, :short => :g
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 module Smith
   module Commands
-    class State < Command
+    class State < CommandBase
       def execute
         responder.value do
           target.inject([]) do |acc,agent_name|
@@ -9,6 +9,12 @@ module Smith
           end.join("\n")
         end
       end
+
+      private
+
+      def options_spec
+        banner "Show the state of an agent/agents - deprecated."
+      end
     end
   end
 end

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

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 
-require_relative 'common'
+require_relative '../common'
 
 module Smith
   module Commands
-    class Stop < Command
+    class Stop < CommandBase
 
       include Common
 
@@ -58,12 +58,12 @@ module Smith
         end
       end
 
-      def options_parser
-        command = self.class.to_s.split(/::/).last.downcase
-        Trollop::Parser.new do
-          banner  Command.banner(command)
-          opt     :group,     "Stop everything in the specified group", :type => :string, :short => :g
-        end
+      private
+
+      def options_spec
+        banner "Stop an agent/agents."
+
+        opt    :group, "Stop everything in the specified group", :type => :string, :short => :g
       end
     end
   end

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

@@ -0,0 +1,61 @@
+# -*- encoding: utf-8 -*-
+
+require 'extlib/string'
+
+module Smith
+  module Commands
+    class Acls < CommandBase
+      def execute
+        responder.value do
+          if options[:show]
+            if target.empty?
+              "You must supply an ACL file name."
+            else
+              target.map do |acl|
+                acls = Smith.acl_path.inject([]) do |a,path|
+                  a.tap do |acc|
+                    acl_file = path.join("#{acl.snake_case}.proto")
+                    if acl_file.exist?
+                      acc << acl_file
+                    end
+                  end
+                end
+
+                case acls.length
+                when 0
+                  "ACL file does not exist."
+                when 1
+                  if target.length == 1
+                    "\n#{indent_acl(acls.first.read)}\n"
+                  else
+                    "\n#{acl} ->\n#{indent_acl(acls.first.read)}"
+                  end
+                else
+                  "There are multiple ACLs with the name: #{target}"
+                end
+              end.join("\n")
+            end
+          else
+            join_string = (options[:long]) ? "\n" : " "
+            Pathname.glob(Smith.acl_path.map {|p| "#{p}#{File::SEPARATOR}*"}).map do |p|
+              p.basename(".proto")
+            end.sort.join(join_string)
+          end
+        end
+      end
+
+      private
+
+      def indent_acl(acl)
+        acl.split("\n").map { |l| l.sub(/^/, "  ") }.join("\n")
+      end
+
+      def options_spec
+        banner "List and display acl files."
+
+        opt    :long, "format the listing", :short => :l
+        opt    :show, "show the contents of the acl file", :short => :s
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ require 'multi_json'
 
 module Smith
   module Commands
-    class Cat < Command
+    class Cat < CommandBase
       def execute
         if target.size == 0
           responder.value("No queue specified. Please specify a queue.")
@@ -45,26 +45,25 @@ module Smith
         end
       end
 
-      def options_parser
-        Trollop::Parser.new do
-          banner  Command.banner('cat')
-          opt :type,     "message type", :type => :string, :default => 'default', :short => :t
-          opt :json,     "supply the json representation with this flag", :type => :string, :conflicts => :file, :short => :j
-          opt :file,     "read the data from the named file", :type => :string, :conflicts => :json, :short => :f
-          opt :number,   "the number of times to send the message", :type => :integer, :default => 1, :short => :n
-          opt :dynamic,  "send message to a dynamic queue", :type => :boolean, :default => false, :short => :d
-        end
-      end
-
       private
 
       def json_to_payload(data, type)
         Smith::ACL::Payload.new(type.to_sym).content do |m|
-          MultiJson.decode(data, :symbolize_keys => true).each do |k,v|
+          MultiJson.load(data, :symbolize_keys => true).each do |k,v|
             m.send("#{k}=".to_sym, v)
           end
         end
       end
+
+      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 :json,    "supply the json representation with this flag", :type => :string, :conflicts => :file, :short => :j
+        opt :file,    "read the data from the named file", :type => :string, :conflicts => :json, :short => :f
+        opt :number,  "the number of times to send the message", :type => :integer, :default => 1, :short => :n
+        opt :dynamic, "send message to a dynamic queue", :type => :boolean, :default => false, :short => :d
+      end
     end
   end
 end

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

@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+module Smith
+  module Commands
+    class Commands < CommandBase
+      def execute
+        commands = (target.empty?) ? list_commands('agency') + list_commands('smithctl') : target
+        responder.value(format(commands))
+      end
+
+      def list_commands(type)
+        list_command_files(type).map {|command| to_command_name(command) }
+      end
+
+      def format(commands)
+        if options[:long]
+          c = instantiate_commands(commands)
+          if options[:type]
+            c.map { |k,v| sprintf("%1$*4$s - %2$s [%3$s]", k, remove_new_lines(v), Command.command_type(k), -(max_length(c) + 1)) }.join("\n")
+          else
+            c.map { |k,v| sprintf("%1$*3$s - %2$s", k, remove_new_lines(v), -(max_length(c) + 1)) }.join("\n")
+          end
+        else
+          if options[:type]
+            instantiate_commands(commands).map { |k,v| sprintf("%s - %s", k, Command.command_type(k)) }
+          else
+            commands.sort.join("\n")
+          end
+        end
+      end
+
+      private
+
+      def list_command_files(type)
+        Pathname.glob(Command.base_path.join(type).join("**/*.rb"))
+      end
+
+      def to_command_name(path)
+        path.basename(".rb").to_s
+      end
+
+      def instantiate_commands(commands)
+        commands.sort.inject({}) do |a, command|
+          a.tap do |acc|
+            Command.load_command(command)
+            clazz = Command.instantiate(command)
+            acc[command] = clazz.banner
+          end
+        end
+      end
+
+      def remove_new_lines(s)
+        s.split("\n").map(&:strip).select {|a| !a.empty? }.join(" ")
+      end
+
+      def options_spec
+        banner "List available commands.\n\n  If a command/commands is given only that command will be shown."
+
+        opt    :long, "include the short usage message", :short => :l
+        opt    :type, "show whether the command is a smithctl command or an agency command ", :short => :t
+      end
+
+      def max_length(banners_hash)
+        banners_hash.keys.map(&:length).max
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ require 'yajl'
 
 module Smith
   module Commands
-    class Pop < Command
+    class Pop < CommandBase
       def execute
         case target.size
         when 0
@@ -50,16 +50,6 @@ module Smith
         end
       end
 
-      def options_parser
-        Trollop::Parser.new do
-          banner  Command.banner('pop-queue')
-          opt     :print,   "print the message", :short => :p
-          opt     :json ,   "return the JSON representation of the message", :short => :j
-          opt     :remove,  "remove the message from the queue", :short => :r
-          opt     :number,  "the number of messages to remove", :default =>1,  :short => :n
-        end
-      end
-
       private
 
       def print_message(message)
@@ -71,6 +61,15 @@ module Smith
           end
         end
       end
+
+      def options_spec
+        banner "Pop messages off the named queue."
+
+        opt    :print,  "print the message", :short => :p
+        opt    :json ,  "return the JSON representation of the message", :short => :j
+        opt    :remove, "remove the message from the queue", :short => :r
+        opt    :number, "the number of messages to remove", :default =>1,  :short => :n
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 module Smith
   module Commands
-    class Rm < Command
+    class Rm < CommandBase
       def execute
         case target.size
         when 0
@@ -18,18 +18,13 @@ module Smith
         end
       end
 
-      def options_parser
-        Trollop::Parser.new do
-          banner  Command.banner('remove-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
-        end
-      end
+      private
 
-      def format_output(message_count)
-        if options[:verbose]
-          responder.value("Queue deleted. #{message_count}s messages deleted.")
-        end
+      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
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 module Smith
   module Commands
-    class SmithctlVersion < Command
+    class SmithctlVersion < CommandBase
       def execute
         version_file = Smith.root_path.join('VERSION')
 
@@ -12,11 +12,10 @@ module Smith
         end
       end
 
-      def options_parser
-        Trollop::Parser.new do
-          banner  Command.banner('smithctl_version')
-          opt     :git, "run git describe, assuming git is installed", :short => :g
-        end
+      def options_spec
+        banner "Displays the smithctl version."
+
+        opt    :git, "run git describe, assuming git is installed", :short => :g
       end
     end
   end

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

@@ -4,7 +4,7 @@ require 'curses'
 
 module Smith
   module Commands
-    class Top < Command
+    class Top < CommandBase
       def execute
         Curses.init_screen()
         win = Curses::Window.new(Curses.lines, Curses.cols, 0, 0)
@@ -30,6 +30,7 @@ module Smith
       end
 
       private
+
       def format_queues(queue_stats)
         queue_stats.inject([]) do |a,queue_stat|
           a.tap do |acc|
@@ -37,6 +38,10 @@ module Smith
           end
         end.join(";")
       end
+
+      def options_spec
+        banner "Show information about running agents."
+      end
     end
   end
 end

data/lib/smith/logger.rb

@@ -17,13 +17,14 @@ module Smith
     module Methods
       protected
 
+      @@__name = 'smith'
       @@__pattern = Smith::Config.get.logging.default_pattern
       @@__date_pattern = Smith::Config.get.logging.default_date_pattern
       @@__level = Smith::Config.get.logging.level
       @@__trace = Smith::Config.get.logging.trace
-      @@__appender_type = Logging::Appenders.const_get(Smith::Config.get.logging.appender.to_s.to_sym)
-      @@__appender_filename = Smith::Config.get.logging.filename
-      @@__name = 'smith'
+      @@__appender = Smith::Config.get.logging.appender._data.tap do |appender|
+        appender[:type] = Logging::Appenders.const_get(Extlib::Inflection.camelize(appender.delete(:type)))
+      end
 
       def log_level(level=nil)
         if level
@@ -40,8 +41,7 @@ module Smith
       def log_appender(opts={})
         if @appender.nil? || !opts.empty?
           @@__name = opts[:name] if opts[:name]
-          @@__appender_type = opts[:class] if opts[:class]
-          @appender = @@__appender_type.send(:new, @@__name, :filename => @@__appender_filename, :layout => log_pattern)
+          @appender = @@__appender[:type].send(:new, @@__name, @@__appender.merge(:layout => log_pattern))
           @reload = true
         end
         Logging.logger.root.appenders = @appender

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &19248700 !ruby/object:Gem::Requirement
+  requirement: &14081940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.5.pre
   type: :runtime
   prerelease: false
-  version_requirements: *19248700
+  version_requirements: *14081940
 - !ruby/object:Gem::Dependency
   name: dm-core
-  requirement: &19248220 !ruby/object:Gem::Requirement
+  requirement: &14081460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *19248220
+  version_requirements: *14081460
 - !ruby/object:Gem::Dependency
   name: dm-observer
-  requirement: &19247760 !ruby/object:Gem::Requirement
+  requirement: &14081000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *19247760
+  version_requirements: *14081000
 - !ruby/object:Gem::Dependency
   name: dm-yaml-adapter
-  requirement: &19247300 !ruby/object:Gem::Requirement
+  requirement: &14080540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *19247300
+  version_requirements: *14080540
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &19246840 !ruby/object:Gem::Requirement
+  requirement: &13201300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *19246840
+  version_requirements: *13201300
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &19742440 !ruby/object:Gem::Requirement
+  requirement: &13848600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *19742440
+  version_requirements: *13848600
 - !ruby/object:Gem::Dependency
   name: extlib
-  requirement: &19741980 !ruby/object:Gem::Requirement
+  requirement: &13848140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.15
   type: :runtime
   prerelease: false
-  version_requirements: *19741980
+  version_requirements: *13848140
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &19741520 !ruby/object:Gem::Requirement
+  requirement: &13847680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *19741520
+  version_requirements: *13847680
 - !ruby/object:Gem::Dependency
   name: optimism
-  requirement: &19741060 !ruby/object:Gem::Requirement
+  requirement: &13847220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *19741060
+  version_requirements: *13847220
 - !ruby/object:Gem::Dependency
   name: ruby_protobuf
-  requirement: &19740600 !ruby/object:Gem::Requirement
+  requirement: &13846760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 0.4.11
   type: :runtime
   prerelease: false
-  version_requirements: *19740600
+  version_requirements: *13846760
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &19740140 !ruby/object:Gem::Requirement
+  requirement: &13846300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,10 +131,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *19740140
+  version_requirements: *13846300
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &19739680 !ruby/object:Gem::Requirement
+  requirement: &13845840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *19739680
+  version_requirements: *13845840
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &19739220 !ruby/object:Gem::Requirement
+  requirement: &13845380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *19739220
+  version_requirements: *13845380
 description: Simple multi-agent framework. It uses AMQP for it's messaging layer.
 email: rgh@filterfish.org
 executables:
@@ -164,35 +164,33 @@ extra_rdoc_files: []
 files:
 - bin/agency
 - bin/smithctl
-- lib/smith/acl_compiler.rb
 - lib/smith/agent.rb
 - lib/smith/agent_cache.rb
 - lib/smith/agent_config.rb
 - lib/smith/agent_monitoring.rb
-- lib/smith/agent_process.rb
 - lib/smith/application/agency.rb
 - lib/smith/bootstrap.rb
 - lib/smith/cache.rb
-- lib/smith/command.rb
+- lib/smith/commands/agency/agency_version.rb
 - lib/smith/commands/agency/agents.rb
-- lib/smith/commands/agency/common.rb
 - lib/smith/commands/agency/kill.rb
 - lib/smith/commands/agency/list.rb
+- lib/smith/commands/agency/logger.rb
 - lib/smith/commands/agency/metadata.rb
 - lib/smith/commands/agency/restart.rb
 - lib/smith/commands/agency/start.rb
 - lib/smith/commands/agency/state.rb
 - lib/smith/commands/agency/stop.rb
-- lib/smith/commands/agency/version.rb
-- lib/smith/commands/agency/logger.rb
+- lib/smith/commands/smithctl/acls.rb
 - lib/smith/commands/smithctl/cat.rb
+- lib/smith/commands/smithctl/commands.rb
 - lib/smith/commands/smithctl/pop.rb
 - lib/smith/commands/smithctl/rm.rb
 - lib/smith/commands/smithctl/smithctl_version.rb
 - lib/smith/commands/smithctl/top.rb
 - lib/smith/commands/template.rb
+- lib/smith/commands/common.rb
 - lib/smith/config.rb
-- lib/smith/logger.rb
 - lib/smith/messaging/acl/agency_command.proto
 - lib/smith/messaging/acl/agent_command.proto
 - lib/smith/messaging/acl/agent_config_request.proto
@@ -210,6 +208,11 @@ files:
 - lib/smith/messaging/responder.rb
 - lib/smith/messaging/sender.rb
 - lib/smith/messaging/receiver.rb
+- lib/smith/acl_compiler.rb
+- lib/smith/agent_process.rb
+- lib/smith/command.rb
+- lib/smith/command_base.rb
+- lib/smith/logger.rb
 - lib/smith.rb
 homepage: http://github.com/filterfish/smith2/
 licenses: []