smith 0.7.7 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc8959d34747160c59a7a05ec820ec2e27c5682
-  data.tar.gz: aac86c9b5eeb61288c2bc9d6233df3d48a364e5d
+  metadata.gz: 672819de30ca51cefb95f9b58f975574bb59b24a
+  data.tar.gz: bbc895d5842922f23e866086c549010bb0ec58f1
 SHA512:
-  metadata.gz: 6a917e6fb2e800c94ddf20db84425c780beac39f1dcd9bd445ff15cbc24cff767625fbef4094154ea53fca11a0a252b2b32d8b3b2ed5be4f0eda4cece7525e1b
-  data.tar.gz: 707db2b0981c8ce05f284c337634fb5abf5ee540352bcfc80b51ba941e3e74867c7ecfcb210f91d154531dadd645fda9604efae94617741bca80c45ae406a8d9
+  metadata.gz: 2c87facd4414ed52f8380f718ec7585567bb850e1f9928cdc8462ace844575eae1610eaf7164d302f22a36cce7819f0912959e505a9a09d9f3ac85a83a65a5ad
+  data.tar.gz: 944f322a51b2b8c90c606238565c513e64503024277a3bcf2d6513cc2869ce039ffda9a4dc65b081579858ac9e1b7cd7437eff13400edbfaac503d7dbbe85977

data/bin/agency

@@ -24,7 +24,11 @@ module Smith
 
       @daemon = Daemon.new(add_vhost(AGENCY_NAME), opts[:daemon], opts[:pid_dir])
 
-      raise AgencyRunning, "The agency is alredy running." if  @daemon.running?
+      if @daemon.running?
+        msg = "An agency with pid: #{@daemon.pid} is already running"
+        logger.fatal { msg}
+        raise AgencyRunning, msg
+      end
 
       @agency = Agency.new
 

data/bin/smithctl

@@ -20,7 +20,9 @@ module Smith
 
     def initialize(options={})
       log_level((options[:log_level_given]) ? options[:log_level].to_sym : :warn)
+
       @timeout = (options[:timeout_given]) ? options[:timeout] : Smith.config.smith.timeout
+      @node = options[:node]
     end
 
     def send_command(command, args, &blk)
@@ -38,7 +40,7 @@ module Smith
     end
 
     def agency_command(command, args, &blk)
-      Messaging::Sender.new(QueueDefinitions::Agency_control) do |sender|
+      Messaging::Sender.new(QueueDefinitions::Agency_control.call(@node)) do |sender|
         sender.on_timeout(@timeout) { |message_id| blk.call("Timeout. Is the agency still running?") }
 
         sender.on_reply(:auto_ack => true) do |reply_payload, r|
@@ -70,16 +72,21 @@ Usage:
     stop_on Command.commands
     opt :log_level, "Set the log level of smithctl only.", :short => :l, :type => :string
     opt :timeout,   "Specify the timeout when communicating with the agency.", :short => :t, :type => :integer, :default => 60
+    opt :node,      "Specify the agency node to connect to.", :type => :string, :short => :none
   end
 
   opts = Trollop::with_standard_exception_handling parser do
     raise Trollop::HelpNeeded if ARGV.size < 1
-    parser.parse(ARGV).tap do
-      unless Command.commands.include?(ARGV.first)
-        puts "Unknown command: #{ARGV.first}"
-        exit 1
-      end
+    parser.parse(ARGV)
+  end
+
+  if ARGV.size > 0
+    if ! Command.commands.include?(ARGV.first)
+      puts "Unknown command: #{ARGV.first}"
+      exit 1
     end
+  else
+    raise Trollop::HelpNeeded
   end
 
   command = ARGV.shift.dup

data/config/smithrc.toml

@@ -21,6 +21,9 @@ kqueue = true
 pid_directory = "~/.smith/run"
 cache_directory = "~/.smith/cache"
 
+# This is the directory that will contain the agent groups
+group_directory = "groups"
+
 # 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.

data/lib/smith/agent_monitoring.rb

@@ -36,7 +36,7 @@ module Smith
               logger.info { "Agent is shutting down: #{agent_process.name}" }
             when 'dead'
               logger.info { "Restarting dead agent: #{agent_process.name}" }
-              Messaging::Sender.new(QueueDefinitions::Agency_control) do |sender|
+              Messaging::Sender.new(QueueDefinitions::Agency_control.call) do |sender|
                 sender.on_reply { |p, r| logger.debug { "Agent restart message acknowledged: #{agent_process.name}" } }
                 sender.publish(ACL::AgencyCommand.new(:command => 'start', :args => [agent_process.name]))
               end

data/lib/smith/application/agency.rb

@@ -18,7 +18,7 @@ module Smith
     end
 
     def setup_queues
-      Messaging::Receiver.new(QueueDefinitions::Agency_control, :auto_ack => false) do |receiver|
+      Messaging::Receiver.new(QueueDefinitions::Agency_control.call, :auto_ack => false) do |receiver|
         receiver.subscribe do |payload, responder|
 
           completion = EM::Completion.new.tap do |c|

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

@@ -12,7 +12,7 @@ module Smith
       include Common
 
       def execute
-        Messaging::Sender.new(QueueDefinitions::Agency_control) do |sender|
+        Messaging::Sender.new(QueueDefinitions::Agency_control.call) do |sender|
           @sender = sender
 
           # agent is a method and as such I cannot pass it into the block.

data/lib/smith/commands/common.rb

@@ -5,7 +5,7 @@ module Smith
 
       # 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
+      # considered. The group directory is recursively searched and added to
       # the ilst of agents for that group if it passed all checks.
       #
       # @param group [String] the group name
@@ -13,19 +13,20 @@ module Smith
       # @return [Array<Class>] the class of each agent in the group
       def agent_group(group)
         agents = Smith.agent_directories.map do |agent_directory|
-          group_directory = agent_directory.join(group)
+          group_directory(agent_directory, group) do |group_directory, groups_prefix|
 
-          if group_directory.exist? && group_directory.directory?
-            agents = Pathname.glob(group_directory.join("*.rb")).map(&:expand_path)
+            if group_directory.exist? && group_directory.directory?
+              agents = Pathname.glob(group_directory.join("*.rb")).map(&:expand_path)
 
-            agents.inject([]) do |acc, agent|
-              if agent.symlink?
-                expanded_agent_path = resolve_agent_path(group_directory, agent)
-                acc << Utils.class_name_from_path(expanded_agent_path, agent_directory)
+              agents.inject([]) do |acc, agent|
+                if agent.symlink?
+                  expanded_agent_path = resolve_agent_path(group_directory, agent)
+                  acc << Utils.class_name_from_path(expanded_agent_path, agent_directory, groups_prefix)
+                end
               end
+            else
+              nil
             end
-          else
-            nil
           end
         end.uniq
 
@@ -38,6 +39,23 @@ module Smith
       def resolve_agent_path(group_directory, agent)
         agent.readlink.expand_path(group_directory)
       end
+
+      # Return the group directory. This checks to see if the directory "groups"
+      # exists and if it does it appends the group name to that otherwise it appends
+      # it to the agent directory.
+      #
+      # @param path [Pathname] the agent directory
+      # @param group [String] the group name
+      #
+      # @return [Pathname] the group directory
+      def group_directory(path, group, &blk)
+        dir = path.join(Smith.config.agency.group_directory)
+        if dir.exist?
+          blk.call(dir.join(group), Smith.config.agency.group_directory)
+        else
+          blk.call(path.join(group), nil)
+        end
+      end
     end
   end
 end

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

@@ -12,7 +12,7 @@ module Smith
       end
 
       def status(&blk)
-        Messaging::Queue.number_of_consumers(QueueDefinitions::Agency_control) do |consumers_count|
+        Messaging::Queue.number_of_consumers(QueueDefinitions::Agency_control.call) do |consumers_count|
           blk.call(consumers_count > 0)
         end
       end
@@ -20,7 +20,7 @@ module Smith
       private
 
       def options_spec
-        banner "Shows the status of the agency."
+        banner "Shows the status of the agency — ONLY WORKS LOCALLY"
       end
     end
   end

data/lib/smith/daemon.rb

@@ -2,6 +2,7 @@
 
 require 'daemons/daemonize'
 require 'daemons/pidfile'
+require 'sys/proctable'
 
 require 'smith/utils'
 
@@ -52,10 +53,16 @@ module Smith
         false
       else
         pid = File.read(pid_files.first).to_i
-        pid > 0 && Daemons::Pid.running?(pid)
+        pid > 0 && Daemons::Pid.running?(pid) && process_names_match?(@name, pid)
       end
     end
 
+    # Return the pid of the process
+    # @return the pid or nil if not set.
+    def pid
+      @pid.pid
+    end
+
     def unlink_pid_file
       p = Pathname.new(@pid.filename)
       if p.exist?
@@ -66,6 +73,18 @@ module Smith
 
     private
 
+    # Checks to see if running process that matches the pid in the pid matches
+    # the name.
+    # @param name [String] the name of the process
+    #
+    # @param pid [Integer] the pid of the process
+    #
+    # @return true if the running process matches the name
+    def process_names_match?(name, pid)
+      proc_table = Sys::ProcTable.ps(pid)
+      proc_table && proc_table.cmdline == name
+    end
+
     # Get the pid directory. This checks for the command line option,
     # then the config and finally use the tmp directory.
     def pid_directory(dir)

data/lib/smith/queue_definitions.rb

@@ -2,7 +2,6 @@
 
 module Smith
   module QueueDefinitions
-    Agency_control = QueueDefinition.new("#{Smith.hostname}.agency.control", :auto_ack => false, :durable => true, :persistent => false, :strict => true)
     Agent_keepalive = QueueDefinition.new("#{Smith.hostname}.agent.keepalive", :auto_delete => false, :durable => true)
     Agent_lifecycle = QueueDefinition.new("#{Smith.hostname}.agent.lifecycle", :auto_delete => false, :durable => true)
 
@@ -10,5 +9,9 @@ module Smith
 
     # Something tells me that I've crossed line with this.
     Agent_control = ->(uuid) { QueueDefinition.new("agent.control.#{uuid}", :durable => false, :auto_delete => true) }
+
+    Agency_control = ->(node=nil) {
+      QueueDefinition.new("#{node || Smith.hostname}.agency.control", :auto_ack => false, :durable => true, :persistent => false, :strict => true)
+    }
   end
 end

data/lib/smith/utils.rb

@@ -27,9 +27,9 @@ module Smith
     module_function :path_from_class
 
     # Returns a Constant based on the pathname.
-    def class_name_from_path(path, root=Pathname.new('.'))
+    def class_name_from_path(path, root=Pathname.new('.'), segment_to_remove=nil)
       relative_path = path.relative_path_from(root)
-      parts = split_path(relative_path.sub_ext(''))
+      parts = split_path(relative_path.sub_ext('')).reject { |p| p == segment_to_remove }
 
       parts.map { |p| p.to_s.camel_case }.join('::')
     end

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.7.7"
+  VERSION = "0.7.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.9
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -198,6 +198,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement