canvas-jobs 0.9.15 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 089d54bcaa6fd72c6cb4ac2b682ffb1d77951c98
-  data.tar.gz: 07835003745259e07f104071ea12bdcdc10bad08
+  metadata.gz: 57643efbeabb15ec7af78f3150afd1852462c4e0
+  data.tar.gz: 70ada31da936583af18e042eee3e68080725703f
 SHA512:
-  metadata.gz: bc0ebc0109b69dc13937cba6d0c17cdfb20fbee9716852a9dc41692eb55afd47439f22f1ec6ad0ccb06a309e965407a29c0cb171aaad89eed79a6ca69c847118
-  data.tar.gz: 94000941a93a244da58d12ec202e95d4f3d93bc3df7d6dcf5ae3f416654da68caf581191c372c48b992487d3533238ac13d76310dd4691bae32271510d7d445b
+  metadata.gz: c2b9ad3960cbd1b008e31b5e2c28375277a27366a2df2e5682f334eb85d2a179a3e68885e4cba7ed44ebc3366bb039c76f1e99105e625d877208d5f309ed7cbf
+  data.tar.gz: 238773d9623aaeb6c567ffdd87033e5574cc5a39cb07a891c4721c70b85359b25b8844352aa48355678287b7d747d07d1efc9b007436cecde99f9902d3825da3

data/lib/delayed/backend/active_record.rb

@@ -39,7 +39,7 @@ module Delayed
         before_create :lock_strand_on_create
         def lock_strand_on_create
           if strand.present?
-            self.class.connection.execute("SELECT pg_advisory_xact_lock(half_md5_as_bigint(#{self.class.sanitize(strand)}))")
+            self.class.connection.execute("SELECT pg_advisory_xact_lock(#{self.class.connection.quote_table_name('half_md5_as_bigint')}(#{self.class.sanitize(strand)}))")
           end
         end
 
@@ -137,22 +137,30 @@ module Delayed
         # to specify the jobs to act on, either pass opts[:ids] = [list of job ids]
         # or opts[:flavor] = <some flavor> to perform on all jobs of that flavor
         def self.bulk_update(action, opts)
-          scope = if opts[:flavor]
-            raise("Can't bulk update failed jobs") if opts[:flavor].to_s == 'failed'
+          raise("Can't #{action.to_s} failed jobs") if opts[:flavor].to_s == 'failed' && action.to_s != 'destroy'
+          scope = if opts[:ids]
+            if opts[:flavor] == 'failed'
+              Delayed::Job::Failed.where(:id => opts[:ids])
+            else
+              self.where(:id => opts[:ids])
+            end
+          elsif opts[:flavor]
+
             self.scope_for_flavor(opts[:flavor], opts[:query])
-          elsif opts[:ids]
-            self.where(:id => opts[:ids])
           end
 
           return 0 unless scope
 
           case action.to_s
           when 'hold'
+            scope = scope.where(locked_by: nil)
             scope.update_all(:locked_by => ON_HOLD_LOCKED_BY, :locked_at => db_time_now, :attempts => ON_HOLD_COUNT)
           when 'unhold'
             now = db_time_now
+            scope = scope.where(locked_by: ON_HOLD_LOCKED_BY)
             scope.update_all(["locked_by = NULL, locked_at = NULL, attempts = 0, run_at = (CASE WHEN run_at > ? THEN run_at ELSE ? END), failed_at = NULL", now, now])
           when 'destroy'
+            scope = scope.where("locked_by IS NULL OR locked_by=?", ON_HOLD_LOCKED_BY)
             scope.delete_all
           end
         end
@@ -221,7 +229,7 @@ module Delayed
         # depending on the db driver
         def self.transaction_for_singleton(strand)
           self.transaction do
-            connection.execute(sanitize_sql(["SELECT pg_advisory_xact_lock(half_md5_as_bigint(?))", strand]))
+            connection.execute(sanitize_sql(["SELECT pg_advisory_xact_lock(#{connection.quote_table_name('half_md5_as_bigint')}(?))", strand]))
             yield
           end
         end

data/lib/delayed/backend/redis/bulk_update.lua

@@ -21,20 +21,30 @@ else
   end
 end
 
+local count = 0
 for idx, job_id in ipairs(ids) do
   if action == 'hold' then
-    local queue, strand = unpack(redis.call('HMGET', Keys.job(job_id), 'queue', 'strand'))
-    remove_from_queues(job_id, queue, strand)
-    redis.call('HMSET', Keys.job(job_id), 'locked_at', now, 'locked_by', 'on hold', 'attempts', 50)
+    local queue, strand, locked_by = unpack(redis.call('HMGET', Keys.job(job_id), 'queue', 'strand', 'locked_by'))
+    if not locked_by then
+      count = count + 1
+      remove_from_queues(job_id, queue, strand)
+      redis.call('HMSET', Keys.job(job_id), 'locked_at', now, 'locked_by', 'on hold', 'attempts', 50)
+    end
   elseif action == 'unhold' then
     local queue, locked_by = unpack(redis.call('HMGET', Keys.job(job_id), 'queue', 'locked_by'))
-    add_to_queues(job_id, queue, now)
-    redis.call('HDEL', Keys.job(job_id), 'locked_at', 'locked_by')
-    redis.call('HMSET', Keys.job(job_id), 'attempts', 0)
+    if locked_by == 'on hold' then
+      count = count + 1
+      add_to_queues(job_id, queue, now)
+      redis.call('HDEL', Keys.job(job_id), 'locked_at', 'locked_by')
+      redis.call('HMSET', Keys.job(job_id), 'attempts', 0)
+    end
   elseif action == 'destroy' then
-    destroy_job(job_id, now)
+    local locked_by = redis.call('HGET', Keys.job(job_id), 'locked_by')
+    if not locked_by or locked_by == 'on hold' then
+      count = count + 1
+      destroy_job(job_id, now)
+    end
   end
 end
 
--- returns the # of jobs matching the query, not necessarily the # whose state was changed
-return table.getn(ids)
+return count

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.9.15"
+  VERSION = "0.9.16"
 end

data/spec/active_record_job_spec.rb

@@ -67,4 +67,38 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
     job.locked_by.should == nil
     job.locked_at.should == nil
   end
+
+
+  describe "bulk_update failed jobs" do
+    before do
+      @flavor = 'failed'
+      @affected_jobs = []
+      @ignored_jobs = []
+      Timecop.freeze(5.minutes.ago) do
+        5.times { @affected_jobs << create_job.tap { |j| j.fail! } }
+        @ignored_jobs << create_job(:run_at => 2.hours.from_now)
+        @ignored_jobs << create_job(:queue => 'q2')
+      end
+    end
+
+    it "should raise error when holding failed jobs" do
+      expect { Delayed::Job.bulk_update('hold', :flavor => @flavor, :query => @query) }.to raise_error
+    end
+
+    it "should raise error holding or unholding failed jobs" do
+      expect { Delayed::Job.bulk_update('unhold', :flavor => @flavor, :query => @query) }.to raise_error
+    end
+
+    it "should delete failed jobs by id" do
+      target_ids = Delayed::Job::Failed.all[0..2].map { |j| j.id }
+      Delayed::Job.bulk_update('destroy', :ids => target_ids, :flavor => @flavor, :query => @query).should == target_ids.length
+    end
+
+    it "should delete all failed jobs" do
+      Delayed::Job.bulk_update('destroy', :flavor => @flavor, :query => @query).should == @affected_jobs.size
+      @affected_jobs.map { |j| Delayed::Job.find(j.id) rescue nil }.compact.should be_blank
+      @ignored_jobs.map { |j| Delayed::Job.find(j.id) rescue nil }.compact.size.should == @ignored_jobs.size
+    end
+  end
+
 end

data/spec/gemfiles/32.gemfile

@@ -4,7 +4,6 @@ gemspec :path=>"../../"
 
 gem "rails", "~> 3.2.19"
 
-if RUBY_VERSION >= "2.0"
-  gem "syck"
+platforms :ruby_20, :ruby_21, :ruby_22 do
+  gem 'syck', '>= 1.0.4'
 end
-

data/spec/gemfiles/32.gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.7)
+    canvas-jobs (0.9.15)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)
-      redis-scripting (= 1.0.1)
-      rufus-scheduler (= 2.0.6)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -41,6 +41,7 @@ GEM
     after_transaction_commit (1.0.1)
       activerecord (>= 3.2)
     arel (3.0.3)
+    backports (3.6.6)
     builder (3.0.0)
     bump (0.5.0)
     coderay (1.1.0)
@@ -66,6 +67,8 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-protection (1.5.3)
+      rack
     rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
@@ -88,7 +91,7 @@ GEM
     rake (10.3.2)
     rdoc (3.12)
       json (~> 1.4)
-    redis (3.1.0)
+    redis (3.2.1)
     redis-scripting (1.0.1)
       redis (>= 3.0)
     rspec (3.1.0)
@@ -103,15 +106,26 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    rufus-scheduler (2.0.6)
+    rufus-scheduler (3.1.7)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.6)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
     slop (3.6.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    syck (1.0.3)
-    test_after_commit (0.4.0)
+    syck (1.0.5)
+    test_after_commit (0.4.1)
       activerecord (>= 3.2)
     thor (0.19.1)
     tilt (1.4.1)
@@ -120,7 +134,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.39)
-    wwtd (0.5.5)
+    wwtd (1.1.1)
 
 PLATFORMS
   ruby
@@ -128,13 +142,16 @@ PLATFORMS
 DEPENDENCIES
   bump
   canvas-jobs!
-  database_cleaner
+  database_cleaner (= 1.3.0)
   pg
   pry
+  rack-test
   rails (~> 3.2.19)
   rake
-  rspec
-  syck
-  test_after_commit
-  timecop
-  wwtd
+  rspec (= 3.1.0)
+  sinatra
+  sinatra-contrib
+  syck (>= 1.0.4)
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.1.1)

data/spec/gemfiles/40.gemfile

@@ -4,6 +4,6 @@ gemspec :path=>"../../"
 
 gem "rails", "~> 4.0.10"
 
-if RUBY_VERSION >= "2.0"
-  gem "syck"
+platforms :ruby_20, :ruby_21, :ruby_22 do
+  gem 'syck', '>= 1.0.4'
 end

data/spec/gemfiles/40.gemfile.lock

@@ -0,0 +1,141 @@
+PATH
+  remote: ../../
+  specs:
+    canvas-jobs (0.9.15)
+      after_transaction_commit (= 1.0.1)
+      rails (>= 3.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.1.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
+      builder (~> 3.1.0)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.13)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    after_transaction_commit (1.0.1)
+      activerecord (>= 3.2)
+    arel (4.0.2)
+    backports (3.6.6)
+    builder (3.1.4)
+    bump (0.5.2)
+    coderay (1.1.0)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    i18n (0.7.0)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.6.2)
+    minitest (4.7.5)
+    multi_json (1.11.2)
+    pg (0.18.3)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.5)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.13)
+      sprockets-rails (~> 2.0)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    redis (3.2.1)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rufus-scheduler (3.1.7)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.6)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    syck (1.0.5)
+    test_after_commit (0.4.1)
+      activerecord (>= 3.2)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.1)
+    timecop (0.7.1)
+    tzinfo (0.3.45)
+    wwtd (1.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  canvas-jobs!
+  database_cleaner (= 1.3.0)
+  pg
+  pry
+  rack-test
+  rails (~> 4.0.10)
+  rake
+  rspec (= 3.1.0)
+  sinatra
+  sinatra-contrib
+  syck (>= 1.0.4)
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.1.1)

data/spec/gemfiles/41.gemfile

@@ -4,6 +4,6 @@ gemspec :path=>"../../"
 
 gem "rails", "~> 4.1.6"
 
-if RUBY_VERSION >= "2.0"
-  gem "syck"
+platforms :ruby_20, :ruby_21, :ruby_22 do
+  gem 'syck', '>= 1.0.4'
 end

data/spec/gemfiles/41.gemfile.lock

