Merge branch 'resque-2.0-support'

Author: benlangfeld

Gemfile.lock

@@ -1,48 +1,59 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
-    builder (3.2.2)
-    faraday (0.7.6)
-      addressable (~> 2.2)
-      multipart-post (~> 1.1)
-      rack (~> 1.1)
-    git (1.2.6)
-    github_api (0.4.10)
-      faraday (~> 0.7.6)
-      hashie (~> 1.2.0)
-      multi_json (~> 1.0)
-      oauth2 (~> 0.5.2)
-    hashie (1.2.0)
-    highline (1.6.20)
-    jeweler (2.0.0)
+    addressable (2.4.0)
+    builder (3.2.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (4.1.0)
+    highline (2.0.3)
+    jeweler (2.3.9)
       builder
-      bundler (>= 1.0)
+      bundler
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych
       rake
       rdoc
-    json (1.8.1)
+      semver2
+    jwt (2.2.2)
     metaclass (0.0.2)
-    mini_portile (0.5.2)
+    mime-types (2.99.3)
+    mini_portile2 (2.4.0)
     minitest (5.5.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    multipart-post (1.2.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
-      multi_json (~> 1.0)
-    rack (1.4.1)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (3.2.0)
+    rack (1.6.13)
     rack-protection (1.2.0)
       rack
-    rake (10.1.1)
-    rdoc (4.1.1)
-      json (~> 1.4)
+    rake (13.0.1)
+    rchardet (1.8.0)
+    rdoc (6.2.1)
     redis (3.0.2)
     redis-namespace (1.2.1)
       redis (~> 3.0.0)
@@ -51,10 +62,12 @@ GEM
       redis-namespace (~> 1.0)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
+    semver2 (3.4.2)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
+    thread_safe (0.3.6)
     tilt (1.3.3)
     vegas (0.1.11)
       rack (>= 1.0.0)
@@ -67,3 +80,6 @@ DEPENDENCIES
   minitest (~> 5.5)
   mocha (~> 0.9)
   resque (~> 1.19)
+
+BUNDLED WITH
+   2.1.4

Rakefile

@@ -8,7 +8,7 @@ require 'resque/tasks'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "resque-status"
+    gem.name = "powerhome-resque-status"
     gem.version = Resque::Plugins::Status::VERSION
     gem.summary = %Q{resque-status is an extension to the resque queue system that provides simple trackable jobs.}
     gem.description = %Q{resque-status is an extension to the resque queue system that provides simple trackable jobs. It provides a Resque::Plugins::Status::Hash class which can set/get the statuses of jobs and a Resque::Plugins::Status class that when included provides easily trackable/killable jobs.}

lib/resque/plugins/status.rb

@@ -28,7 +28,7 @@ module Plugins
     # This job would iterate num times updating the status as it goes. At the end
     # we update the status telling anyone listening to this job that its complete.
     module Status
-      VERSION = '0.5.0'
+      VERSION = '0.6.0'
 
       STATUS_QUEUED = 'queued'
       STATUS_WORKING = 'working'

powerhome-resque-status.gemspec

@@ -59,4 +59,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>.freeze, [">= 0"])
   end
 end
-

resque-status.gemspec

@@ -51,15 +51,14 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<resque>, ["~> 1.19"])
+      s.add_runtime_dependency(%q<resque>, [">= 1.19", "< 3"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<resque>, ["~> 1.19"])
+      s.add_dependency(%q<resque>, [">= 1.19", "< 3"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<resque>, ["~> 1.19"])
+    s.add_dependency(%q<resque>, [">= 1.19", "< 3"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
-