smith 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f41bf6879785fbde0dd04453174ad0d967ca749e
-  data.tar.gz: 1e2e293379fc3b2032f33861dc3acf2b4fdb473a
+  metadata.gz: ece67408d7e69a0d140c6c71a829995ca2b3aa37
+  data.tar.gz: f8021c6a1f14de124f37dd5e7615cda0ea355815
 SHA512:
-  metadata.gz: 9e2d8810f747b30c071486ddc77415d141cfe75857e1ca52e9c2292f7f086e2296b3c11e3aff95948804c6c9975d62875d3e212246df4819da63d2ec87b704ba
-  data.tar.gz: 86f591c50199dc00a2bac2a8693b4da2e558f72888db7cf5b203b33fdea2bf9ac532f3b02b5f987bc035eef57967c08869c4b5116bab4c9c7ffc4f7ade8d28ee
+  metadata.gz: c001cd85c559a060809a20db61b62a50d3eeb87829e0f9c9efb1f601f21b1155bf79076964f163aa2f32c07d69628ff3e3ac13e8dbee6e856b5743221872aa6b
+  data.tar.gz: 527a5f514f80b67fddfd2ad9fdf1cd19f5529339e40c0c20b8588f93d8cbe90f170864d3857cb1077ffd244221ce4096662f787697c77cd3bf5e85624931aa31

data/bin/smithctl

@@ -106,7 +106,7 @@ Usage:
     # Setup signal handlers to clean up.
 
     %w{TERM INT QUIT}.each do |sig|
-      signal_handler.install_signal_handler(sig) { @agency.stop }
+      signal_handler.install_signal_handler(sig) { Smith.stop(true) }
     end
 
     control.send_command(command, args) do |result|

data/config/smithrc.toml

@@ -21,6 +21,13 @@ kqueue = true
 pid_directory = "~/.smith/run"
 cache_directory = "~/.smith/cache"
 
+# These directories get added to the Ruby $LOAD_PATH for agents to require code.
+lib_directories = ["lib"]
+# Shared codebase with a basic web app:
+#   lib_directories = ["lib", "app"]
+# Shared codebase with a Rails app:
+#   lib_directories = ["lib", "app/models", "vendor"]
+
 # This is the directory that will contain the agent groups
 group_directory = "groups"
 

data/lib/smith.rb

@@ -45,6 +45,10 @@ module Smith
       Pathname.new(__FILE__).dirname.parent.expand_path
     end
 
+    def lib_directories
+      config.agency.lib_directories
+    end
+
     def agent_directories
       config.agency.agent_directories
     end

data/lib/smith/agent_process.rb

@@ -170,7 +170,7 @@ module Smith
     # Start an agent. This forks and execs the bootstrapper class
     # which then becomes responsible for managing the agent process.
     def self.start_process(agent_process)
-      fork do
+      pid = fork do
         # Detach from the controlling terminal
         unless Process.setsid
           raise 'Cannot detach from controlling terminal'
@@ -195,8 +195,10 @@ module Smith
         exec(binary, bootstrapper.to_s, agent_process.name, agent_process.uuid)
       end
 
+      logger.info { "Detaching: #{agent_process.name}, UUID: #{agent_process.uuid}, PID: #{pid}" }
+
       # We don't want any zombies.
-      Process.detach(agent_process.pid)
+      Process.detach(pid)
     end
 
     # FIXME: This doesn't appear to be being called.

data/lib/smith/bootstrap.rb

@@ -132,24 +132,26 @@ module Smith
       logger.error { "Terminating: #{@agent_name}, UUID: #{@agent_uuid}, PID: #{@pid.pid}." }
     end
 
-    # Add the ../lib to the load path. This assumes the directory
-    # structure is:
+    # Add directories with library code to the load path. This assumes that
+    # the required files reside at the same level as the agent directory.
+    #
+    # Always defaults to `lib` if a `lib_directories` list is not provided
+    # by the configuration.
     #
     # $ROOT_PATH/agents
     #        .../lib
     #
-    # where $ROOT_PATH can be anywhere.
-    #
-    # This needs to be better thought out.
-    # TODO think this through some more.
+    # Where $ROOT_PATH is dependent on the agent directory.
     def add_agent_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 << lib_path
-        else
-          logger.info { "No lib directory for: #{path.parent}." }
+        Smith.lib_directories.each do |lib_dir|
+          lib_path = path.parent.join(lib_dir)
+          if lib_path.exist?
+            logger.info { "Adding #{lib_path} to load path." }
+            $LOAD_PATH << lib_path
+          else
+            logger.info { "#{lib_dir} directory not found in: #{path.parent}." }
+          end
         end
       end
     end

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -104,6 +104,9 @@ dependencies:
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
@@ -111,6 +114,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'