resque-status 0.4.1 → 0.4.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 323c2f3b3316e4beac0112382865580010032cd9
+  data.tar.gz: bed8bbe784ec2165cd79b9e92b035456e45890ce
+SHA512:
+  metadata.gz: 0a2dd540a7e6be2758f84b0150c3a165f5bc8b439131327e3174a87a697a409b617c73cb572855a2347cca4f4723d8fc3d2e666a711c7fa2e9d84a4444bf269f
+  data.tar.gz: 0b991464b6f793b216b518586b6b23a20ffc19ce2c89265f9af571e88bb085ae1e12eb6a5d2a8a6e6bb2192273f0849286973aaddc6ba1a8d73fc557347a8c47

data/Gemfile

@@ -1,9 +1,9 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'resque', '~>1.19'
 
 group :test do
-  gem 'mocha', '~>0.9.8'
+  gem 'mocha', '~>0.9'
   gem 'shoulda', '~>2.10.2'
 end
 

data/Gemfile.lock

@@ -1,20 +1,46 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    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)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.7.5)
-    mocha (0.9.12)
+    json (1.8.1)
+    metaclass (0.0.2)
+    mini_portile (0.5.2)
+    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)
     rack-protection (1.2.0)
       rack
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.1.1)
+    rdoc (4.1.1)
       json (~> 1.4)
     redis (3.0.2)
     redis-namespace (1.2.1)
@@ -38,6 +64,6 @@ PLATFORMS
 
 DEPENDENCIES
   jeweler
-  mocha (~> 0.9.8)
+  mocha (~> 0.9)
   resque (~> 1.19)
   shoulda (~> 2.10.2)

data/README.rdoc

@@ -136,9 +136,18 @@ error and set the status to killed.
 
 Since Redis is RAM based, we probably don't want to keep these statuses around forever 
 (at least until @antirez releases the VM feature). By setting expire_in, all statuses
-and thier related keys will expire in expire_in seconds from the last time theyre updated:
+and their related keys will expire in expire_in seconds from the last time theyre updated:
 
   Resque::Plugins::Status::Hash.expire_in = (60 * 60) # 1 hour
+=== Testing
+
+Recent versions of Resque introduced `Resque.inline` which changes the behavior to 
+instead of enqueueing and performing jobs to just executing them inline. In Resque
+itself this removes the dependency on a Redis, however, `Resque::Status` uses Redis
+to store information about jobs, so though `inline` "works", you will still need
+to use or mock a redis connection. You should be able to use a library like 
+https://github.com/causes/mock_redis alongside `inline` if you really want to
+avoid Redis connections in your test.
 
 === resque-web
 

data/Rakefile

@@ -18,7 +18,7 @@ begin
     gem.authors = ["Aaron Quint"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-  Jeweler::GemcutterTasks.new
+  Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
@@ -46,13 +46,3 @@ end
 task :test
 
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "resque-status #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/resque/plugins/status.rb

@@ -28,7 +28,20 @@ module Resque
     # 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.4.1'
+      VERSION = '0.4.2'
+
+      STATUS_QUEUED = 'queued'
+      STATUS_WORKING = 'working'
+      STATUS_COMPLETED = 'completed'
+      STATUS_FAILED = 'failed'
+      STATUS_KILLED = 'killed'
+      STATUSES = [
+        STATUS_QUEUED,
+        STATUS_WORKING,
+        STATUS_COMPLETED,
+        STATUS_FAILED,
+        STATUS_KILLED
+      ].freeze
 
       autoload :Hash, 'resque/plugins/status/hash'
 
@@ -144,7 +157,7 @@ module Resque
       # If an error occurs within the job's work, it will set the status as failed and
       # re-raise the error.
       def safe_perform!
-        set_status({'status' => 'working'})
+        set_status({'status' => STATUS_WORKING})
         perform
         if status && status.failed?
           on_failure(status.message) if respond_to?(:on_failure)
@@ -206,18 +219,18 @@ module Resque
       # <tt>Resque::Plugins::Status::Hash.kill()</tt>
       def tick(*messages)
         kill! if should_kill?
-        set_status({'status' => 'working'}, *messages)
+        set_status({'status' => STATUS_WORKING}, *messages)
       end
 
       # set the status to 'failed' passing along any additional messages
       def failed(*messages)
-        set_status({'status' => 'failed'}, *messages)
+        set_status({'status' => STATUS_FAILED}, *messages)
       end
 
       # set the status to 'completed' passing along any addional messages
       def completed(*messages)
         set_status({
-          'status' => 'completed',
+          'status' => STATUS_COMPLETED,
           'message' => "Completed at #{Time.now}"
         }, *messages)
       end
@@ -225,7 +238,7 @@ module Resque
       # kill the current job, setting the status to 'killed' and raising <tt>Killed</tt>
       def kill!
         set_status({
-          'status' => 'killed',
+          'status' => STATUS_KILLED,
           'message' => "Killed at #{Time.now}"
         })
         raise Killed

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

@@ -9,8 +9,6 @@ module Resque
       # creating/updating/retrieving status objects from Redis
       class Hash < ::Hash
 
-        extend Resque::Helpers
-
         # Create a status, generating a new UUID, passing the message to the status
         # Returns the UUID of the new status.
         def self.create(uuid, *messages)
@@ -87,9 +85,8 @@ module Resque
         # @example retuning the last 20 statuses
         #   Resque::Plugins::Status::Hash.statuses(0, 20)
         def self.statuses(range_start = nil, range_end = nil)
-          status_ids(range_start, range_end).collect do |id|
-            get(id)
-          end.compact
+          ids = status_ids(range_start, range_end)
+          mget(ids).compact
         end
 
         # Return the <tt>num</tt> most recent status/job UUIDs in reverse chronological order.
@@ -190,7 +187,12 @@ module Resque
           EOT
         end
 
-        STATUSES = %w{queued working completed failed killed}.freeze
+        # Proxy deprecated methods directly back to Resque itself.
+        class << self
+          [:redis, :encode, :decode].each do |method|
+            define_method(method) { |*args| Resque.send(method, *args) }
+          end
+        end
 
         hash_accessor :uuid
         hash_accessor :name
@@ -210,7 +212,7 @@ module Resque
           super nil
           base_status = {
             'time' => Time.now.to_i,
-            'status' => 'queued'
+            'status' => Resque::Plugins::Status::STATUS_QUEUED
           }
           base_status['uuid'] = args.shift if args.length > 1
           status_hash = args.inject(base_status) do |final, m|
@@ -223,9 +225,10 @@ module Resque
         # calculate the % completion of the job based on <tt>status</tt>, <tt>num</tt>
         # and <tt>total</tt>
         def pct_complete
-          case status
-          when 'completed' then 100
-          when 'queued' then 0
+          if completed?
+            100
+          elsif queued?
+            0
           else
             t = (total == 0 || total.nil?) ? 1 : total
             (((num || 0).to_f / t.to_f) * 100).to_i
@@ -238,16 +241,16 @@ module Resque
           time? ? Time.at(self['time']) : nil
         end
 
-        STATUSES.each do |status|
+        Resque::Plugins::Status::STATUSES.each do |status|
           define_method("#{status}?") do
             self['status'] === status
           end
         end
 
-        # Can the job be killed? 'failed', 'completed', and 'killed' jobs cant be killed
-        # (for pretty obvious reasons)
+        # Can the job be killed? failed, completed, and killed jobs can't be
+        # killed, for obvious reasons
         def killable?
-          !['failed', 'completed', 'killed'].include?(self.status)
+          !failed? && !completed? && !killed?
         end
 
         unless method_defined?(:to_json)

data/lib/resque/server/views/status.erb

@@ -67,7 +67,7 @@
           }
         };
         var status = $status.attr('rel');
-        if (status == 'working' || status == 'queued' || status == "") {
+        if (status == '<%= Resque::Plugins::Status::STATUS_WORKING %>' || status == '<%= Resque::Plugins::Status::STATUS_QUEUED %>' || status == "") {
           setTimeout(function() {
             checkStatus($status)
           }, 1500);

data/resque-status.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: resque-status 0.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "resque-status"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Aaron Quint"]
-  s.date = "2013-01-26"
+  s.date = "2014-01-21"
   s.description = "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."
   s.email = "aaron@quirkey.com"
   s.extra_rdoc_files = [
@@ -41,13 +43,12 @@ Gem::Specification.new do |s|
     "test/test_resque_plugins_status_hash.rb"
   ]
   s.homepage = "http://github.com/quirkey/resque-status"
-  s.require_paths = ["lib"]
   s.rubyforge_project = "quirkey"
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.2.1"
   s.summary = "resque-status is an extension to the resque queue system that provides simple trackable jobs."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    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"])

data/test/test_helper.rb

@@ -4,7 +4,7 @@ $TESTING = true
 require 'test/unit'
 require 'rubygems'
 require 'shoulda'
-require 'mocha'
+require 'mocha/setup'
 
 require 'resque-status'
 

data/test/test_resque_plugins_status.rb

@@ -193,7 +193,6 @@ class TestResquePluginsStatus < Test::Unit::TestCase
       end
 
       should "set the status to killed" do
-        assert_equal 'killed', @status.status
         assert @status.killed?
         assert !@status.completed?
       end
@@ -227,11 +226,8 @@ class TestResquePluginsStatus < Test::Unit::TestCase
       end
 
       should "set the status to killed" do
-        assert_equal 'killed', @status1.status
         assert @status1.killed?
         assert !@status1.completed?
-
-        assert_equal 'killed', @status2.status
         assert @status2.killed?
         assert !@status2.completed?
       end
@@ -268,11 +264,8 @@ class TestResquePluginsStatus < Test::Unit::TestCase
       end
 
       should "set the status to killed" do
-        assert_equal 'completed', @status1.status
         assert !@status1.killed?
         assert @status1.completed?
-
-        assert_equal 'killed', @status2.status
         assert @status2.killed?
         assert !@status2.completed?
       end
@@ -304,7 +297,7 @@ class TestResquePluginsStatus < Test::Unit::TestCase
         end
 
         should "set status" do
-          assert_equal 'working', @job.status.status
+          assert @job.status.working?
         end
 
         should "save message" do
@@ -318,7 +311,7 @@ class TestResquePluginsStatus < Test::Unit::TestCase
         end
 
         should "set status" do
-          assert_equal 'failed', @job.status.status
+          assert @job.status.failed?
         end
 
         should "set message" do
@@ -332,7 +325,7 @@ class TestResquePluginsStatus < Test::Unit::TestCase
         end
 
         should "set status" do
-          assert_equal 'completed', @job.status.status
+          assert @job.status.completed?
         end
 
         should "set message" do
@@ -350,7 +343,7 @@ class TestResquePluginsStatus < Test::Unit::TestCase
         end
 
         should "set status as failed" do
-          assert_equal 'failed', @job.status.status
+          assert @job.status.failed?
         end
       end
 

data/test/test_resque_plugins_status_hash.rb

@@ -190,6 +190,27 @@ class TestResquePluginsStatusHash < Test::Unit::TestCase
       end
 
     end
+
+    Resque::Plugins::Status::STATUSES.each do |status_code|
+      context ".#{status_code}?" do
+
+        setup do
+          uuid = Resque::Plugins::Status::Hash.create(Resque::Plugins::Status::Hash.generate_uuid, {'status' => status_code})
+          @status = Resque::Plugins::Status::Hash.get(uuid)
+        end
+
+        should "return true for the current status" do
+          assert @status.send("#{status_code}?"), status_code
+        end
+
+        should "return false for other statuses" do
+          (Resque::Plugins::Status::STATUSES - [status_code]).each do |other_status_code|
+            assert !@status.send("#{other_status_code}?"), other_status_code
+          end
+        end
+
+      end
+    end
   end
 
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: resque-status
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - Aaron Quint
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.19'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: resque-status is an extension to the resque queue system that provides
@@ -54,7 +49,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .document
+- ".document"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -78,30 +73,26 @@ files:
 - test/test_resque_plugins_status_hash.rb
 homepage: http://github.com/quirkey/resque-status
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3693274209748855583
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: quirkey
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: resque-status is an extension to the resque queue system that provides simple
   trackable jobs.
 test_files: []