resque-multi-step 2.0.3 → 2.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d6d2c398ee76b64007f81d35964f4ac066bdc107
+  data.tar.gz: 6e37fc56ecc6b3de66fb723bad899862116fd420
+SHA512:
+  metadata.gz: f57191578c45b3c7e8c7a8d6c0eebf69e60a3769472ef1e2b701ef3bb671e5cc20005b6323c7f331cdafcc5fc84c675e8fc90b28cad86a80c9a7552daecc23a5
+  data.tar.gz: 166077bb0374f0c0f7f70ead61dea736c52985aea7dbee361a3759be8b04cac3294a64feb1214171669beff48e5284ee20a5942d8f0ccb3ba8a019a5534c7a98

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'rake'
+gem 'jeweler'
+
 # Specify your gem's dependencies in resque-job-logger.gemspec
 gemspec

data/Gemfile.lock

@@ -11,12 +11,51 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.3.6)
+    builder (3.2.2)
     diff-lcs (1.2.2)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    git (1.2.8)
+    github_api (0.10.2)
+      addressable
+      faraday (~> 0.8.7)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (3.3.1)
+    highline (1.6.21)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+    json (1.8.1)
+    jwt (1.0.0)
+    mini_portile (0.6.0)
     mono_logger (1.0.0)
     multi_json (1.7.2)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     rack (1.5.2)
     rack-protection (1.5.0)
       rack
+    rake (10.3.2)
+    rdoc (4.1.1)
+      json (~> 1.4)
     redis (3.0.3)
     redis-namespace (1.2.1)
       redis (~> 3.0.0)
@@ -49,5 +88,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  jeweler
+  rake
   resque-multi-step!
   rspec

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.4

data/lib/resque/plugins/multi_step_task.rb

@@ -30,9 +30,7 @@ module Resque
 
         # A bit of randomness to ensure tasks are uniquely identified.
         def nonce
-          nonce = ""
-          5.times{nonce << NONCE_CHARS[rand(NONCE_CHARS.length)]}
-          nonce
+          5.times.map{NONCE_CHARS.sample}.join
         end
         
         # A redis client suitable for storing global mutli-step task info.
@@ -66,7 +64,6 @@ module Resque
           mst = new(task_id)
           mst.nuke
           redis.sadd("active-tasks", task_id)
-          redis.sismember("active-tasks", task_id)
           if block_given?
             yield mst
             mst.finalizable!
@@ -163,6 +160,7 @@ module Resque
       include Constantization
 
       attr_reader :task_id
+      attr_reader :started
       attr_accessor :logger
 
       extend AtomicCounters
@@ -181,6 +179,7 @@ module Resque
       # @param [String] task_id The UUID of the group of interest.
       def initialize(task_id)
         @task_id = task_id
+        @started = false
         redis.set 'start-time', Time.now.to_i
       end
 
@@ -218,11 +217,8 @@ module Resque
         increment_normal_job_count
         logger.debug("[Resque Multi-Step-Task] Adding #{job_type} job for #{task_id} (args: #{args})")
 
-        if synchronous?
-          self.class.perform(task_id, job_type.to_s, *args)
-        else
-          Resque::Job.create(queue_name, self.class, task_id, job_type.to_s, *args)
-        end
+        redis.rpush 'normal_jobs', Yajl::Encoder.encode([job_type.to_s, *args])
+        run_job job_type, *args if started
       end
 
       # Finalization jobs are performed after all the normal jobs
@@ -238,6 +234,25 @@ module Resque
         redis.rpush 'finalize_jobs', Yajl::Encoder.encode([job_type.to_s, *args])
       end
 
+      def start
+        unless started
+          while nrm_job_info = redis.lpop('normal_jobs')
+            job_class, *args = Yajl::Parser.parse(nrm_job_info)
+            run_job(job_class, *args)
+          end
+          @started = true
+        end
+        self
+      end
+
+      def run_job(job_type, *args)
+        if synchronous?
+          self.class.perform(task_id, job_type.to_s, *args)
+        else
+          Resque::Job.create(queue_name, self.class, task_id, job_type.to_s, *args)
+        end
+      end
+
       # A multi-step task is finalizable when all the normal jobs (see
       # #add_job) have been registered.  Finalization jobs will not be
       # executed until the task becomes finalizable regardless of the
@@ -257,6 +272,7 @@ module Resque
           # that just kicks off the finalization process
           assure_finalization if normal_job_count == 0
         end
+        start
       end
       
       def assure_finalization

data/resque-multi-step.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-multi-step"
-  s.version = "2.0.3"
+  s.version = "2.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Williams", "Morgan Whitney"]
-  s.date = "2014-02-05"
+  s.date = "2014-09-09"
   s.description = "Provides multi-step tasks with finalization and progress tracking"
   s.email = "pezra@barelyenough.org"
   s.extra_rdoc_files = [
@@ -53,8 +53,6 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<resque-multi-step>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<redis-namespace>, [">= 0"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_runtime_dependency(%q<resque>, [">= 0"])
@@ -62,8 +60,6 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<resque-multi-step>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<redis-namespace>, [">= 0"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_dependency(%q<resque>, [">= 0"])
@@ -72,8 +68,6 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<resque-multi-step>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<redis-namespace>, [">= 0"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
     s.add_dependency(%q<resque>, [">= 0"])

data/spec/acceptance/job_handling_spec.rb

@@ -147,3 +147,23 @@ describe "Acceptance: Task needing to reference the original Multi-Step-Task" do
     Resque.queues.should_not include(task.queue_name)
   end
 end
+
+describe "Acceptance: Finalization always runs" do
+  let(:task) do
+    Resque::Plugins::MultiStepTask.create("testing")
+  end
+
+  before do
+    Resque.redis.del "testing"
+    task.add_job MultiStepAcceptance::CounterJob, "testing counter"
+    task.add_job MultiStepAcceptance::CounterJob, "testing counter"
+    task.add_finalization_job MultiStepAcceptance::CounterJob, "testing counter"
+    sleep 1
+    task.finalizable!
+    sleep 1
+  end
+
+  it 'should run normal jobs and finalization job' do
+    Resque.redis.get("testing counter").to_i.should == 3
+  end
+end

data/spec/acceptance/spec_helper.rb

@@ -3,11 +3,22 @@ require File.expand_path("../spec_helper", File.dirname(__FILE__))
 $LOAD_PATH << File.dirname(__FILE__)
 require 'acceptance_jobs'
 
-$worker_pid = fork
-if $worker_pid.nil?
-  # in child
-  exec "rake resque:work 'QUEUES=*' 'NAMESPACE=resque-multi-step-task-testing' INTERVAL=1 VERBOSE=1"
-end
+RSpec.configure do |c|
+  c.before(:all) do
+    puts '---------- Starting Resque Workers ----------'
+    3.times do |index|
+    system "BACKGROUND=yes PIDFILE=resque#{index}.pid QUEUE=* NAMESPACE=resque-multi-step-task-testing INTERVAL=0.5 rake resque:work"
+    end
+    sleep 3
+  end
 
-# wait for worker to come up
-sleep 4
+  c.after(:all) do
+    sleep 1
+    puts '---------- Stopping Resque Workers ----------'
+    3.times do |index|
+      pid = File.read("resque#{index}.pid").to_i
+      File.delete("resque#{index}.pid")
+      Process.kill('QUIT', pid)
+    end
+  end
+end

data/spec/resque/plugins/multi_step_task_spec.rb

@@ -44,7 +44,7 @@ module  Resque::Plugins
   end
 
   describe MultiStepTask do 
-    let(:task) {MultiStepTask.create("some-task")}
+    let(:task) {MultiStepTask.create("some-task").start}
 
     it "allows jobs to be added to task" do 
       lambda {
@@ -86,7 +86,7 @@ module  Resque::Plugins
   end
 
   describe MultiStepTask, "synchronous mode" do 
-    let(:task){MultiStepTask.create("some-task")}
+    let(:task){MultiStepTask.create("some-task").start}
 
     before do 
       MultiStepTask.mode = :sync

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-multi-step
 version: !ruby/object:Gem::Version
-  version: 2.0.3
-  prerelease: 
+  version: 2.0.4
 platform: ruby
 authors:
 - Peter Williams
@@ -10,134 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque-multi-step
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: resque-fairly
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides multi-step tasks with finalization and progress tracking
@@ -148,7 +103,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .document
+- ".document"
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -174,25 +129,24 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/pezra/resque-multi-step
 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: Provides multi-step tasks with finalization and progress tracking