resqutils 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f57266b7682198b7c27f8268ebc9b27ef8635ed4
-  data.tar.gz: a9d48a1bb58181da264051574ca5eeac89d6c951
+  metadata.gz: a80c8babeebfe016d723913e3526e2b20970d672
+  data.tar.gz: 19828b603b4b2f7f991e03e2be56f4a441a29fae
 SHA512:
-  metadata.gz: 030106d9602805a8ade0f0d8993d56fbde5cdb8babc91d6eb4097a6de21ebbe25b406a62fa92c746f6f08935c14ab3f51d645595bb5d70c268d51b664ed31b62
-  data.tar.gz: edef10efbffa408e8b57546ce739d44b503593dc1ce9a8d182148da1f7f3fd022ea3fe1582ad236e3b9a7b22a84193c0b84cd91dc3ca62950ca4237ee62cd5e3
+  metadata.gz: d1d995e26e2361f9d040631b922f1c495da746109a2ff9217f2dd544a7baa155281394b0729790c2b95c1cb38242a0c81ded71950ba43e61697ce5f2415203ea
+  data.tar.gz: ef07f5f0aa385e580f7bb6141ca61e27aaefe0aa31a466517fd9d105a10ba68cde2d898a5958a94a712f618eb3135cecffe74a16d5ef3b6d89f1829260d31ddc

data/.travis.yml

@@ -2,3 +2,9 @@ language: ruby
 rvm:
   - 2.1.0
   - 2.2.0
+  - 2.0.0
+  - 1.9.3
+  - ruby-head
+gemfile:
+  - Gemfile
+  - gemfiles/rspec2.gemfile

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,6 @@
+# Code of Conduct
+
+We are committed to keeping our community open and inclusive.
+
+**Our Code of Conduct can be found here**:
+http://opensource.stitchfix.com/code-of-conduct.html

data/CONTRIBUTING.md

@@ -0,0 +1,18 @@
+# Contributing
+Thanks for using and improving *resqutils*! If you'd like to help out, check out [the project's issues list](https://github.com/stitchfix/resqutils/issues) for ideas on what could be improved.  If there's an idea you'd like to propose, or a design change, feel free to file a new issue or send a pull request:
+
+1. [Fork][fork] the repo.
+1. [Create a topic branch.][branch]
+1. Write tests.
+1. Implement your feature or fix bug.
+1. Add, commit, and push your changes.
+1. [Submit a pull request.][pr]
+
+[fork]: https://help.github.com/articles/fork-a-repo/
+[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/
+[pr]: https://help.github.com/articles/using-pull-requests/
+
+## General Guidelines
+
+* When in doubt, test it.  If you can't test it, re-think what you are doing.
+* Code formatting and internal application architecture should be consistent.

data/Gemfile.lock

@@ -1,19 +1,21 @@
 PATH
   remote: .
   specs:
-    resqutils (1.1.1)
+    resqutils (1.2.0)
       resque
 
 GEM
   remote: https://www.rubygems.org/
   specs:
     diff-lcs (1.2.5)
+    fakeredis (0.5.0)
+      redis (~> 3.0)
     mono_logger (1.1.0)
-    multi_json (1.11.0)
-    rack (1.6.1)
+    multi_json (1.11.2)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
-    rake (10.3.2)
+    rake (10.4.2)
     redis (3.2.1)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
@@ -23,18 +25,19 @@ GEM
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.2)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.0)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -47,6 +50,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  fakeredis
   rake
   resqutils!
   rspec
+
+BUNDLED WITH
+   1.10.6

data/gemfiles/rspec2.gemfile

@@ -0,0 +1,7 @@
+source 'https://www.rubygems.org'
+
+group :test, :development do
+  gem "rspec", "~> 2"
+end
+
+gemspec path: "../"

