resque 1.25.2 → 1.26.pre.0

data/HISTORY.md

@@ -1,14 +1,17 @@
-## 1.25.2 (TBD)
-
-* Respect TERM_CHILD setting when not forking (@ggilder)
-* implementation of backend connection with a hash (Andrea Rossi)
-* require yaml for show_args support (@yaauie)
-* use redis-namespace 1.3 (Andrea Rossi)
-* fix DOCS link in README (@cade)
-* Fix worker prune test to actually run its assertion & cover reality. (@yaauie)
-* Eliminate infinite recursion when Resque::Helpers mixed into Resque (@yaml)
-* use ruby, avoid shelling out. google++ (@hone)
-* Failed Assertions Don't Fail Tests :rage: (@yaauie)
+## 1.26.0 (TBD)
+
+ * FIX: use Socket.hostname instead of shelling out in order to avoid
+   errors caused when too many workers are started simultaneously. #1152
+   Backport of fix from 2.x master. (@hone, @RunsFor)
+ * FIX: infinite recusion when applying a workaround to make resque
+   backwards-compatible with <= 1.24. #1150 (@yaauie)
+ * FIX: add/fix test coverage for worker pruning and be a little more
+   aggressive in what we prune. (@yaauie)
+ * FIX: require yaml library for show_args support in resque-web. #1143
+   (@yaauie)
+ * FIX: README and documentation link fixes. #1130 (@cade)
+ * Feature: implementation of Backend connection with Hash, using the same
+   connection hash supported by redis-rb #1140 (@lucidstack)
 
 ## 1.25.1 (2013-9-26)
 
@@ -20,7 +23,7 @@
   context (@jonhyman)
 * Use Redis.pipelined to group batches of redis commands.
   https://github.com/resque/resque/pull/902 (@jonhyman)
-* Fixed uninitialize constant for the module/class that contains the perform
+* Fixed uninitialize constant for the module/class that contains the perform 
   method causing job failures to no be reported, #792 (@sideshowcoder)
 * Fix Resque::Failure::Base.all to have the correct signature.
   (@rentalutions)

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.25.2'
+  Version = VERSION = '1.26.pre.0'
 end

data/lib/resque/worker.rb

@@ -410,19 +410,10 @@ module Resque
     end
 
     # Kill the child and shutdown immediately.
-    # If not forking, abort this process.
     def shutdown!
       shutdown
       if term_child
-        if fork_per_job?
-          new_kill_child
-        else
-          # Raise TermException in the same process
-          trap('TERM') do
-            # ignore subsequent terms
-          end
-          raise TermException.new("SIGTERM")
-        end
+        new_kill_child
       else
         kill_child
       end
@@ -629,11 +620,7 @@ module Resque
     end
 
     def will_fork?
-      !@cant_fork && !$TESTING && fork_per_job?
-    end
-
-    def fork_per_job?
-      ENV["FORK_PER_JOB"] != 'false'
+      !@cant_fork && !$TESTING && (ENV["FORK_PER_JOB"] != 'false')
     end
 
     # Returns a symbol representing the current worker state,

data/test/job_hooks_test.rb

@@ -283,7 +283,6 @@ context "Resque::Job before_enqueue" do
   end
 
   test "a before enqueue hook that returns false should prevent the job from getting queued" do
-    Resque.remove_queue(:jobs)
     history = []
     @worker = Resque::Worker.new(:jobs)
     assert_nil Resque.enqueue(BeforeEnqueueJobAbort, history)

data/test/test_helper.rb

@@ -89,36 +89,6 @@ module PerformJob
   end
 end
 
-##
-# Helper to make Minitest::Assertion exceptions work properly
-# in the block given to Resque::Worker#work.
-#
-module AssertInWorkBlock
-  # if a block is given, ensure that it is run, and that any assertion
-  # failures that occur inside it propagate up to the test.
-  def work(*args, &block)
-    return super unless block_given?
-
-    ex = catch(:exception_in_block) do
-      block_called = nil
-      retval = super(*args) do |*bargs|
-        begin
-          block_called = true
-          block.call(*bargs)
-        rescue MiniTest::Assertion => ex
-          throw :exception_in_block, ex
-        end
-      end
-
-      raise "assertion block not called!" unless block_called
-
-      return retval
-    end
-
-    ex && raise(ex)
-  end
-end
-
 #
 # fixture classes
 #

data/test/worker_test.rb

@@ -331,13 +331,13 @@ context "Resque::Worker" do
   end
 
   test "inserts itself into the 'workers' list on startup" do
-    @worker.extend(AssertInWorkBlock).work(0) do
+    @worker.work(0) do
       assert_equal @worker, Resque.workers[0]
     end
   end
 
   test "removes itself from the 'workers' list on shutdown" do
-    @worker.extend(AssertInWorkBlock).work(0) do
+    @worker.work(0) do
       assert_equal @worker, Resque.workers[0]
     end
 
@@ -345,7 +345,7 @@ context "Resque::Worker" do
   end
 
   test "removes worker with stringified id" do
-    @worker.extend(AssertInWorkBlock).work(0) do
+    @worker.work(0) do
       worker_id = Resque.workers[0].to_s
       Resque.remove_worker(worker_id)
       assert_equal [], Resque.workers
@@ -353,7 +353,7 @@ context "Resque::Worker" do
   end
 
   test "records what it is working on" do
-    @worker.extend(AssertInWorkBlock).work(0) do
+    @worker.work(0) do
       task = @worker.job
       assert_equal({"args"=>[20, "/tmp"], "class"=>"SomeJob"}, task['payload'])
       assert task['run_at']
@@ -367,7 +367,7 @@ context "Resque::Worker" do
   end
 
   test "knows when it is working" do
-    @worker.extend(AssertInWorkBlock).work(0) do
+    @worker.work(0) do
       assert @worker.working?
     end
   end
@@ -378,7 +378,7 @@ context "Resque::Worker" do
   end
 
   test "knows who is working" do
-    @worker.extend(AssertInWorkBlock).work(0) do
+    @worker.work(0) do
       assert_equal [@worker], Resque.working
     end
   end
@@ -413,27 +413,27 @@ context "Resque::Worker" do
 
   test "knows when it started" do
     time = Time.now
-    @worker.extend(AssertInWorkBlock).work(0) do
+    @worker.work(0) do
       assert Time.parse(@worker.started) - time < 0.1
     end
   end
 
   test "knows whether it exists or not" do
-    @worker.extend(AssertInWorkBlock).work(0) do
+    @worker.work(0) do
       assert Resque::Worker.exists?(@worker)
       assert !Resque::Worker.exists?('blah-blah')
     end
   end
 
   test "sets $0 while working" do
-    @worker.extend(AssertInWorkBlock).work(0) do
+    @worker.work(0) do
       ver = Resque::Version
-      assert_equal "resque-#{ver}: Processing jobs since #{Time.now.to_i} [SomeJob]", $0
+      assert_equal "resque-#{ver}: Processing jobs since #{Time.now.to_i}", $0
     end
   end
 
   test "can be found" do
-    @worker.extend(AssertInWorkBlock).work(0) do
+    @worker.work(0) do
       found = Resque::Worker.find(@worker.to_s)
       assert_equal @worker.to_s, found.to_s
       assert found.working?
@@ -442,7 +442,7 @@ context "Resque::Worker" do
   end
 
   test "doesn't find fakes" do
-    @worker.extend(AssertInWorkBlock).work(0) do
+    @worker.work(0) do
       found = Resque::Worker.find('blah-blah')
       assert_equal nil, found
     end
@@ -921,71 +921,6 @@ context "Resque::Worker" do
       end
     end
 
-    test "exits with Resque::TermException when using TERM_CHILD and not forking" do
-      begin
-        class LongRunningJob
-          @queue = :long_running_job
-
-          def self.perform(run_time)
-            Resque.redis.client.reconnect # get its own connection
-            Resque.redis.rpush('term-exception-test:start', Process.pid)
-            sleep run_time
-            Resque.redis.rpush('term-exception-test:result', 'Finished Normally')
-          rescue Resque::TermException => e
-            Resque.redis.rpush('term-exception-test:result', %Q(Caught TermException: #{e.inspect}))
-          ensure
-            Resque.redis.rpush('term-exception-test:final', 'exiting.')
-          end
-        end
-
-        Resque.enqueue(LongRunningJob, 5)
-
-        worker_pid = Kernel.fork do
-          # reconnect to redis
-          Resque.redis.client.reconnect
-
-          # ensure we don't fork (in worker)
-          $TESTING = false
-          ENV['FORK_PER_JOB'] = 'false'
-
-          worker = Resque::Worker.new(:long_running_job)
-          worker.term_timeout = 1
-          worker.term_child = 1
-
-          worker.work(0)
-          exit!
-        end
-
-        # ensure the worker is started
-        start_status = Resque.redis.blpop('term-exception-test:start', 5)
-        assert_not_nil start_status
-        child_pid = start_status[1].to_i
-        assert_operator child_pid, :>, 0
-
-        # send signal to abort the worker
-        Process.kill('TERM', worker_pid)
-        Process.waitpid(worker_pid)
-
-        # wait to see how it all came down
-        result = Resque.redis.blpop('term-exception-test:result', 5)
-        assert_not_nil result
-        assert !result[1].start_with?('Finished Normally'), 'Job finished normally. Sleep not long enough?'
-        assert result[1].start_with?('Caught TermException'), 'TermException not raised in child.'
-
-        # ensure that the child pid is no longer running
-        child_still_running = !(`ps -p #{child_pid.to_s} -o pid=`).empty?
-        assert !child_still_running
-
-        # see if post-cleanup occurred.
-        post_cleanup_occurred = Resque.redis.lpop( 'term-exception-test:final' )
-        assert post_cleanup_occurred, 'post cleanup did not occur. SIGKILL sent too early?'
-
-      ensure
-        remaining_keys = Resque.redis.keys('term-exception-test:*') || []
-        Resque.redis.del(*remaining_keys) unless remaining_keys.empty?
-      end
-    end
-
     test "displays warning when not using term_child" do
       begin
         $TESTING = false

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: resque
 version: !ruby/object:Gem::Version
-  version: 1.25.2
+  version: 1.26.pre.0
+  prerelease: 5
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,25 +11,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: vegas
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -36,6 +40,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -43,20 +48,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -64,6 +72,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,6 +80,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mono_logger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,25 +88,20 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-description: |2
-      Resque is a Redis-backed Ruby library for creating background jobs,
-      placing those jobs on multiple queues, and processing them later.
-
-      Background jobs can be any Ruby class or module that responds to
-      perform. Your existing classes can easily be converted to background
-      jobs or you can create new classes specifically to do work. Or, you
-      can do both.
-
-      Resque is heavily inspired by DelayedJob (which rocks) and is
-      comprised of three parts:
-
-      * A Ruby library for creating, querying, and processing jobs
-      * A Rake task for starting a worker which processes jobs
-      * A Sinatra app for monitoring queues, jobs, and workers.
+description: ! "    Resque is a Redis-backed Ruby library for creating background
+  jobs,\n    placing those jobs on multiple queues, and processing them later.\n\n
+  \   Background jobs can be any Ruby class or module that responds to\n    perform.
+  Your existing classes can easily be converted to background\n    jobs or you can
+  create new classes specifically to do work. Or, you\n    can do both.\n\n    Resque
+  is heavily inspired by DelayedJob (which rocks) and is\n    comprised of three parts:\n\n
+  \   * A Ruby library for creating, querying, and processing jobs\n    * A Rake task
+  for starting a worker which processes jobs\n    * A Sinatra app for monitoring queues,
+  jobs, and workers.\n"
 email: chris@ozmm.org
 executables:
 - resque
@@ -110,94 +115,96 @@ files:
 - Rakefile
 - LICENSE
 - HISTORY.md
-- lib/resque.rb
-- lib/tasks/resque.rake
-- lib/tasks/redis.rake
-- lib/resque/failure.rb
-- lib/resque/tasks.rb
-- lib/resque/logging.rb
+- lib/resque/errors.rb
 - lib/resque/failure/airbrake.rb
+- lib/resque/failure/base.rb
+- lib/resque/failure/multiple.rb
 - lib/resque/failure/redis.rb
 - lib/resque/failure/redis_multi_queue.rb
-- lib/resque/failure/multiple.rb
-- lib/resque/failure/base.rb
+- lib/resque/failure.rb
 - lib/resque/helpers.rb
+- lib/resque/job.rb
 - lib/resque/log_formatters/quiet_formatter.rb
-- lib/resque/log_formatters/very_verbose_formatter.rb
 - lib/resque/log_formatters/verbose_formatter.rb
-- lib/resque/worker.rb
-- lib/resque/stat.rb
-- lib/resque/vendor/utf8_util/utf8_util_18.rb
-- lib/resque/vendor/utf8_util/utf8_util_19.rb
-- lib/resque/vendor/utf8_util.rb
+- lib/resque/log_formatters/very_verbose_formatter.rb
+- lib/resque/logging.rb
 - lib/resque/plugin.rb
-- lib/resque/version.rb
-- lib/resque/job.rb
-- lib/resque/server.rb
-- lib/resque/server/test_helper.rb
 - lib/resque/server/helpers.rb
-- lib/resque/server/views/failed_job.erb
-- lib/resque/server/views/overview.erb
-- lib/resque/server/views/error.erb
-- lib/resque/server/views/layout.erb
-- lib/resque/server/views/working.erb
-- lib/resque/server/views/stats.erb
-- lib/resque/server/views/failed_queues_overview.erb
-- lib/resque/server/views/key_string.erb
-- lib/resque/server/views/workers.erb
-- lib/resque/server/views/failed.erb
-- lib/resque/server/views/key_sets.erb
-- lib/resque/server/views/queues.erb
-- lib/resque/server/views/next_more.erb
-- lib/resque/server/public/ranger.js
-- lib/resque/server/public/jquery.relatize_date.js
-- lib/resque/server/public/jquery-1.3.2.min.js
 - lib/resque/server/public/favicon.ico
 - lib/resque/server/public/idle.png
-- lib/resque/server/public/working.png
+- lib/resque/server/public/jquery-1.3.2.min.js
+- lib/resque/server/public/jquery.relatize_date.js
 - lib/resque/server/public/poll.png
-- lib/resque/server/public/style.css
+- lib/resque/server/public/ranger.js
 - lib/resque/server/public/reset.css
-- lib/resque/errors.rb
-- bin/resque-web
+- lib/resque/server/public/style.css
+- lib/resque/server/public/working.png
+- lib/resque/server/test_helper.rb
+- lib/resque/server/views/error.erb
+- lib/resque/server/views/failed.erb
+- lib/resque/server/views/failed_job.erb
+- lib/resque/server/views/failed_queues_overview.erb
+- lib/resque/server/views/key_sets.erb
+- lib/resque/server/views/key_string.erb
+- lib/resque/server/views/layout.erb
+- lib/resque/server/views/next_more.erb
+- lib/resque/server/views/overview.erb
+- lib/resque/server/views/queues.erb
+- lib/resque/server/views/stats.erb
+- lib/resque/server/views/workers.erb
+- lib/resque/server/views/working.erb
+- lib/resque/server.rb
+- lib/resque/stat.rb
+- lib/resque/tasks.rb
+- lib/resque/vendor/utf8_util/utf8_util_18.rb
+- lib/resque/vendor/utf8_util/utf8_util_19.rb
+- lib/resque/vendor/utf8_util.rb
+- lib/resque/version.rb
+- lib/resque/worker.rb
+- lib/resque.rb
+- lib/tasks/redis.rake
+- lib/tasks/resque.rake
 - bin/resque
+- bin/resque-web
 - test/airbrake_test.rb
-- test/plugin_test.rb
-- test/resque_failure_redis_test.rb
-- test/resque_test.rb
-- test/test_helper.rb
+- test/dump.rdb
 - test/failure_base_test.rb
+- test/job_hooks_test.rb
 - test/job_plugins_test.rb
 - test/logging_test.rb
+- test/plugin_test.rb
+- test/redis-test-cluster.conf
 - test/redis-test.conf
 - test/resque-web_test.rb
-- test/job_hooks_test.rb
-- test/worker_test.rb
-- test/redis-test-cluster.conf
+- test/resque_failure_redis_test.rb
 - test/resque_hook_test.rb
+- test/resque_test.rb
+- test/test_helper.rb
+- test/worker_test.rb
 homepage: http://github.com/defunkt/resque
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Resque is a Redis-backed queueing system.
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: f2ad41bcdf6fe0f0dac89963978925b803c42a1c
-  data.tar.gz: 7aebfea98597ddfc13f12b408b1df008bfc6b632
-SHA512:
-  metadata.gz: 9a20c5ee3d7808a893574e3fd907c96ed88c510414f5db29a44989ebc2379bb35db8d71ad60cee27a962e6e20d898e2d53657ecdbd08699ab5b6fd17a38df0be
-  data.tar.gz: 8c841e2a57eee4404d669f469055c165885877d74e7f7b4d326099f9e0e74a66c225073ea88c336ac3b69f2406968310b6e12a2b0df2caa7769ccec4a7a46f5a