canvas-jobs 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc057ee6906ea7379cfb792230dafc66f213acad
-  data.tar.gz: 77fe7aa819367091e923f105c9c06f914df3468e
+  metadata.gz: 22cdd34ac9d325bbfd08b069013079df62a323b3
+  data.tar.gz: c0d43f5fc8f085458d487a1eed0af5ba93e64f83
 SHA512:
-  metadata.gz: e9db129cd415d8e054d17aee72e40a7a15cff7b79b81919ee72af8a1c681b09273f23076aa451891283533fa3fa1f6be0cb947a28dd57d000374386aef55a292
-  data.tar.gz: 3959cbd432ec566d779f88a00dd7c2e777f8a3235b2ae0e7ee3f28a99fe2337590d0be8d2978b6cecd8a7e2abd645bd3a6f56d0fa94de872664bc0d16c78cd7a
+  metadata.gz: 9dbe192d28159639e96044f93202c24a85af870ab30b78832d41b740f4950f959c8ed7fee25aade961663ed88c27b40a864cfaef05ed89765c060ff3789bd8cd
+  data.tar.gz: 49c960c91b03c2daf7accb7f01d8438d74c82c00ece00691b78b22fb57fdfb5c313bb2db329f34a826ac275707757d83f0c3ca27cbfa0be3021a7173947375c8

data/lib/delayed/backend/active_record.rb

@@ -234,7 +234,15 @@ module Delayed
           strand = options[:strand]
           transaction_for_singleton(strand) do
             job = self.where(:strand => strand, :locked_at => nil).order(:id).first
-            job || self.create(options)
+            new_job = new(options)
+            if job
+              new_job.initialize_defaults
+              job.run_at = [job.run_at, new_job.run_at].min
+              job.save! if job.changed?
+            else
+              new_job.save!
+            end
+            job || new_job
           end
         end
 

data/lib/delayed/backend/redis/job.rb

@@ -419,6 +419,8 @@ class Job
       # replace this job with the other for returning.
       if job_id != self.id
         singleton = self.class.find(job_id)
+        singleton.run_at = [singleton.run_at, run_at].min
+        singleton.save! if singleton.changed?
         COLUMNS.each { |c| send("#{c}=", singleton.send(c)) }
       end
     else

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/lib/delayed/worker.rb

@@ -188,9 +188,12 @@ class Worker
     previous_tmpdir = ENV['TMPDIR']
     Thread.current[:running_delayed_job] = job
 
-    Dir.mktmpdir("job-#{job.id}-#{self.name.gsub(/[^\w\.]/, '.')}-") do |dir|
+    dir = Dir.mktmpdir("job-#{job.id}-#{self.name.gsub(/[^\w\.]/, '.')}-")
+    begin
       ENV['TMPDIR'] = dir
       yield
+    ensure
+      FileUtils.remove_entry(dir, true)
     end
   ensure
     ENV['TMPDIR'] = previous_tmpdir

data/spec/gemfiles/32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    canvas-jobs (0.9.5)
+    canvas-jobs (0.9.7)
       after_transaction_commit (= 1.0.1)
       rails (>= 3.2)
       redis (> 3.0)
@@ -41,7 +41,7 @@ GEM
     after_transaction_commit (1.0.1)
       activerecord (>= 3.2)
     arel (3.0.3)
-    builder (3.0.4)
+    builder (3.0.0)
     bump (0.5.0)
     coderay (1.1.0)
     database_cleaner (1.3.0)
@@ -86,7 +86,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.3.2)
-    rdoc (3.12.2)
+    rdoc (3.12)
       json (~> 1.4)
     redis (3.1.0)
     redis-scripting (1.0.1)
@@ -95,14 +95,14 @@ GEM
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.5)
+    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.2)
+    rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
-    rspec-support (3.1.1)
+    rspec-support (3.1.2)
     rufus-scheduler (2.0.6)
     slop (3.6.0)
     sprockets (2.2.2)
@@ -110,8 +110,8 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    syck (1.0.4)
-    test_after_commit (0.3.0)
+    syck (1.0.3)
+    test_after_commit (0.4.0)
       activerecord (>= 3.2)
     thor (0.19.1)
     tilt (1.4.1)
@@ -119,7 +119,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.41)
+    tzinfo (0.3.39)
     wwtd (0.5.5)
 
 PLATFORMS

data/spec/shared/shared_backend.rb

@@ -315,6 +315,14 @@ shared_examples_for 'a backend' do
         @job3 = create_job(:singleton => 'myjobs')
         @job3.should == @job2
       end
+
+      it "should update existing job if new job is set to run sooner" do
+        job1 = create_job(singleton: 'myjobs', run_at: 1.hour.from_now)
+        job2 = create_job(singleton: 'myjobs')
+        job2.should == job1
+        # it should be scheduled to run immediately
+        Delayed::Job.get_and_lock_next_available('w1').should == job1
+      end
     end
 
     context 'n_strand' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas-jobs
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
@@ -265,11 +265,8 @@ 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
@@ -309,11 +306,8 @@ 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
@@ -325,3 +319,4 @@ test_files:
 - spec/shared/worker.rb
 - spec/shared_jobs_specs.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/spec/gemfiles/40.gemfile.lock

@@ -1,128 +0,0 @@
-PATH
-  remote: ../../
-  specs:
-    canvas-jobs (0.9.5)
-      after_transaction_commit (= 1.0.1)
-      rails (>= 3.2)
-      redis (> 3.0)
-      redis-scripting (= 1.0.1)
-      rufus-scheduler (= 2.0.6)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.0.10)
-      actionpack (= 4.0.10)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.10)
-      activesupport (= 4.0.10)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.10)
-      activesupport (= 4.0.10)
-      builder (~> 3.1.0)
-    activerecord (4.0.10)
-      activemodel (= 4.0.10)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.10)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.10)
-      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)
-    builder (3.1.4)
-    bump (0.5.0)
-    coderay (1.1.0)
-    database_cleaner (1.3.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.11)
-    mail (2.6.1)
-      mime-types (>= 1.16, < 3)
-    method_source (0.8.2)
-    mime-types (2.3)
-    minitest (4.7.5)
-    multi_json (1.10.1)
-    pg (0.17.1)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.0.10)
-      actionmailer (= 4.0.10)
-      actionpack (= 4.0.10)
-      activerecord (= 4.0.10)
-      activesupport (= 4.0.10)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.10)
-      sprockets-rails (~> 2.0)
-    railties (4.0.10)
-      actionpack (= 4.0.10)
-      activesupport (= 4.0.10)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    redis (3.1.0)
-    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.5)
-      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.2)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.1)
-    rufus-scheduler (2.0.6)
-    slop (3.6.0)
-    sprockets (2.12.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    syck (1.0.4)
-    test_after_commit (0.3.0)
-      activerecord (>= 3.2)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    timecop (0.7.1)
-    tzinfo (0.3.41)
-    wwtd (0.5.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  canvas-jobs!
-  database_cleaner
-  pg
-  pry
-  rails (~> 4.0.10)
-  rake
-  rspec
-  syck
-  test_after_commit
-  timecop
-  wwtd

data/spec/gemfiles/41.gemfile.lock

@@ -1,134 +0,0 @@
-PATH
-  remote: ../../
-  specs:
-    canvas-jobs (0.9.5)
-      after_transaction_commit (= 1.0.1)
-      rails (>= 3.2)
-      redis (> 3.0)
-      redis-scripting (= 1.0.1)
-      rufus-scheduler (= 2.0.6)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.6)
-      actionview (= 4.1.6)
-      activesupport (= 4.1.6)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.6)
-      activesupport (= 4.1.6)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
-      builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
-      arel (~> 5.0.0)
-    activesupport (4.1.6)
-      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)
-    builder (3.2.2)
-    bump (0.5.0)
-    coderay (1.1.0)
-    database_cleaner (1.3.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.11)
-    json (1.8.1)
-    mail (2.6.1)
-      mime-types (>= 1.16, < 3)
-    method_source (0.8.2)
-    mime-types (2.3)
-    minitest (5.4.2)
-    multi_json (1.10.1)
-    pg (0.17.1)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.1.6)
-      actionmailer (= 4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      activemodel (= 4.1.6)
-      activerecord (= 4.1.6)
-      activesupport (= 4.1.6)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.6)
-      sprockets-rails (~> 2.0)
-    railties (4.1.6)
-      actionpack (= 4.1.6)
-      activesupport (= 4.1.6)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    redis (3.1.0)
-    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.5)
-      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.2)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.1)
-    rufus-scheduler (2.0.6)
-    slop (3.6.0)
-    sprockets (2.12.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    syck (1.0.4)
-    test_after_commit (0.3.0)
-      activerecord (>= 3.2)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    timecop (0.7.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    wwtd (0.5.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  canvas-jobs!
-  database_cleaner
-  pg
-  pry
-  rails (~> 4.1.6)
-  rake
-  rspec
-  syck
-  test_after_commit
-  timecop
-  wwtd

data/spec/gemfiles/42.gemfile.lock

@@ -1,159 +0,0 @@
-PATH
-  remote: ../../
-  specs:
-    canvas-jobs (0.9.5)
-      after_transaction_commit (= 1.0.1)
-      rails (>= 3.2)
-      redis (> 3.0)
-      redis-scripting (= 1.0.1)
-      rufus-scheduler (= 2.0.6)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.0.beta2)
-      actionpack (= 4.2.0.beta2)
-      actionview (= 4.2.0.beta2)
-      activejob (= 4.2.0.beta2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.3)
-    actionpack (4.2.0.beta2)
-      actionview (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      rack (~> 1.6.0.beta)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.3)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.3)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      globalid (>= 0.3.0)
-    activemodel (4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      builder (~> 3.1)
-    activerecord (4.2.0.beta2)
-      activemodel (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      arel (>= 6.0.0.beta1, < 6.1)
-    activesupport (4.2.0.beta2)
-      i18n (>= 0.7.0.beta1, < 0.8)
-      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 (6.0.0.beta1)
-    builder (3.2.2)
-    bump (0.5.0)
-    coderay (1.1.0)
-    database_cleaner (1.3.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    globalid (0.3.0)
-      activesupport (>= 4.1.0)
-    hike (1.2.3)
-    i18n (0.7.0.beta1)
-    json (1.8.1)
-    loofah (2.0.1)
-      nokogiri (>= 1.5.9)
-    mail (2.6.1)
-      mime-types (>= 1.16, < 3)
-    method_source (0.8.2)
-    mime-types (2.3)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
-    multi_json (1.10.1)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    pg (0.17.1)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.0.beta)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.2.0.beta2)
-      actionmailer (= 4.2.0.beta2)
-      actionpack (= 4.2.0.beta2)
-      actionview (= 4.2.0.beta2)
-      activejob (= 4.2.0.beta2)
-      activemodel (= 4.2.0.beta2)
-      activerecord (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.beta2)
-      sprockets-rails (~> 3.0.0.beta1)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.3)
-      activesupport
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
-      loofah (~> 2.0)
-    railties (4.2.0.beta2)
-      actionpack (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    redis (3.1.0)
-    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.5)
-      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.2)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.1)
-    rufus-scheduler (2.0.6)
-    slop (3.6.0)
-    sprockets (2.12.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (3.0.0.beta1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (~> 2.8)
-    syck (1.0.4)
-    test_after_commit (0.3.0)
-      activerecord (>= 3.2)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    timecop (0.7.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    wwtd (0.5.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  canvas-jobs!
-  database_cleaner
-  pg
-  pry
-  rails (~> 4.2.0.beta2)
-  rake
-  rspec
-  syck
-  test_after_commit
-  timecop
-  wwtd