resque_solo 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d4f959f0665b35ce76f33a23eef5e18aade292
-  data.tar.gz: c67470bf93eb65838599478b4aeafcef7801f81a
+  metadata.gz: dc87df1fa353f94c1d75b20c2dc6ef9f5978637b
+  data.tar.gz: 51df2fed96c31280f6ed8fb64851529fc75fcda4
 SHA512:
-  metadata.gz: 48bfa1dde895f27c45112dbb3e39b3fd54e9b91fafa9cc142b471b18c68be74d59ce67fe2357c8104eea5d7611e94eed061fa1b374874c561980cd5cc82caa88
-  data.tar.gz: c1459dca21cb192f986fdb8f447226d66794f4d26f3b666cf27fe525cbc59ae36eb83e47d55d012f14a6a2b5146ebcc1f7487ad79c170263781fc33547475df3
+  metadata.gz: 927e45014a436a39aba1017cbd153d43218f3d82bee878f88f1efbc0e0d0d86e854eb03b46a626df9ad377c77b73e2e76286e7c73fb314cd9466fa8ef4e1ccf6
+  data.tar.gz: ab499a6bb2587de31fd05a37d4092a59a79572d67e1349ff86d836066b85249be8d7505883935e187b81e25f5f2d3fa19055f4658f3e05b5a680bc45e90fde3c

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.1.1

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.1
   - 2.0.0
+  - 1.9.3

data/Gemfile

@@ -1,12 +1,9 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem 'test-unit'
-  gem 'mocha'
-  gem 'shoulda-context'
-  gem 'pry'
-  gem 'pry-byebug', platform: :mri_20
-  gem 'fakeredis'
+  unless ENV['TRAVIS']
+    gem 'pry-byebug', platform: :mri_21
+  end
   gem 'simplecov', require: false
 end
 

data/README.md

@@ -1,9 +1,9 @@
 # ResqueSolo
 
-[![Gem Version](https://badge.fury.io/rb/resque_solo.png)][gem]
-[![Build Status](https://api.travis-ci.org/neighborland/resque_solo.png)][build]
+[![Gem Version](http://img.shields.io/gem/v/resque_solo.svg)][gem]
+[![Build Status](http://img.shields.io/travis/neighborland/resque_solo.svg)][build]
 
-[gem]: http://badge.fury.io/rb/resque_solo
+[gem]: http://rubygems.org/gems/resque_solo
 [build]: https://travis-ci.org/neighborland/resque_solo
 
 ResqueSolo is a resque plugin to add unique jobs to resque.
@@ -18,7 +18,9 @@ It removes the dependency on `Resque::Helpers`, which is deprecated for resque 2
 
 Add the gem to your Gemfile:
 
-    gem 'resque_solo'
+```ruby
+gem 'resque_solo'
+```
 
 ## Usage
 
@@ -49,3 +51,16 @@ Resque.enqueued? UpdateCat, 1
 Resque.enqueued_in? :dogs, UpdateCat, 1
 => false
 ```
+
+### Options
+
+#### `lock_after_execution_period`
+
+By default, lock_after_execution_period is 0 and `enqueued?` becomes false as soon as the job
+is being worked on.
+
+The `lock_after_execution_period` setting can be used to delay when the unique job key is deleted
+(i.e. when `enqueued?` becomes `false`). For example, if you have a long-running unique job that
+takes around 10 seconds, and you don't want to requeue another job until you are sure it is done,
+you could set `lock_after_execution_period = 20`. Or if you never want to run a long running
+job more than once per minute, set `lock_after_execution_period = 60`.

data/lib/resque_solo/version.rb

@@ -1,3 +1,3 @@
 module ResqueSolo
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/resque_solo.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "resque", "~> 1.25.1"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "fakeredis", "~> 0.4"
+  spec.add_development_dependency "minitest", "~> 5.3"
+  spec.add_development_dependency "rake", "~> 10.1"
 end

data/test/job_test.rb

@@ -1,17 +1,17 @@
 require 'test_helper'
 
-class JobTest < Test::Unit::TestCase
-  setup do
+class JobTest < MiniTest::Spec
+  before do
     Resque.redis.flushall
   end
 
-  should "enqueue identical jobs once" do
+  it "enqueue identical jobs once" do
     Resque.enqueue FakeUniqueJob, "x"
     Resque.enqueue FakeUniqueJob, "x"
     assert_equal 1, Resque.size(:unique)
   end
 
-  should "allow the same jobs to be executed one after the other" do
+  it "allow the same jobs to be executed one after the other" do
     Resque.enqueue FakeUniqueJob, "foo"
     Resque.enqueue FakeUniqueJob, "foo"
     assert_equal 1, Resque.size(:unique)
@@ -22,19 +22,19 @@ class JobTest < Test::Unit::TestCase
     assert_equal 1, Resque.size(:unique)
   end
 
-  should "consider equivalent hashes regardless of key order" do
+  it "consider equivalent hashes regardless of key order" do
     Resque.enqueue FakeUniqueJob, bar: 1, foo: 2
     Resque.enqueue FakeUniqueJob, foo: 2, bar: 1
     assert_equal 1, Resque.size(:unique)
   end
 
-  should "treat string and symbol keys equally" do
+  it "treat string and symbol keys equally" do
     Resque.enqueue FakeUniqueJob, bar: 1, foo: 1
     Resque.enqueue FakeUniqueJob, bar: 1, "foo" => 1
     assert_equal 1, Resque.size(:unique)
   end
 
-  should "mark jobs as unqueued, when Job.destroy is killing them" do
+  it "mark jobs as unqueued, when Job.destroy is killing them" do
     Resque.enqueue FakeUniqueJob, "foo"
     Resque.enqueue FakeUniqueJob, "foo"
     assert_equal 1, Resque.size(:unique)
@@ -45,7 +45,7 @@ class JobTest < Test::Unit::TestCase
     assert_equal 1, Resque.size(:unique)
   end
 
-  should "mark jobs as unqueued when they raise an exception" do
+  it "mark jobs as unqueued when they raise an exception" do
     2.times { Resque.enqueue( FailingUniqueJob, "foo" ) }
     assert_equal 1, Resque.size(:unique)
     worker = Resque::Worker.new(:unique)
@@ -55,13 +55,13 @@ class JobTest < Test::Unit::TestCase
     assert_equal 1, Resque.size(:unique)
   end
 
-  should "report if a unique job is enqueued" do
+  it "report if a unique job is enqueued" do
     Resque.enqueue FakeUniqueJob, "foo"
     assert Resque.enqueued?(FakeUniqueJob, "foo")
     refute Resque.enqueued?(FakeUniqueJob, "bar")
   end
 
-  should "report if a job is enqueued" do
+  it "report if a unique job is enqueued in another queue" do
     default_queue = FakeUniqueJob.instance_variable_get(:@queue)
     FakeUniqueJob.instance_variable_set(:@queue, :other)
     Resque.enqueue FakeUniqueJob, "foo"
@@ -70,7 +70,7 @@ class JobTest < Test::Unit::TestCase
     refute Resque.enqueued?(FakeUniqueJob, "foo")
   end
 
-  should "cleanup when a queue is destroyed" do
+  it "cleanup when a queue is destroyed" do
     Resque.enqueue FakeUniqueJob, "foo"
     Resque.enqueue FailingUniqueJob, "foo"
     Resque.remove_queue(:unique)
@@ -78,7 +78,7 @@ class JobTest < Test::Unit::TestCase
     assert_equal 1, Resque.size(:unique)
   end
 
-  should "honor ttl in the redis key" do
+  it "honor ttl in the redis key" do
     Resque.enqueue UniqueJobWithTtl
     assert Resque.enqueued?(UniqueJobWithTtl)
     keys = Resque.redis.keys "solo:queue:unique_with_ttl:job:*"
@@ -86,7 +86,7 @@ class JobTest < Test::Unit::TestCase
     assert_in_delta UniqueJobWithTtl.ttl, Resque.redis.ttl(keys.first), 2
   end
 
-  should "not allow the same job to be enqueued after execution if lock_after_execution_period is set" do
+  it "not allow the same job to be enqueued after execution if lock_after_execution_period is set" do
     Resque.enqueue UniqueJobWithLock, "foo"
     Resque.enqueue UniqueJobWithLock, "foo"
     assert_equal 1, Resque.size(:unique_with_lock)
@@ -96,7 +96,7 @@ class JobTest < Test::Unit::TestCase
     assert_equal 0, Resque.size(:unique_with_lock)
   end
 
-  should "honor lock_after_execution_period in the redis key" do
+  it "honor lock_after_execution_period in the redis key" do
     Resque.enqueue UniqueJobWithLock
     Resque.reserve(:unique_with_lock)
     keys = Resque.redis.keys "solo:queue:unique_with_lock:job:*"
@@ -104,4 +104,4 @@ class JobTest < Test::Unit::TestCase
     assert_in_delta UniqueJobWithLock.lock_after_execution_period, Resque.redis.ttl(keys.first), 2
   end
   
-end
+end

data/test/queue_test.rb

@@ -1,54 +1,54 @@
 require 'test_helper'
 
 module ResqueSolo
-  class QueueTest < Test::Unit::TestCase
-    context ".is_unique?" do
-      should "be false for non-unique job" do
+  class QueueTest < MiniTest::Spec
+    describe ".is_unique?" do
+      it "is false for non-unique job" do
         refute Queue.is_unique?(class: 'FakeJob')
       end
   
-      should "be false for invalid job class" do
+      it "is false for invalid job class" do
         refute Queue.is_unique?(class: 'InvalidJob')
       end
   
-      should "be true for unique job" do
+      it "is true for unique job" do
         assert Queue.is_unique?(class: 'FakeUniqueJob')
       end
     end
     
-    context ".item_ttl" do
-      should "be -1 for non-unique job" do
+    describe ".item_ttl" do
+      it "is -1 for non-unique job" do
         assert_equal -1, Queue.item_ttl(class: 'FakeJob')
       end
 
-      should "be -1 for invalid job class" do
+      it "is -1 for invalid job class" do
         assert_equal -1, Queue.item_ttl(class: 'InvalidJob')
       end
 
-      should "be -1 for unique job" do
+      it "is -1 for unique job" do
         assert_equal -1, Queue.item_ttl(class: 'FakeUniqueJob')
       end
 
-      should "be job TTL" do
+      it "is job TTL" do
         assert_equal 300, UniqueJobWithTtl.ttl
         assert_equal 300, Queue.item_ttl(class: 'UniqueJobWithTtl')
       end
     end
 
-    context ".lock_after_execution_period" do
-      should "be 0 for non-unique job" do
+    describe ".lock_after_execution_period" do
+      it "is 0 for non-unique job" do
         assert_equal 0, Queue.lock_after_execution_period(class: 'FakeJob')
       end
 
-      should "be 0 for invalid job class" do
+      it "is 0 for invalid job class" do
         assert_equal 0, Queue.lock_after_execution_period(class: 'InvalidJob')
       end
 
-      should "be 0 for unique job" do
+      it "is 0 for unique job" do
         assert_equal 0, Queue.lock_after_execution_period(class: 'FakeUniqueJob')
       end
 
-      should "be job lock period" do
+      it "is job lock period" do
         assert_equal 150, UniqueJobWithLock.lock_after_execution_period
         assert_equal 150, Queue.lock_after_execution_period(class: 'UniqueJobWithLock')
       end

data/test/resque_test.rb

@@ -1,30 +1,26 @@
 require 'test_helper'
 
-class ResqueTest < Test::Unit::TestCase
-  setup do
+class ResqueTest < MiniTest::Spec
+  before do
     Resque.redis.flushall
   end
 
-  should "be a valid plugin" do
-    assert_nothing_raised do
-      Resque::Plugin.lint(Resque::Plugins::UniqueJob)
-    end
+  it "is a valid plugin" do
+    Resque::Plugin.lint(Resque::Plugins::UniqueJob)
   end
 
-  should "enqueue normal jobs" do
+  it "enqueues normal jobs" do
     Resque.enqueue FakeJob, "x"
     Resque.enqueue FakeJob, "x"
     assert_equal 2, Resque.size(:normal)
   end
 
-  should "not be able to report if a non-unique job was enqueued" do
+  it "is not able to report if a non-unique job was enqueued" do
     assert_nil Resque.enqueued?(FakeJob)
   end
 
-  should "not raise when deleting an empty queue" do
-    assert_nothing_raised do
-      Resque.remove_queue(:unique)
-    end
+  it "does not raise when deleting an empty queue" do
+    Resque.remove_queue(:unique)
   end
 
-end
+end

data/test/test_helper.rb

@@ -3,13 +3,10 @@ if ENV['SIMPLE_COV']
   SimpleCov.start
 end
 
-require 'test/unit'
-require 'shoulda-context'
-require 'mocha/setup'
+require 'minitest/autorun'
 require 'resque_solo'
 require 'fake_jobs'
 require 'fakeredis'
-require 'pry'
 begin
   require 'pry-byebug'
 rescue LoadError

data/test/unique_job_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
 
-class UniqueJobTest < Test::Unit::TestCase
+class UniqueJobTest < MiniTest::Spec
 
-end
+end

metadata

@@ -1,57 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: resque_solo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.25.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.25.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: fakeredis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 description: Resque plugin to add unique jobs
 email:
 - tee@neighborland.com
@@ -59,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -89,17 +117,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Resque plugin to add unique jobs
@@ -110,3 +138,4 @@ test_files:
 - test/resque_test.rb
 - test/test_helper.rb
 - test/unique_job_test.rb
+has_rdoc: