smith 0.5.11 → 0.5.12

data/lib/smith/agent.rb

@@ -157,9 +157,9 @@ module Smith
           p.state = 'acknowledge_start'
           p.pid = $$
           p.name = self.class.to_s
-          p.metadata = agent_options[:metadata]
-          p.monitor = agent_options[:monitor]
-          p.singleton = agent_options[:singleton]
+          p.metadata = Smith.config.agent.metadata
+          p.monitor = Smith.config.agent.monitor
+          p.singleton = Smith.config.agent.singleton
           p.started_at = Time.now.to_i
         end
         ack_start_queue.publish(payload)
@@ -174,7 +174,7 @@ module Smith
     end
 
     def start_keep_alive
-      if agent_options[:monitor]
+      if Smith.config.agent.monitor
         EventMachine::add_periodic_timer(1) do
           sender('agent.keepalive', :auto_delete => false, :durable => false, :dont_cache => true) do |keep_alive_queue|
             message = {:name => self.class.to_s, :pid => $$, :time => Time.now.to_i}
@@ -192,10 +192,6 @@ module Smith
       @factory
     end
 
-    def agent_options
-      Smith.config.agent._child
-    end
-
     def control_queue_name
       "#{default_queue_name}.control"
     end

data/lib/smith/messaging/amqp_options.rb

@@ -12,23 +12,23 @@ module Smith
       end
 
       def exchange(*extra_opts)
-        merge(Smith.config.amqp.exchange._child, @options, extra_opts)
+        merge(Smith.config.amqp.exchange.to_hash, @options, extra_opts)
       end
 
       def queue(*extra_opts)
-        merge(Smith.config.amqp.queue._child, @options, extra_opts)
+        merge(Smith.config.amqp.queue.to_hash, @options, extra_opts)
       end
 
       def pop(*extra_opts)
-        merge(Smith.config.amqp.pop._child, @options, extra_opts)
+        merge(Smith.config.amqp.pop.to_hash, @options, extra_opts)
       end
 
       def publish(*extra_opts)
-        merge(Smith.config.amqp.publish._child, {:routing_key => queue_name}, extra_opts)
+        merge(Smith.config.amqp.publish.to_hash, {:routing_key => queue_name}, extra_opts)
       end
 
       def subscribe(*extra_opts)
-        merge(Smith.config.amqp.subscribe._child, extra_opts)
+        merge(Smith.config.amqp.subscribe.to_hash, extra_opts)
       end
 
       private

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.5.11"
+  VERSION = "0.5.12"
 end

data/lib/smith.rb

@@ -97,10 +97,9 @@ module Smith
       EM.kqueue if EM.kqueue?
       EM.set_descriptor_table_size(opts[:fdsize] || 1024)
 
-      connection_settings = config.amqp.broker._child.merge({
+      connection_settings = config.amqp.broker._merge(
         :on_tcp_connection_failure => method(:tcp_connection_failure_handler),
-        :on_possible_authentication_failure => method(:authentication_failure_handler)
-      })
+        :on_possible_authentication_failure => method(:authentication_failure_handler))
 
       AMQP.start(connection_settings) do |connection|
         @connection = connection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: dm-core
   requirement: !ruby/object:Gem::Requirement
@@ -144,17 +144,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: ruby_protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -245,18 +245,8 @@ extra_rdoc_files: []
 files:
 - bin/agency
 - bin/smithctl
-- lib/smith.rb
-- 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/command_base.rb
 - lib/smith/commands/agency/agents.rb
 - lib/smith/commands/agency/kill.rb
 - lib/smith/commands/agency/list.rb
@@ -267,7 +257,6 @@ files:
 - lib/smith/commands/agency/start.rb
 - lib/smith/commands/agency/stop.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/pop.rb
@@ -275,28 +264,39 @@ files:
 - lib/smith/commands/smithctl/rm.rb
 - lib/smith/commands/smithctl/top.rb
 - lib/smith/commands/template.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/commands/common.rb
 - 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/acl/search.proto
+- lib/smith/messaging/responder.rb
 - lib/smith/messaging/amqp_options.rb
 - lib/smith/messaging/endpoint.rb
 - lib/smith/messaging/payload.rb
 - lib/smith/messaging/queue_factory.rb
 - lib/smith/messaging/receiver.rb
-- lib/smith/messaging/responder.rb
 - lib/smith/messaging/sender.rb
 - lib/smith/object_count.rb
 - lib/smith/version.rb
+- lib/smith/acl_compiler.rb
+- lib/smith/agent.rb
+- lib/smith/agent_cache.rb
+- lib/smith/agent_monitoring.rb
+- lib/smith/agent_process.rb
+- lib/smith/bootstrap.rb
+- lib/smith/cache.rb
+- lib/smith/command.rb
+- lib/smith/command_base.rb
+- lib/smith/config.rb
+- lib/smith/daemon.rb
+- lib/smith/exceptions.rb
+- lib/smith/logger.rb
+- lib/smith.rb
 homepage: http://github.com/filterfish/smith2/
 licenses: []
 post_install_message: 
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: nowarning
+rubyforge_project: smith
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3