data/gemfiles/rspec2.gemfile.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: ../
+  specs:
+    resqutils (1.1.1)
+      resque
+
+GEM
+  remote: https://www.rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    fakeredis (0.5.0)
+      redis (~> 3.0)
+    mono_logger (1.1.0)
+    multi_json (1.11.2)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    rake (10.4.2)
+    redis (3.2.1)
+    redis-namespace (1.5.2)
+      redis (~> 3.0, >= 3.0.4)
+    resque (1.25.2)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.4)
+    sinatra (1.4.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    tilt (2.0.1)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakeredis
+  rake
+  resqutils!
+  rspec (~> 2)
+
+BUNDLED WITH
+   1.10.6

data/lib/resqutils/spec/resque_matchers.rb

@@ -12,7 +12,13 @@ RSpec::Matchers.define :have_job_queued do |expected_job_hash|
     jobs_matching(queue_name,expected_job_hash).first.size == 1
   end
 
-  failure_message_for_should do |queue_name|
+  failure_message_method = if defined?(failure_message)
+                             :failure_message
+                           else
+                             :failure_message_for_should
+                           end
+
+  send(failure_message_method) do |queue_name|
     matching_jobs,all_jobs = jobs_matching(queue_name,expected_job_hash)
     if matching_jobs.empty?
       "No jobs in #{queue_name} matched #{expected_job_hash.inspect} (Found these jobs: #{all_jobs.map(&:inspect).join(',')})"
@@ -21,7 +27,13 @@ RSpec::Matchers.define :have_job_queued do |expected_job_hash|
     end
   end
 
-  failure_message_for_should_not do |queue_name|
+  failure_message_when_negated_method = if defined?(failure_message_when_negated)
+                                          :failure_message_when_negated
+                                        else
+                                          :failure_message_for_should_not
+                                        end
+
+  send(failure_message_when_negated_method) do |queue_name|
     "Found job #{expected_job_hash.inspect} in the queue"
   end
 end

data/lib/resqutils/stale_workers_killer.rb

@@ -6,8 +6,8 @@ module Resqutils
       self.new.kill_stale_workers
     end
 
-    def initialize(stale_workers: nil)
-      @stale_workers = stale_workers || Resqutils::StaleWorkers.new
+    def initialize(options={})
+      @stale_workers = options.fetch(:stale_workers, Resqutils::StaleWorkers.new)
     end
     def kill_stale_workers
       @stale_workers.each do |worker|

data/lib/resqutils/version.rb

@@ -1,3 +1,3 @@
 module Resqutils
-  VERSION='1.1.1'
+  VERSION='1.2.0'
 end

data/resqutils.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "resqutils"
   s.version     = Resqutils::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Stitch Fix Engineering']
-  s.email       = ['opensource@stitchfix.com']
+  s.authors     = ["Stitch Fix Engineering","Dave Copeland","Simeon Willbanks"]
+  s.email       = ["opensource@stitchfix.com","davetron5000@gmail.com","simeon@simeons.net"]
   s.license     = "Apache License Version 2.0, January 2004"
   s.homepage    = "https://github.com/stitchfix/resqutils"
   s.summary     = "Utilities for using Resque in a Rails app"
@@ -17,7 +17,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency("resque")
+  s.add_runtime_dependency("resque")
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec")
+  s.add_development_dependency("fakeredis")
 end

data/spec/resque_matchers_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'rspec/version'
+
+describe "Resque RSpec custom matchers" do
+  include Resqutils::Spec::ResqueHelpers
+
+  context "have_job_queued" do
+    class BackgroundJob
+      @queue = :low
+
+      def self.perform
+      end
+    end
+
+    class Service
+      def expensive
+        Resque.enqueue(BackgroundJob)
+      end
+    end
+
+    before do
+      clear_queue(BackgroundJob)
+    end
+
+    it "asserts Resque job has been queued" do
+      Service.new.expensive
+
+      if RSpec::Version::STRING.start_with?("2")
+        "low".should have_job_queued(class: BackgroundJob, args: [])
+      else
+        expect("low").to have_job_queued(class: BackgroundJob, args: [])
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
+require 'fakeredis'
 require 'resque'
 require 'resqutils'
+require 'resqutils/spec'
 
 GEM_ROOT = File.expand_path(File.join(File.dirname(__FILE__),'..'))
 Dir["#{GEM_ROOT}/spec/support/**/*.rb"].sort.each {|f| require f}

data/spec/stale_workers_spec.rb

@@ -14,8 +14,11 @@ describe Resqutils::StaleWorkers do
       ]
     }
 
-    before do
+    after do
       ENV.delete("RESQUTILS_SECONDS_TO_BE_CONSIDERED_STALE")
+    end
+
+    before do
       allow(Resque).to receive(:workers).and_return(workers)
     end
 

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: resqutils
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Stitch Fix Engineering
+- Dave Copeland
+- Simeon Willbanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -52,9 +54,25 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeredis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Utilities for using Resque in a Rails app
 email:
 - opensource@stitchfix.com
+- davetron5000@gmail.com
+- simeon@simeons.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -63,11 +81,15 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rspec2.gemfile
+- gemfiles/rspec2.gemfile.lock
 - lib/resqutils.rb
 - lib/resqutils/do_not_auto_retry.rb
 - lib/resqutils/spec.rb
@@ -79,6 +101,7 @@ files:
 - lib/resqutils/worker_killer_job.rb
 - lib/resqutils/worker_task.rb
 - resqutils.gemspec
+- spec/resque_matchers_spec.rb
 - spec/spec_helper.rb
 - spec/stale_workers_killer_spec.rb
 - spec/stale_workers_spec.rb
@@ -109,6 +132,7 @@ signing_key:
 specification_version: 4
 summary: Utilities for using Resque in a Rails app
 test_files:
+- spec/resque_matchers_spec.rb
 - spec/spec_helper.rb
 - spec/stale_workers_killer_spec.rb
 - spec/stale_workers_spec.rb