smith 0.6.12 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8f041091471b55b270ce604ec0da4536547c9ae
-  data.tar.gz: 69b0a8bc99dd6d0f27c7e6b7bec3aa4859498eec
+  metadata.gz: 8f1a64e720f6d09734b66a3bf1f39b56ec81aed8
+  data.tar.gz: baafcf0aa8e1f048ea9ef250adc8475d8aa53408
 SHA512:
-  metadata.gz: 7cdd21628c98edff2dc2441b0d9346916b4db23f6a95ddd147c933d98796f695e1000f72aba258cfd8ca357e027bec4512ebb38ebe1b1827a21c550de847730a
-  data.tar.gz: 11ca393aab7304966e121bd4343a476d3fbdd414a9e2f255c4c6af33b7e98f88f19940e2b5966391eed578110de6ac35a490abca2d901003c81e4b235d9e5cf1
+  metadata.gz: afca0d267739a592b25876133fa70fd0f2f03f962e22a3a4af35efa67b28cb9b47068526142e707db7afa7a496734c8f396c8b884ec0d3295c1706a5f7ab7f94
+  data.tar.gz: 0365407a67ab65dc32d41bbf91b316db1dde05851f6191df1a49bfcba611246efc09291f06abba2286c499f60f0807c484226ec5314b6fc315d773b712279a41

data/config/smithrc.toml

@@ -0,0 +1,62 @@
+[smith]
+timeout = 8
+namespace = "smith"
+
+[agent]
+monitor = false
+singleton = true
+metadata = ""
+prefetch = 1
+
+# Specify the VM that an agent should use.
+[vm]
+agent_default = "ruby"
+
+[eventmachine]
+epoll = true
+kqueue = true
+
+[agency]
+# The the agency pid path. This can be overriden on the command line.
+pid_directory = "~/.smith/run"
+cache_directory = "~/.smith/cache"
+
+# It would be better to use inline tables here but there is a bug in
+# toml-rb: https://github.com/emancu/toml-rb/issues/57.
+# TODO: Change these to inline tables when this bug is fixed.
+[amqp.exchange]
+durable = true
+auto_delete = false
+
+[amqp.queue]
+durable = true
+auto_delete = false
+
+[amqp.pop]
+ack = true
+
+[amqp.publish.headers]
+# headers = {}},
+
+[amqp.subscribe]
+ack = true
+
+# Change according to your local broker.
+[amqp.broker]
+host = "localhost"
+port = 5672
+user = "guest"
+password = "guest"
+vhost = "/"
+
+[logging]
+trace = true
+level = "debug"
+
+# Log pattern. Note you need to escape backslashes.
+default_pattern = "%d [%5p] %7l - %34c:%-3L - %m\n"
+default_date_pattern = "%Y/%m/%d %H:%M:%S.%3N"
+
+# This can be either: stderr, stdout, file, rollingfile or syslog
+[logging.appender]
+type      = "stderr"

data/lib/smith.rb

@@ -1,9 +1,4 @@
 # -*- encoding: utf-8 -*-
-
-$LOAD_PATH.delete_if { |p| p.to_s =~ /eventmachine-\d/ }
-
-require 'eventmachine-le'
-
 require 'amqp'
 require 'tmpdir'
 require "socket"
@@ -17,9 +12,10 @@ require 'extlib/string'
 require 'extlib/inflection'
 require 'daemons/pidfile'
 
-require_relative 'smith/config'
-require_relative 'smith/logger'
-require_relative 'smith/acl_compiler'
+require 'smith/config'
+require 'smith/utils'
+require 'smith/logger'
+require 'smith/acl_compiler'
 
 MultiJson.use(:oj)
 
@@ -49,8 +45,8 @@ module Smith
       Pathname.new(__FILE__).dirname.parent.expand_path
     end
 
-    def agent_paths
-      path_to_pathnames(config.agency.agent_path)
+    def agent_directories
+      config.agency.agent_directories
     end
 
     # Convenience method to get the hostname
@@ -58,17 +54,17 @@ module Smith
       Socket.gethostname
     end
 
-    def acl_path
-      path_to_pathnames(config.agency.acl_path)
+    def acl_directories
+      config.agency.acl_directories
     end
 
-    def cache_path
-      Pathname.new(config.agency.cache_path).expand_path
+    def cache_directory
+      Utils.check_and_create_directory(config.agency.cache_directory)
     end
 
     # Return the acl cache path.
-    def acl_cache_path
-      @acl_cache_path = Pathname.new(Smith.config.agency.acl_cache_path).tap do |path|
+    def acl_cache_directory
+      cache_directory.join('acl').tap do |path|
         check_path(path, true)
       end
     end
@@ -94,8 +90,6 @@ module Smith
         EM.kqueue
       end
 
-      EM.set_descriptor_table_size(Smith.config.eventmachine.file_descriptors)
-
       connection_settings = config.amqp.broker.merge(
         :on_tcp_connection_failure => method(:tcp_connection_failure_handler),
         :on_possible_authentication_failure => method(:authentication_failure_handler))
@@ -185,14 +179,6 @@ module Smith
       EM.stop
     end
 
-    def path_to_pathnames(path)
-      path ||= []
-      path.split(':').map do |path|
-        p = Pathname.new(path)
-        ((p.absolute?) ? p : root_path.join(p)).tap { |path| check_path(path) }
-      end
-    end
-
     def broker_identifier(connection)
       broker = connection.broker.properties
       "#{connection.broker_endpoint}, (#{broker['product']}/v#{broker['version']})"
@@ -202,10 +188,10 @@ module Smith
       unless path.exist?
         error_message = "Path does not exist: #{path}"
         if create
-          logger.info { "Path does not exist: #{path}. Creating" }
+          logger.info { "#{error_message}. Creating" }
           path.mkpath
         else
-          logger.warn { "Path does not exist: #{path}" }
+          logger.warn { error_message }
         end
       end
     end
@@ -213,7 +199,6 @@ module Smith
   end
 end
 
-require 'smith/utils'
 require 'smith/self_pipe'
 require 'smith/amqp_errors'
 require 'smith/object_count'

data/lib/smith/acl_compiler.rb

@@ -15,9 +15,9 @@ module Smith
     end
 
     def compile
-      $LOAD_PATH << Smith.acl_cache_path
+      $LOAD_PATH << Smith.acl_cache_directory
 
-      Smith.acl_path.each do |path|
+      Smith.acl_directories.each do |path|
         $LOAD_PATH << path
 
         acl_files = path_glob(path)
@@ -41,7 +41,7 @@ module Smith
 
       unless acls.empty?
         Dir.chdir(path) do
-          cmd = %Q{sh -c 'protoc --ruby_out=#{Smith.acl_cache_path} -I #{path} #{out_of_date_acls.map(&:to_s).join(' ')} 2>&1'}
+          cmd = %Q{sh -c 'protoc --ruby_out=#{Smith.acl_cache_directory} -I #{path} #{out_of_date_acls.map(&:to_s).join(' ')} 2>&1'}
           protoc = IO.popen(cmd)
           output = protoc.read
           protoc.close
@@ -62,7 +62,7 @@ module Smith
 
     # Returns true if the .proto file is newer that the .pb.rb file
     def should_compile?(file)
-      cached_file = Smith.acl_cache_path.join(file.basename).sub_ext(".pb.rb")
+      cached_file = Smith.acl_cache_directory.join(file.basename).sub_ext(".pb.rb")
       if cached_file.exist?
         file.mtime > cached_file.mtime
       else
@@ -109,7 +109,7 @@ module Smith
     end
 
     def acl_compiled_path(path)
-      "#{Smith.acl_cache_path.join(path.basename('.proto'))}.pb.rb"
+      "#{Smith.acl_cache_directory.join(path.basename('.proto'))}.pb.rb"
     end
   end
 end

data/lib/smith/agent.rb

@@ -116,7 +116,7 @@ module Smith
       #             multiple agents are allowed.
       def options(opts)
         opts.each do |k, v|
-          Smith.config.agent.send("#{k}=", v)
+          Smith.config.agent[k] = v
         end
       end
     end

data/lib/smith/agent_cache.rb

@@ -1,5 +1,12 @@
 # -*- encoding: utf-8 -*-
-require 'gdbm'
+
+begin
+  require 'gdbm'
+rescue LoadError => e
+  STDERR.puts "\nYou instance of ruby wasn't compiled with gdbm support.\nSee: https://github.com/filterfish/smith2/wiki/gdbm\n\n"
+  raise
+end
+
 require 'securerandom'
 
 module Smith
