rabbit-wq 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f67c7d3323f62c7ae4eb42ee48f57e5b543d4378
-  data.tar.gz: cba863a1b36f9c0d37034494e70bc87b0eb7b079
+  metadata.gz: a8d33902590860f79f6645acb0bc43237712b3bc
+  data.tar.gz: 288d1dc2071687bd7bc58bc273d974e283e14bfb
 SHA512:
-  metadata.gz: 95883a3195dbd35666b2a6a44d16da1d0d07f804108c361425060be6c763d95f692a7d71688ae66989e9fd674602c8181f643af3d3a079f55f89d91d4d20845c
-  data.tar.gz: 7c65521ae83170e1ba829cdf311c009ec4148b76ba3fe827c2a0e9d6d1487d4435ce225ea38dfa47d6967f685349f3d2508c7eb4ccb6530138352f5fa1a480b5
+  metadata.gz: 3bd082da3c732540d1fa99208e6a4d7dce0897d209630b6dd3c900aed5ba962695450425fab6acc71c0bbdef44cd3e6dbc90ebac3919854fc30a32a4a4d78b9a
+  data.tar.gz: 4877c0780f834d17ae539676c48484b969512bbe31cc27eb3e088e7d5ba1ea54b09380d5c8b8241bf52fe672728814ade510c441da35da390869fcec643839f2

data/lib/rabbit_wq.rb

@@ -25,8 +25,7 @@ module RabbitWQ
     years = 2013
     years = "#{years}–#{::Time.now.year}" if years < ::Time.now.year
 
-    boot host_namespace:      self,
-         app_name:            'Rabbit WQ',
+    boot app_name:            'Rabbit WQ',
          author:              author,
          attribution:         "v#{VERSION} Copyright © #{years} #{author}",
          default_config_path: "/etc/rabbit-wq/#{process_name}.conf",

data/lib/rabbit_wq/cli.rb

@@ -9,6 +9,10 @@ module RabbitWQ
         RabbitWQ::Configuration
       end
 
+      def host_namespace
+        RabbitWQ
+      end
+
     end
 
   end

data/lib/rabbit_wq/message_handler.rb

@@ -7,13 +7,14 @@ module RabbitWQ
 
     include Celluloid
     include Queues
-    include Servitude::Logging
+    include ::Servitude::ConfigHelper
+    include ::Servitude::Logging
     include WorkLogging
 
     REQUEUE = true
 
     def call( options )
-      Time.zone = Servitude.configuration.time_zone
+      Time.zone = config.time_zone
 
       channel       = options[:channel]
       delivery_info = options[:delivery_info]
@@ -143,8 +144,8 @@ module RabbitWQ
       config.ignored_workers_to_error_queue.include?( worker.class.name )
     end
 
-    def config
-      Servitude.configuration
+    def host_namespace
+      RabbitWQ
     end
 
     def retry_delays( retry_num )

data/lib/rabbit_wq/server.rb

@@ -26,6 +26,10 @@ module RabbitWQ
       RabbitWQ::MessageHandler
     end
 
+    def host_namespace
+      RabbitWQ
+    end
+
     def run
       @work_consumer = work_subscribe_queue.subscribe( manual_ack: true ) do |delivery_info, metadata, payload|
         with_supervision( delivery_info: delivery_info ) do

data/lib/rabbit_wq/version.rb

@@ -1,3 +1,3 @@
 module RabbitWQ
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/lib/rabbit_wq/work.rb

@@ -6,7 +6,7 @@ module RabbitWQ
     YAML_MIMETYPE = 'application/yaml'
 
     def self.config
-      Servitude.configuration ||= RabbitWQ::Configuration.load
+      RabbitWQ.configuration ||= RabbitWQ::Configuration.load( RabbitWQ::DEFAULT_CONFIG_PATH )
     end
 
     def self.enqueue( worker, options={} )

data/rabbit-wq.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bunny", "~> 1"
   spec.add_dependency "celluloid", "~> 0"
   spec.add_dependency "oj", "~> 2"
-  spec.add_dependency "servitude", ">= 1.2", "< 2"
+  spec.add_dependency "servitude", "~> 2"
   spec.add_dependency "yell", "~> 1"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit-wq
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - C. Jason Harrelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,20 +84,14 @@ dependencies:
   name: servitude
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency