smith 0.6.2 → 0.6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9812b89c515ed71a2291f67b53a4c40c519f2afa
-  data.tar.gz: 76b9705aa9b00595d735750b240a594f7bedf79d
+  metadata.gz: 647de83af2459d5c1d36106d946a285d0036a40e
+  data.tar.gz: 23e2377ae34c9dac6260f6d5eae59649d3b32544
 SHA512:
-  metadata.gz: efb0730d32b544d91a744fa37f714222d073f19bb94b5474f5e21f8399f5a88ee2e5ba6d8d422691a5a6c1db9d2889ef0674bd48128b683d27eaf2f63f2cad88
-  data.tar.gz: 347b181a6d0980241797c67501ae4c42aa2a479f51577a5e41d5786de4099f6771a44bd695a7972acdca3c6fcfc45b96cf05376dcc0cbe2f7891faf6d105326a
+  metadata.gz: 8190b27278ba8689cfddac882408ec75343237a1b2f8e95fa1c97fb67ad93bc06b1c590f67a761b419e802495a8aa53ac0c6110744fa713df3895946588e7bb7
+  data.tar.gz: b36c38be47ed043cfdeab3b0f63ada70f7aea6ec886ed8815d215b1188f2ca522398abe2656b61fd2953932b91c48b66eca5e3d145beac51991118c726a77a02

data/lib/smith/agent_cache.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'tdb'
+require 'gdbm'
 require 'securerandom'
 
 module Smith
@@ -10,8 +10,7 @@ module Smith
     attr_accessor :path
 
     def initialize(opts={})
-      # @db = LevelDB::DB.make(Smith.cache_path.join('agent_state').to_s, :error_if_exists => false, :create_if_missing => true)
-      @db = TDB.new(Smith.cache_path.join('agent_state.tdb').to_s)
+      @db = GDBM.new(Smith.cache_path.join('agent_state.gdbm').to_s, 0600, GDBM::WRCREAT | GDBM::SYNC)
     end
 
     def create(name)

data/lib/smith/config.rb

@@ -139,8 +139,9 @@ module Smith
 
     # 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 rais a ConfigNotFoundError
-    # exception.
+    # 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.
     #
     # path:       the pathname to find the config file. Defaults to CWD.
     # recursive:  rucures up the path. Defaults to true.
@@ -149,8 +150,18 @@ module Smith
       if conf.exist?
         return conf
       else
-        if path == Pathname.new(ENV['HOME']) || path.root?
-          raise ConfigNotFoundError, "Cannot find a usable config file."
+        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

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.6.2"
+  VERSION = "0.6.3.1"
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3.1
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: extlib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.15
+        version: 0.9.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.15
+        version: 0.9.16
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -112,72 +112,72 @@ dependencies:
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: tdb
+  name: gdbm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: murmurhash3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.4
 description: Simple multi-agent framework. It uses AMQP for it's messaging layer.
 email: rgh@filterfish.org
 executables:
@@ -188,72 +188,72 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/agency
-- bin/smithctl
 - bin/pry-smith
+- bin/smithctl
+- lib/smith.rb
+- lib/smith/acl_compiler.rb
+- lib/smith/acl_parser.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/amqp_errors.rb
 - lib/smith/application/agency.rb
+- lib/smith/bootstrap.rb
+- lib/smith/cache.rb
+- lib/smith/command.rb
+- lib/smith/command_base.rb
 - lib/smith/commands/agency/agents.rb
-- lib/smith/commands/agency/metadata.rb
-- lib/smith/commands/agency/version.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/object_count.rb
 - lib/smith/commands/agency/restart.rb
 - lib/smith/commands/agency/start.rb
 - lib/smith/commands/agency/stop.rb
-- lib/smith/commands/agency/logger.rb
-- lib/smith/commands/agency/list.rb
-- lib/smith/commands/smithctl/commands.rb
-- lib/smith/commands/smithctl/pop.rb
-- lib/smith/commands/smithctl/rm.rb
-- lib/smith/commands/smithctl/subscribe.rb
+- lib/smith/commands/agency/version.rb
+- lib/smith/commands/common.rb
 - lib/smith/commands/smithctl/acl.rb
+- lib/smith/commands/smithctl/commands.rb
 - lib/smith/commands/smithctl/dump.rb
+- lib/smith/commands/smithctl/firehose.rb
+- lib/smith/commands/smithctl/pop.rb
 - lib/smith/commands/smithctl/push.rb
+- lib/smith/commands/smithctl/rm.rb
 - lib/smith/commands/smithctl/status.rb
+- lib/smith/commands/smithctl/subscribe.rb
 - lib/smith/commands/smithctl/top.rb
-- lib/smith/commands/smithctl/firehose.rb
 - lib/smith/commands/template.rb
-- lib/smith/commands/common.rb
+- lib/smith/config.rb
+- lib/smith/daemon.rb
+- lib/smith/exceptions.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
 - lib/smith/messaging/acl/agent_config_update.proto
-- lib/smith/messaging/acl/search.proto
-- lib/smith/messaging/acl/agency_command.proto
 - lib/smith/messaging/acl/agent_keepalive.proto
 - lib/smith/messaging/acl/agent_lifecycle.proto
 - lib/smith/messaging/acl/agent_stats.proto
 - lib/smith/messaging/acl/default.rb
-- lib/smith/messaging/responder.rb
+- lib/smith/messaging/acl/search.proto
+- lib/smith/messaging/acl_type_cache.rb
 - lib/smith/messaging/amqp_options.rb
-- lib/smith/messaging/message_counter.rb
-- lib/smith/messaging/queue_factory.rb
 - lib/smith/messaging/factory.rb
+- lib/smith/messaging/message_counter.rb
 - lib/smith/messaging/queue.rb
-- lib/smith/messaging/requeue.rb
-- lib/smith/messaging/util.rb
-- lib/smith/messaging/acl_type_cache.rb
 - lib/smith/messaging/queue_definition.rb
+- lib/smith/messaging/queue_factory.rb
 - lib/smith/messaging/receiver.rb
+- lib/smith/messaging/requeue.rb
+- lib/smith/messaging/responder.rb
 - lib/smith/messaging/sender.rb
-- lib/smith/agent_config.rb
+- lib/smith/messaging/util.rb
 - lib/smith/object_count.rb
-- lib/smith/amqp_errors.rb
-- lib/smith/command_base.rb
-- lib/smith/bootstrap.rb
-- lib/smith/config.rb
 - lib/smith/queue_definitions.rb
-- lib/smith/acl_parser.rb
-- lib/smith/agent.rb
-- lib/smith/agent_cache.rb
-- lib/smith/agent_monitoring.rb
-- lib/smith/agent_process.rb
-- lib/smith/cache.rb
-- lib/smith/exceptions.rb
-- lib/smith/logger.rb
-- lib/smith/acl_compiler.rb
-- lib/smith/command.rb
-- lib/smith/daemon.rb
 - lib/smith/version.rb
-- lib/smith.rb
 homepage: http://github.com/filterfish/smith2
 licenses:
 - GPL-3
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: smith
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Multi-agent framework