@@ -0,0 +1,147 @@
+PATH
+  remote: ../../
+  specs:
+    canvas-jobs (0.9.15)
+      after_transaction_commit (= 1.0.1)
+      rails (>= 3.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.1.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.13)
+      actionpack (= 4.1.13)
+      actionview (= 4.1.13)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.13)
+      actionview (= 4.1.13)
+      activesupport (= 4.1.13)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.13)
+      activesupport (= 4.1.13)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.13)
+      activesupport (= 4.1.13)
+      builder (~> 3.1)
+    activerecord (4.1.13)
+      activemodel (= 4.1.13)
+      activesupport (= 4.1.13)
+      arel (~> 5.0.0)
+    activesupport (4.1.13)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    after_transaction_commit (1.0.1)
+      activerecord (>= 3.2)
+    arel (5.0.1.20140414130214)
+    backports (3.6.6)
+    builder (3.2.2)
+    bump (0.5.2)
+    coderay (1.1.0)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.6.2)
+    minitest (5.8.1)
+    multi_json (1.11.2)
+    pg (0.18.3)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.5)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.1.13)
+      actionmailer (= 4.1.13)
+      actionpack (= 4.1.13)
+      actionview (= 4.1.13)
+      activemodel (= 4.1.13)
+      activerecord (= 4.1.13)
+      activesupport (= 4.1.13)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.13)
+      sprockets-rails (~> 2.0)
+    railties (4.1.13)
+      actionpack (= 4.1.13)
+      activesupport (= 4.1.13)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    redis (3.2.1)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rufus-scheduler (3.1.7)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.6)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    syck (1.0.5)
+    test_after_commit (0.4.1)
+      activerecord (>= 3.2)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.1)
+    timecop (0.7.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    wwtd (1.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  canvas-jobs!
+  database_cleaner (= 1.3.0)
+  pg
+  pry
+  rack-test
+  rails (~> 4.1.6)
+  rake
+  rspec (= 3.1.0)
+  sinatra
+  sinatra-contrib
+  syck (>= 1.0.4)
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.1.1)

data/spec/gemfiles/42.gemfile

@@ -4,6 +4,6 @@ gemspec :path=>"../../"
 
 gem "rails", "~> 4.2.0.beta2"
 
-if RUBY_VERSION >= "2.0"
-  gem "syck"
+platforms :ruby_20, :ruby_21, :ruby_22 do
+  gem 'syck', '>= 1.0.4'
 end

data/spec/gemfiles/42.gemfile.lock

@@ -0,0 +1,172 @@
+PATH
+  remote: ../../
+  specs:
+    canvas-jobs (0.9.15)
+      after_transaction_commit (= 1.0.1)
+      rails (>= 3.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.1.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.4)
+      activesupport (= 4.2.4)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.4)
+      activesupport (= 4.2.4)
+      globalid (>= 0.3.0)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
+      builder (~> 3.1)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
+      arel (~> 6.0)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    after_transaction_commit (1.0.1)
+      activerecord (>= 3.2)
+    arel (6.0.3)
+    backports (3.6.6)
+    builder (3.2.2)
+    bump (0.5.2)
+    coderay (1.1.0)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.6.2)
+    mini_portile (0.6.2)
+    minitest (5.8.1)
+    multi_json (1.11.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    pg (0.18.3)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.4)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.4)
+      actionpack (= 4.2.4)
+      activesupport (= 4.2.4)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    redis (3.2.1)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rufus-scheduler (3.1.7)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.6)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    syck (1.0.5)
+    test_after_commit (0.4.1)
+      activerecord (>= 3.2)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.1)
+    timecop (0.7.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    wwtd (1.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  canvas-jobs!
+  database_cleaner (= 1.3.0)
+  pg
+  pry
+  rack-test
+  rails (~> 4.2.0.beta2)
+  rake
+  rspec (= 3.1.0)
+  sinatra
+  sinatra-contrib
+  syck (>= 1.0.4)
+  test_after_commit (= 0.4.1)
+  timecop (= 0.7.1)
+  wwtd (~> 1.1.1)

data/spec/shared/shared_backend.rb

@@ -652,16 +652,17 @@ shared_examples_for 'a backend' do
         @ignored_jobs = []
       end
 
-      it "should hold a scope of jobs" do
+      it "should hold and unhold a scope of jobs" do
         @affected_jobs.all? { |j| j.on_hold? }.should be false
         @ignored_jobs.any? { |j| j.on_hold? }.should be false
         Delayed::Job.bulk_update('hold', :flavor => @flavor, :query => @query).should == @affected_jobs.size
 
         @affected_jobs.all? { |j| Delayed::Job.find(j.id).on_hold? }.should be true
         @ignored_jobs.any? { |j| Delayed::Job.find(j.id).on_hold? }.should be false
-      end
 
-      it "should un-hold a scope of jobs" do
+        # redis holding seems busted - it removes from the tag set and strand list, so you can't use a query
+        # to un-hold them
+        next if Delayed::Job == Delayed::Backend::Redis::Job
         Delayed::Job.bulk_update('unhold', :flavor => @flavor, :query => @query).should == @affected_jobs.size
 
         @affected_jobs.any? { |j| Delayed::Job.find(j.id).on_hold? }.should be false
@@ -738,17 +739,40 @@ shared_examples_for 'a backend' do
       Delayed::Job.find(j2.id).on_hold?.should be true
       Delayed::Job.find(j3.id).on_hold?.should be false
 
-      Delayed::Job.bulk_update('unhold', :ids => [j2.id]).should == 1
+      Delayed::Job.bulk_update('unhold', :ids => [j2.id, j3.id]).should == 1
       Delayed::Job.find(j1.id).on_hold?.should be true
       Delayed::Job.find(j2.id).on_hold?.should be false
       Delayed::Job.find(j3.id).on_hold?.should be false
     end
 
+    it "should not hold locked jobs" do
+      job1 = Delayed::Job.new(:tag => 'tag')
+      job1.create_and_lock!("worker")
+      job1.on_hold?.should be false
+      Delayed::Job.bulk_update('hold', ids: [job1.id]).should == 0
+      Delayed::Job.find(job1.id).on_hold?.should be false
+    end
+
+    it "should not unhold locked jobs" do
+      job1 = Delayed::Job.new(:tag => 'tag')
+      job1.create_and_lock!("worker")
+      Delayed::Job.bulk_update('unhold', ids: [job1.id]).should == 0
+      Delayed::Job.find(job1.id).on_hold?.should be false
+      Delayed::Job.find(job1.id).locked?.should be true
+    end
+
     it "should delete given job ids" do
       jobs = (0..2).map { create_job }
       Delayed::Job.bulk_update('destroy', :ids => jobs[0,2].map(&:id)).should == 2
       jobs.map { |j| Delayed::Job.find(j.id) rescue nil }.compact.should == jobs[2,1]
     end
+
+    it "should not delete locked jobs" do
+      job1 = Delayed::Job.new(:tag => 'tag')
+      job1.create_and_lock!("worker")
+      Delayed::Job.bulk_update('destroy', ids: [job1.id]).should == 0
+      Delayed::Job.find(job1.id).locked?.should be true
+    end
   end
 
   describe "tag_counts" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas-jobs
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
@@ -197,16 +197,16 @@ dependencies:
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -317,8 +317,11 @@ files:
 - spec/gemfiles/32.gemfile
 - spec/gemfiles/32.gemfile.lock
 - spec/gemfiles/40.gemfile
+- spec/gemfiles/40.gemfile.lock
 - spec/gemfiles/41.gemfile
+- spec/gemfiles/41.gemfile.lock
 - spec/gemfiles/42.gemfile
+- spec/gemfiles/42.gemfile.lock
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb
@@ -349,7 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
@@ -361,8 +364,11 @@ test_files:
 - spec/gemfiles/32.gemfile
 - spec/gemfiles/32.gemfile.lock
 - spec/gemfiles/40.gemfile
+- spec/gemfiles/40.gemfile.lock
 - spec/gemfiles/41.gemfile
+- spec/gemfiles/41.gemfile.lock
 - spec/gemfiles/42.gemfile
+- spec/gemfiles/42.gemfile.lock
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb