resque_manager 3.3.8 → 3.3.9

data/test/unit/overrides/resque/worker_test.rb

@@ -13,7 +13,7 @@ class WorkerTest < Test::Unit::TestCase
 
     context '#local_ip' do
       should 'set the local_ip' do
-        assert_equal IPSocket.getaddress(Socket.gethostname), @worker.local_ip
+        assert_equal UDPSocket.open { |s| s.connect('google.com', 1); s.addr.last }, @worker.local_ip
       end
     end
 
@@ -21,7 +21,7 @@ class WorkerTest < Test::Unit::TestCase
       should 'return the correct string representation of the worker'do
         Process.stubs(:pid).returns(27415)
         object_id = Thread.current.object_id
-        assert_equal "#{Socket.gethostname}(#{IPSocket.getaddress(Socket.gethostname)}):27415:#{object_id}:path:*", @worker.to_s
+        assert_equal "#{Socket.gethostname}(#{UDPSocket.open { |s| s.connect('google.com', 1); s.addr.last }}):27415:#{object_id}:path:*", @worker.to_s
       end
 
       should 'alias to_s as id' do
@@ -32,7 +32,7 @@ class WorkerTest < Test::Unit::TestCase
     context '#pause' do
       should 'return a correctly formatted pause key' do
         Process.stubs(:pid).returns(27415)
-        assert_equal "worker:#{Socket.gethostname}(#{IPSocket.getaddress(Socket.gethostname)}):27415:all_workers:paused", @worker.pause_key
+        assert_equal "worker:#{Socket.gethostname}(#{UDPSocket.open { |s| s.connect('google.com', 1); s.addr.last }}):27415:all_workers:paused", @worker.pause_key
       end
     end
 
@@ -74,7 +74,7 @@ class WorkerTest < Test::Unit::TestCase
 
     context '#ip' do
       should 'return the correct ip' do
-        assert_equal IPSocket.getaddress(Socket.gethostname), @worker.ip
+        assert_equal UDPSocket.open { |s| s.connect('google.com', 1); s.addr.last }, @worker.ip
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque_manager
 version: !ruby/object:Gem::Version
-  version: 3.3.8
+  version: 3.3.9
 platform: ruby
 authors:
 - Kevin Tyll
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -216,7 +216,6 @@ files:
 - lib/resque_manager.rb
 - lib/resque_manager/engine.rb
 - lib/resque_manager/overrides/resque/failure/redis.rb
-- lib/resque_manager/overrides/resque/job.rb
 - lib/resque_manager/overrides/resque/resque.rb
 - lib/resque_manager/overrides/resque/worker.rb
 - lib/resque_manager/overrides/resque_scheduler/resque_scheduler.rb
@@ -226,8 +225,8 @@ files:
 - lib/resque_manager/recipes.rb
 - lib/resque_manager/version.rb
 - lib/tasks/failure.rake
+- lib/tasks/resque.rake
 - lib/tasks/scheduler.rake
-- lib/tasks/worker.rake
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
@@ -319,7 +318,7 @@ files:
 - test/unit/overrides/resque_status/status_test.rb
 homepage: https://github.com/kevintyll/resque_manager
 licenses:
-- MIT
+- " MIT "
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/lib/resque_manager/overrides/resque/job.rb

@@ -1,69 +0,0 @@
-module Resque
-  class Job
-    # Attempts to perform the work represented by this job instance.
-    # Calls #perform on the class given in the payload with the
-    # arguments given in the payload.
-    # A block is sent so a message can be yielded back to be set in the worker.
-    def perform
-      job = payload_class
-      job_args = args || []
-      job_was_performed = false
-
-      begin
-        # Execute before_perform hook. Abort the job gracefully if
-        # Resque::DontPerform is raised.
-        begin
-          before_hooks.each do |hook|
-            job.send(hook, *job_args)
-          end
-        rescue DontPerform
-          return false
-        end
-
-        # Execute the job. Do it in an around_perform hook if available.
-        if around_hooks.empty?
-          job.perform(*job_args) do |status|
-            self.worker
-          end
-          job_was_performed = true
-        else
-          # We want to nest all around_perform plugins, with the last one
-          # finally calling perform
-          stack = around_hooks.reverse.inject(nil) do |last_hook, hook|
-            if last_hook
-              lambda do
-                job.send(hook, *job_args) { last_hook.call }
-              end
-            else
-              lambda do
-                job.send(hook, *job_args) do
-                  result = job.perform(*job_args) do |status|
-                    self.worker
-                  end
-                  job_was_performed = true
-                  result
-                end
-              end
-            end
-          end
-          stack.call
-        end
-
-        # Execute after_perform hook
-        after_hooks.each do |hook|
-          job.send(hook, *job_args)
-        end
-
-        # Return true if the job was performed
-        return job_was_performed
-
-          # If an exception occurs during the job execution, look for an
-          # on_failure hook then re-raise.
-      rescue Object => e
-        failure_hooks.each { |hook| job.send(hook, e, *job_args) }
-        raise e
-      end
-    end
-
-  end
-end