@@ -10,7 +17,7 @@ module Smith
     attr_accessor :path
 
     def initialize(opts={})
-      @db = GDBM.new(Smith.cache_path.join('agent_state.gdbm').to_s, 0600, GDBM::WRCREAT | GDBM::SYNC)
+      @db = GDBM.new(Smith.cache_directory.join('agent_state.gdbm').to_s, 0600, GDBM::WRCREAT | GDBM::SYNC)
     end
 
     def create(name)

data/lib/smith/agent_process.rb

@@ -133,7 +133,7 @@ module Smith
     end
 
     def exists?
-      agent_path(name)
+      agent_directories(name)
     end
 
     def to_s
@@ -190,7 +190,7 @@ module Smith
 
         bootstrapper = Pathname.new(__FILE__).dirname.join('bootstrap.rb').expand_path
 
-        binary = Smith.config.ruby[agent_process.name]
+        binary = Smith.config.vm[agent_process.name.snake_case.to_sym] || Smith.config.vm.agent_default
         logger.debug { "Launching #{agent_process.name} with: #{binary}" }
         exec(binary, bootstrapper.to_s, agent_process.name, agent_process.uuid)
       end

data/lib/smith/bootstrap.rb

@@ -40,7 +40,7 @@ module Smith
     end
 
     def load_agent
-      path = agent_path(@agent_name)
+      path = agent_directories(@agent_name)
       logger.debug { "Loading #{@agent_name} from: #{path.dirname}" }
       add_agent_load_path(path)
       load path
@@ -92,6 +92,7 @@ module Smith
 
     private
 
+    # FIXME This really should be using Smith::Daemon
     def write_pid_file
       @pid = Daemons::PidFile.new(Daemons::Pid.dir(:normal, Dir::tmpdir, nil), ".smith-#{@agent_uuid}", true)
       @pid.pid = Process.pid

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

@@ -10,10 +10,10 @@ module Smith
         # FIXME make sure that if the path doesn't exist don't blow up.
         separator = (options[:one_column]) ? "\n" : " "
 
-        Smith.agent_paths.inject([]) do |path_acc,path|
+        Smith.agent_directories.inject([]) do |path_acc, path|
           path_acc.tap do |a|
             if path.exist?
-              a << path.each_child.inject([]) do |agent_acc,p|
+              a << path.each_child.inject([]) do |agent_acc, p|
                 agent_acc.tap do |b|
                   b << Extlib::Inflection.camelize(p.basename('.rb')) if p.file? && p.basename('.rb').to_s.end_with?("agent")
                 end

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

@@ -29,8 +29,8 @@ module Smith
         a = (target.empty?) ? a : a.select {|z| target.detect {|y| z.name == y } }.flatten
         if options[:long_given]
           tabulate(long_format(a), :header => "total #{a.count}")
-        elsif options[:one_column_given]
-          short_format(a, "\n")
+        elsif options[:name_only]
+          name_only(a, "\n")
         else
           short_format(a)
         end
@@ -46,6 +46,11 @@ module Smith
         a.map { |a| [a.uuid] }.join(sep)
       end
 
+
+      def name_only(a, sep=' ')
+        a.map { |a| [a.name] }.join(sep)
+      end
+
       def format_time(t)
         (t) ? t.strftime("%Y/%m/%d %H:%M:%S") : ''
       end
@@ -61,12 +66,12 @@ module Smith
       def options_spec
         banner "List the running agents."
 
-        opt         :long,       "the number of times to send the message", :short => :l
+        opt         :long,       "shows full details of running agents", :short => :l
         opt         :group,      "list only agents in this group", :type => :string, :short => :g
-        opt         :one_column, "the number of times to send the message", :short => :s
-        opt         :all,        "show all agents in all states", :short => :a
+        opt         :name_only,  "list on the agents' name", :short => :n
+        opt         :all,        "list all agents in all states", :short => :a
 
-        conflicts   :one_column, :long
+        conflicts   :name_only, :long
       end
     end
   end

data/lib/smith/commands/common.rb

@@ -3,7 +3,7 @@ module Smith
   module Commands
     module Common
       def agent_group(group)
-        agents = Smith.agent_paths.map do |path|
+        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"))

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

@@ -17,9 +17,9 @@ module Smith
           else
             target.map do |acl|
               if options[:source_given]
-                acls = find_acl(Smith.acl_cache_path, acl, 'pb.rb')
+                acls = find_acl(Smith.acl_cache_directory, acl, 'pb.rb')
               else
-                acls = find_acl(Smith.acl_path, acl, 'proto')
+                acls = find_acl(Smith.acl_directories, acl, 'proto')
               end
 
               case acls.length
@@ -37,7 +37,7 @@ module Smith
             end.join("\n")
           end
         elsif options[:clean_given]
-          Pathname.glob(Smith.acl_cache_path.join("*.pb.rb")).each {|p| p.unlink}
+          Pathname.glob(Smith.acl_cache_directory.join("*.pb.rb")).each {|p| p.unlink}
           ""
         elsif options[:compile_given]
           Pathname.glob(Smith.compile_acls)
@@ -46,7 +46,7 @@ module Smith
           join_string = (options[:long]) ? "\n" : " "
           acl_type_cache.dump_types.keys.map(&:to_s).sort.join(join_string)
 
-          # Pathname.glob(Smith.acl_path.map {|p| "#{p}#{File::SEPARATOR}*"}).map do |p|
+          # Pathname.glob(Smith.acl_directories.map {|p| "#{p}#{File::SEPARATOR}*"}).map do |p|
           #   p.basename(".proto")
           # end.sort.join(join_string)
         end
@@ -54,10 +54,10 @@ module Smith
 
       private
 
-      def find_acl(path, acl, ext)
-        [path].flatten.inject([]) do |a,path|
+      def find_acl(directories, acl, ext)
+        [directories].flatten.inject([]) do |a, directory|
           a.tap do |acc|
-            acl_file = path.join("#{acl.snake_case}.#{ext}")
+            acl_file =  directory.join("#{acl.snake_case}.#{ext}")
             acc << acl_file if acl_file.exist?
           end
         end

data/lib/smith/config.rb

@@ -1,44 +1,22 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
 
+require 'toml'
+require 'fileutils'
 require 'pathname'
+require 'hashie/extensions/coercion'
+require 'hashie/extensions/deep_merge'
+require 'hashie/extensions/method_access'
+require 'hashie/extensions/merge_initializer'
 
 module Smith
 
   class ConfigNotFoundError < IOError; end
+  class MissingConfigItemError < StandardError; end
 
   class Config
 
-    CONFIG_FILENAME = '.smithrc'
-
-    attr_accessor :agent, :agency, :amqp, :logging, :smith, :eventmachine, :smith, :ruby
-
-    to_hash = proc do
-      def to_hash
-        Hash[*members.zip(values).flatten]
-      end
-
-      def merge(h)
-        to_hash.merge(h)
-      end
-
-      def has_key?(k)
-        to_hash.has_key?(k)
-      end
-    end
-
-    Struct.new("Agent", :monitor, :singleton, :metadata, :prefetch, &to_hash)
-    Struct.new("Agency", :cache_path, :agent_path, :acl_path, :acl_cache_path, :pid_dir, &to_hash)
-    Struct.new("AmqpOpts", :durable, :auto_delete, &to_hash)
-    Struct.new("Broker", :host, :port, :user, :password, :vhost, &to_hash)
-    Struct.new("Subscribe", :ack, &to_hash)
-    Struct.new("Pop", :ack, &to_hash)
-    Struct.new("Publish", :headers, &to_hash)
-    Struct.new("Amqp", :broker, :exchange, :queue, :publish, :subscribe, :pop, &to_hash)
-    Struct.new("Appender", :type, :filename, &to_hash)
-    Struct.new("Logging", :trace, :level, :default_pattern, :default_date_pattern, :appender, :filetype, :vhost, &to_hash)
-    Struct.new("Smith", :namespace, :timeout, &to_hash)
-    Struct.new("Eventmachine", :file_descriptors, :epoll, :kqueue, &to_hash)
+    CONFIG_FILENAME = 'smithrc'
 
     def initialize
       load_config
@@ -48,123 +26,151 @@ module Smith
       @config = Config.new
     end
 
-    def to_hash
-      {:agent => @agent, :agency => @agency, :amqp => @amqp, :eventmachine => @eventmachine, :logging => @logging, :smith => @smith, :ruby => @ruby}
-    end
-
     def path
       @config_file
     end
 
+    def method_missing(method, *args)
+      @config.send(method, *args)
+    end
+
     def self.get
       @config ||= Config.new
     end
 
     private
 
-    def set_as_boolean(config, k, default=nil)
-      v = config[k]
-      if v.nil? && default
-        default
-      else
-        v = v.downcase
-        if v == 'true'
-          true
-        elsif v == 'false'
-          false
-        else
-          raise ArgumentError, "#{k} must be true or false, #{v} given."
-        end
-      end
+    class ConfigHash < Hash
+      include Hashie::Extensions::Coercion
+      include Hashie::Extensions::DeepMerge
+      include Hashie::Extensions::MethodReader
+      include Hashie::Extensions::MergeInitializer
+
+      coerce_value Hash, ConfigHash
     end
 
-    def set_as_string(config, k, default=nil)
-      config[k]
+    def load_config
+      @config_file = find_config_file
+      @config = load_tomls(default_config_file, @config_file)
+      coerce_directories!
     end
 
-    def set_as_integer(config, k, default=nil)
-      v = config[k]
-      if v.nil? && default
-        default
-      else
-        begin
-          Integer(v)
-        rescue
-          raise ArgumentError, "#{k} must be an integer. #{v} given."
-        end
+    # Make sure the non-default direcotires are set.
+    # @raise [MissingConfigItemError<Array<String>>] the config items that are not set.
+    def check_directories
+      errors = []
+      errors << "agncy.acl_directories" if @config.agency[:acl_directories].empty?
+      errors << "agncy.agent_directories" if @config.agency[:agent_directories].empty?
+
+      unless errors.empty?
+        raise MissingConfigItemError, errors
       end
     end
 
-    def load_config
-      config = read_config_file(find_config_file)
-
-      amqp_opts = Struct::AmqpOpts.new(true, false)
-      cache_path = Pathname.new(config[:agency_cache_path]).expand_path
-      local_acl_path = Pathname.new(__FILE__).dirname.join('messaging').join('acl').expand_path
-      acl_path = "#{local_acl_path}#{File::PATH_SEPARATOR}#{config[:acl_path]}"
-      broker = Struct::Broker.new(config[:broker_host], set_as_integer(config, :broker_port), config[:broker_user], config[:broker_password], config[:broker_vhost] || '/')
-      appender = Struct::Appender.new(config[:logging_appender_type], config[:logging_appender_filename])
-
-      @agent = Struct::Agent.new(set_as_boolean(config, :agent_monitor), set_as_boolean(config, :agent_singleton), '', set_as_integer(config, :agent_prefetch))
-      @agency = Struct::Agency.new(cache_path, config[:agent_path], acl_path, cache_path.join('acl'), config[:agency_pid_dir])
-      @amqp = Struct::Amqp.new(broker, amqp_opts, amqp_opts, Struct::Publish.new({}), Struct::Subscribe.new(true), Struct::Pop.new(true))
-      @eventmachine = Struct::Eventmachine.new(set_as_integer(config, :file_descriptors, 1024), set_as_boolean(config, :epoll, true), set_as_boolean(config, :kqueue, true))
-      @logging = Struct::Logging.new(config[:logging_trace], config[:logging_level], config[:logging_pattern], config[:logging_date_pattern], appender)
-      @smith = Struct::Smith.new(config[:smith_namespace], set_as_integer(config, :smith_timeout))
-
-      # Set the default ruby runtime. This will use the ruby that is in the path.
-      @ruby = Hash.new(config[:default_vm] || 'ruby')
-
-      config[:agent_vm] && config[:agent_vm].split(/\s+/).each do |vm_spec|
-        agent, vm = vm_spec.split(/:/)
-        @ruby[agent] = vm
+    # Check appropriate env vars and convert the string representation to Pathname
+    # @return [ConfigHash] the config with coerced paths.
+    def coerce_directories!
+      @config.tap do |c|
+        c.agency[:pid_directory] = path_from_env('SMITH_PID_DIRECTORY', c.agency[:pid_directory])
+        c.agency[:cache_directory] = path_from_env('SMITH_CACHE_DIRECTORY', c.agency[:cache_directory])
+        c.agency[:acl_directories] = paths_from_env('SMITH_ACL_DIRECTORIES', c.agency[:acl_directories])
+        c.agency[:agent_directories] = paths_from_env('SMITH_AGENT_DIRECTORIES', c.agency[:agent_directories])
       end
 
-      find_config_file
+      check_directories
+      @config.agency[:acl_directories] = @config.agency[:acl_directories] + [smith_acl_directory]
     end
 
-    # Read the config file
-    def read_config_file(config_file)
-      @config_file = config_file
-      config_file.readlines.inject({}) do |a, line|
-        a.tap do |acc|
-          parameters = line.gsub(/#.*$/, '').strip
-          unless parameters.empty?
-            key, value = parameters.split(/\s+/, 2)
-            a[key.to_sym] = value
-          end
+    # Find the config file. This checks the following paths before raising an
+    # exception:
+    #
+    # * ./.smithrc
+    # * $HOME/.smithrc
+    # * /etc/smithrc
+    # * /etc/smith/smithrc
+    #
+    # @return the config file path
+    def find_config_file
+      if ENV["SMITH_CONFIG"]
+        to_pathname(ENV["SMITH_CONFIG"]).tap do |path|
+          raise ConfigNotFoundError, "Cannot find a config file name: #{path}" unless path.exist?
         end
+      else
+        user = ["./.#{CONFIG_FILENAME}", "#{ENV['HOME']}/.#{CONFIG_FILENAME}"].map { |p| to_pathname(p) }
+        system = ["/etc/#{CONFIG_FILENAME}", "/etc/smith/#{CONFIG_FILENAME}"].map { |p| to_pathname(p) }
+        default = [default_config_file]
+
+        (user + system + default).detect { |path| path.exist? }
       end
     end
 
-    # Find the config file. If it isn't in the CWD recurse up the file path
-    # until it reaches the user home directory. If it gets to the home
-    # directory without finding a config file it will read /etc/smithrc and
-    # then /etc/smith/config. If that fails give up and raise a
-    # ConfigNotFoundError exception.
+    # Convert a string to a path
     #
-    # path:       the pathname to find the config file. Defaults to CWD.
-    # recursive:  rucures up the path. Defaults to true.
-    def find_config_file(path=Pathname.new(".").expand_path, recursive=true)
-      conf = path.join(CONFIG_FILENAME)
-      if conf.exist?
-        return conf
-      else
-        if path == Pathname.new(ENV['HOME'])
-          p = Pathname.new("/etc/smithrc")
-          if p.exist?
-            return p
-          else
-            p = Pathname.new("/etc/smith/config")
-            if p.exist?
-              return p
-            else
-              raise ConfigNotFoundError, "Cannot find a usable config file."
-            end
-          end
-        end
-        find_config_file(path.dirname)
-      end
+    # @param path [String] the string to convert
+    # @return [Pathname]
+    def to_pathname(path)
+      Pathname.new(path).expand_path
+    end
+
+    # Returns a path from the environment variable passed in. If the
+    # environment variable is not set it returns nil.
+    #
+    # @param env_var [String] the name of the environment variable
+    # @param default [String] the value to use if the environment variable is not set
+    # @return [Pathname]
+    def path_from_env(env_var, default)
+      to_pathname(ENV.fetch(env_var, default))
+    end
+
+    # Returns an array of path from the environment variable passed in. If the
+    # environment variable is not set it returns an empty array.
+    #
+    # @param env_var [String] the name of the environment variable
+    # @param default [String] the value to use if the environment variable is not set
+    # @return [Array<Pathnmae>]
+    def paths_from_env(env_var, default)
+      split_paths(ENV.fetch(env_var, default))
+    end
+
+    # Splits a string using PATH_SEPARATOR.
+    #
+    # @param paths to split
+    # @return [Array<Pathnmae>]
+    def split_paths(paths)
+      (paths || '').split(File::PATH_SEPARATOR).map { |p| to_pathname(p) }
+    end
+
+    # @return [Pathnmae]
+    def smith_acl_directory
+      Pathname.new(__FILE__).dirname.join('messaging').join('acl').expand_path
+    end
+
+    # @return [Pathnmae]
+    def default_config_file
+      gem_root.join('config', 'smithrc.toml')
+    end
+
+    # Loads and merges multiple toml files.
+    #
+    # @params [String] the default toml file
+    # @params [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))
+    end
+
+    # Load the toml file specified
+    #
+    # @param [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))
+    end
+
+    # Returns the gem root. We can't use Smith.root_path here as it hasn't
+    # been initialised yet.
+    def gem_root
+      Pathname.new(__FILE__).dirname.parent.parent.expand_path
     end
   end
 end

data/lib/smith/daemon.rb

@@ -3,6 +3,8 @@
 require 'daemons/daemonize'
 require 'daemons/pidfile'
 
+require 'smith/utils'
+
 module Smith
   class Daemon
 
@@ -11,7 +13,7 @@ module Smith
     def initialize(name, daemonise, dir=nil)
       @name = name
       @daemonise = daemonise
-      @pid = Daemons::PidFile.new(pid_dir(dir), @name)
+      @pid = Daemons::PidFile.new(pid_directory(dir), @name)
     end
 
     # Daemonise the process if the daemonise option is true, otherwise do nothing.
@@ -57,7 +59,7 @@ module Smith
     def unlink_pid_file
       p = Pathname.new(@pid.filename)
       if p.exist?
-        logger.verbose { "Removing pid file." }
+        logger.verbose { "Removing pid file: #{p.to_s}" }
         p.unlink
       end
     end
@@ -66,16 +68,8 @@ module Smith
 
     # Get the pid directory. This checks for the command line option,
     # then the config and finally use the tmp directory.
-    def pid_dir(dir)
-      if dir
-        dir
-      else
-        if Smith.config.agency.to_hash.has_key?(:pid_dir)
-          Smith.config.agency.pid_dir
-        else
-          Dir.tmpdir
-        end
-      end
+    def pid_directory(dir)
+      dir || Utils.check_and_create_directory(Smith.config.agency.pid_directory)
     end
   end
 end

data/lib/smith/messaging/receiver.rb

@@ -81,7 +81,10 @@ module Smith
       # Subscribes to a queue and passes the headers and payload into the
       # block. +subscribe+ will automatically acknowledge the message unless
       # the options sets :ack to false.
-      def subscribe(&blk)
+      def subscribe(handler=nil, &blk)
+
+        blk = handler || blk
+
         @queue_completion.completion do |queue|
           @requeue_options_completion.completion do |requeue_options|
             if !queue.subscribed?
@@ -253,6 +256,18 @@ module Smith
       def ack(multiple=false)
         @metadata.ack(multiple)
       end
+      alias :call :ack
+
+      # Make #call invoke ack. This makes the following idiom possible:
+      #
+      # receiver('queue').subscribe do |payload, receiver|
+      #   blah(payload, &receiver)
+      # end
+      #
+      # which will ensure that #ack is called properly.
+      def to_proc
+        proc { |obj| ack(obj) }
+      end
 
       # reject the message. Optionally requeuing it.
       def reject(opts={})

data/lib/smith/utils.rb

@@ -6,8 +6,8 @@ module Smith
     #
     # @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|
+    def agent_directories(name)
+      Smith.agent_directories.each do |path|
         p = path_from_class(path, name)
         return p if p.exist?
       end
@@ -38,5 +38,12 @@ module Smith
     def class_from_name(name)
       name.to_s.split(/::/).inject(Kernel) { |acc, t| acc.const_get(t) }
     end
+
+    def check_and_create_directory(dir)
+      dir.tap do
+        dir.exist? || dir.mkpath
+      end
+    end
+    module_function :check_and_create_directory
   end
 end

data/lib/smith/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.7.1
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -65,19 +65,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: eventmachine-le
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: extlib
   requirement: !ruby/object:Gem::Requirement
@@ -191,33 +191,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: curses
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: curses
+  name: toml-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.3'
 description: Simple multi-agent framework. It uses AMQP for it's messaging layer.
 email: rgh@filterfish.org
 executables:
@@ -230,6 +230,7 @@ files:
 - bin/agency
 - bin/pry-smith
 - bin/smithctl
+- config/smithrc.toml
 - lib/smith.rb
 - lib/smith/acl_compiler.rb
 - lib/smith/acl_parser.rb
@@ -317,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: smith
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Multi-agent framework