resque-state 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 780ed4ffab1f5d88c532ed4e505cf9bf80efa584
-  data.tar.gz: 55857ef7b3c22c689e496dd7e2758bd74cd048a6
+  metadata.gz: e6d273747a4e0e9ff742ca78d51ae527f7491436
+  data.tar.gz: 7173728a40965a95e3cec373371e496efc975447
 SHA512:
-  metadata.gz: '0309cc6512943aed87f89aa0f49a209753609c49a1f27f569edb105c012088adf460e0ecb8709a6f73cf0a67c0fa706b39600a4b38181c814314c53c934208c8'
-  data.tar.gz: 49fcf5105f608210123c50e6beada0d0ed0f32e012c51758da30a484f98f45c6fa72c35bea16d1adf1f9a2049d92b3f9f0f4d717fa941cac5806f11646c95e51
+  metadata.gz: 2fbc76bf64f13a5370d4eb645961f27221ba3bc344e8899be6cb890451ca5582166f964c92849cae669869f2321c66308716051de753d616b54a5a07aec9d539
+  data.tar.gz: ada1680c114551d58fa864b21b74feae1c4418d449d6c72604f980f714073ce6b15aed10be3c8b100ee232a518064f5f6321e5b3c7f6f6fbda3a1ad556a46bc8

data/lib/resque/plugins/state.rb

@@ -30,7 +30,7 @@ module Resque
     # end we update the status telling anyone listening to this job that its
     # complete.
     module State
-      VERSION = '1.1.0'.freeze
+      VERSION = '1.1.1'.freeze
 
       STATUS_QUEUED = 'queued'.freeze
       STATUS_WORKING = 'working'.freeze
@@ -189,16 +189,10 @@ module Resque
         on_killed if respond_to?(:on_killed)
       rescue Revert
         Resque::Plugins::State::Hash.revert(uuid)
-        if respond_to?(:on_revert)
-          on_revert
-          messages = ["Reverted at #{Time.now}"]
-          job_status('status' => STATUS_REVERTED,
-                     'message' => messages[0])
-        else
-          @logger.error("Job #{@uuid}: Attempted revert on job with no revert"\
-                        " support")
-          pause!('This job does not support revert functionality')
-        end
+        on_revert
+        messages = ["Reverted at #{Time.now}"]
+        job_status('status' => STATUS_REVERTED,
+                   'message' => messages[0])
       rescue => e
         messages = ["Failed at #{Time.now}: #{e.message}"]
         @logger.error("Job #{@uuid}: #{messages.join(' ')}")
@@ -314,13 +308,20 @@ module Resque
       # revert the current job, setting the status to 'reverting' and raising
       # <tt>Revert</tt>
       def revert!
-        messages = ["Reverting at #{Time.now}"]
-        Resque::Plugins::State::Hash.unpause(uuid) if should_pause?
-        @reverting = true
-        job_status('status' => STATUS_REVERTING,
-                   'message' => messages[0])
-        @logger.info("Job #{@uuid}: #{messages.join(' ')}")
-        raise Revert
+        if respond_to?(:on_revert)
+          messages = ["Reverting at #{Time.now}"]
+          Resque::Plugins::State::Hash.unpause(uuid) if should_pause?
+          @reverting = true
+          job_status('status' => STATUS_REVERTING,
+                     'message' => messages[0])
+          @logger.info("Job #{@uuid}: #{messages.join(' ')}")
+          raise Revert
+        else
+          @logger.error("Job #{@uuid}: Attempted revert on job with no revert"\
+                        " support")
+          Resque::Plugins::State::Hash.no_revert(@uuid)
+          pause!('This job does not support revert functionality')
+        end
       end
 
       # pause the current job, setting the status to 'paused' and sleeping 10

data/lib/resque/plugins/state/hash.rb

@@ -195,6 +195,12 @@ module Resque
           redis.sadd(revert_key, uuid)
         end
 
+        # Remove the job at UUID from the revert list; needed to handle jobs
+        # that don't support revert
+        def self.no_revert(uuid)
+          redis.srem(revert_key, uuid)
+        end
+
         # Return the UUIDs of the jobs on the revert list
         def self.revert_ids
           redis.smembers(revert_key)

data/resque-state.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: resque-state 1.1.0 ruby lib
+# stub: resque-state 1.1.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "resque-state"
-  s.version = "1.1.0"
+  s.name = "resque-state".freeze
+  s.version = "1.1.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Aaron Quint", "Nathan V"]
-  s.date = "2017-06-17"
-  s.description = "resque-state is an extension to the resque queue system that provides simple trackable jobs. It provides a Resque::Plugins::State::Hash class which can set/get the statuses of jobs and a Resque::Plugins::State class that, when included, provides easily trackable/killable/pausable jobs."
-  s.email = "nathan.v@gmail.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Aaron Quint".freeze, "Nathan V".freeze]
+  s.date = "2017-08-02"
+  s.description = "resque-state is an extension to the resque queue system that provides simple trackable jobs. It provides a Resque::Plugins::State::Hash class which can set/get the statuses of jobs and a Resque::Plugins::State class that, when included, provides easily trackable/killable/pausable jobs.".freeze
+  s.email = "nathan.v@gmail.com".freeze
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -41,25 +41,25 @@ Gem::Specification.new do |s|
     "test/test_resque_plugins_state.rb",
     "test/test_resque_plugins_state_hash.rb"
   ]
-  s.homepage = "http://github.com/nathan-v/resque-state"
-  s.licenses = ["MIT"]
-  s.rubyforge_project = "nathan-v"
-  s.rubygems_version = "2.4.5"
-  s.summary = "resque-state is an extension to the resque queue system that provides simple trackable jobs."
+  s.homepage = "http://github.com/nathan-v/resque-state".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubyforge_project = "nathan-v".freeze
+  s.rubygems_version = "2.6.11".freeze
+  s.summary = "resque-state is an extension to the resque queue system that provides simple trackable jobs.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<resque>, ["~> 1.27"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.3"])
+      s.add_runtime_dependency(%q<resque>.freeze, ["~> 1.27"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3"])
     else
-      s.add_dependency(%q<resque>, ["~> 1.27"])
-      s.add_dependency(%q<jeweler>, ["~> 2.3"])
+      s.add_dependency(%q<resque>.freeze, ["~> 1.27"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
     end
   else
-    s.add_dependency(%q<resque>, ["~> 1.27"])
-    s.add_dependency(%q<jeweler>, ["~> 2.3"])
+    s.add_dependency(%q<resque>.freeze, ["~> 1.27"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-state
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Aaron Quint
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nathan-v
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: resque-state is an extension to the resque queue system that provides simple