queue_dispatcher 1.5.1 → 2.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzc0ZDM1ZDgzMzcwYjE4OTkyZDc1ZjU4N2VhNjc1NWI5ODk2MTFiZA==
+    MzhlMmZkNGQ0MDkxOTY5ZWViMzRlNWQ3YWVjMjY0ZWI0NGZmMDRhOQ==
   data.tar.gz: !binary |-
-    NDZkODM3YTg3NTg1YjM4NDM2YzM2NDVjOGViZTc1MDFmYTU4NGUyNA==
+    MWUzNmNhMmQ4OTgzNzJkODBkNTA4MzkyZmNiZTgzYmEyMzE1YTg3Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODhlY2E5NTcyOTk3YTRmZTY2NDcwNTZjNDkxMjkyYmZiNTJkMWE3Njk4MGIw
-    MGIwY2U3YzdiNzE3ZmIwNDMyZGRjMTBlNmJjZGM3YWIwMzQyMWUzZTVlYWJh
-    ZmFjYjIxMTkwMjQwNzAzOTQzYzZiZDIyMjRhMjBjZjcwOTQ2YmU=
+    OGE1Y2QwOTBmNWNkNjYwZGU2ZTZjNWYxZTNmZDJiMmE2YjJkYmNmZmQxMDJk
+    ODEwM2UwNzIwYzAxMjBiM2VlZTFkOWZjYjY3N2RlZWExM2U1YmFiZjYyMGU4
+    YWRhZDFhNjNiZWYyMTFmZWViYTJjN2NlY2Y5ZGY4ODFhY2NkNDI=
   data.tar.gz: !binary |-
-    MWRiMTkwODU5YTNmY2Y1ZjFmYjJiMzZiNGYyOGQxYWVmYjM5Yzg2NGNhYjA4
-    ZGEwMTg5MTc3YmQ5MTUxMjM4NjhjNGMxOTgwMWQxMjY2YmFkNzFiNzMzZmRj
-    Y2VkZjVlZTA1ZWUzYThkYzhhZTg1ZDZiNmI3MTQ3Y2UzMzE0YzA=
+    OGRlMDlhMWE1YzZjYTBkMGI2OWIyMWM3NTliMGE4MDE3NTk3ZGY4YmEzMjBi
+    NmUyZGI0ZjNjNGI5MmJjYzRhOGQ2NmE3ODIzODRjNjJlYzEwOTUxODAxNTc3
+    YmFjZmRlMDY3MDE3N2FhZTFkMTk5NDYxY2YxOTM0YWFjYzVlODE=

data/README.rdoc

@@ -23,6 +23,13 @@ Use
 
 This will create a database migration for the models Task and TaskQueues.
 
+If you update the queue_dispatcher from pre 1.5.1 you have to use the following command to update your migrations:
+
+Use
+  rails g queue_dispatcher:migration --skip
+
+This will create all new database migrations for the models Task and TaskQueues and leve the existing as they are.
+
 === Gem Dependencies
 
 Please check if all those requirements are satisfied on your environment.

data/lib/queue_dispatcher/acts_as_task.rb

@@ -24,7 +24,7 @@ module QueueDispatcher
 
         @acts_as_task_config = QueueDispatcher::ActsAsTask::Config.new(args[:task_queue_model] || :task_queue)
 
-        belongs_to            acts_as_task_config.task_queue_class_name
+        belongs_to            acts_as_task_config.task_queue_class_name.to_sym
         has_many              :task_dependencies, :dependent => :destroy, :foreign_key => :task_id
         has_many              :dependent_tasks, :through => :task_dependencies
         has_many              :inverse_task_dependencies, :class_name => 'TaskDependency', :foreign_key => 'dependent_task_id', :dependent => :destroy

data/lib/queue_dispatcher/acts_as_task_queue.rb

@@ -1,6 +1,5 @@
 require 'sys/proctable'
 require 'queue_dispatcher/rc_and_msg'
-require 'spawn'
 
 module QueueDispatcher
   module ActsAsTaskQueue
@@ -33,7 +32,6 @@ module QueueDispatcher
 
     module ClassMethods
       def acts_as_task_queue(args = {})
-        include Spawn
         include ActionView::Helpers::UrlHelper
         include QdLogger
 
@@ -42,7 +40,7 @@ module QueueDispatcher
 
         @acts_as_task_queue_config = QueueDispatcher::ActsAsTaskQueue::Config.new(args)
 
-        has_many acts_as_task_queue_config.task_class_name.pluralize, :order => [:priority, :id]
+        has_many acts_as_task_queue_config.task_class_name.pluralize.to_sym, -> { order(:priority, :id) }
         serialize :interrupts, Array
       end
     end
@@ -127,7 +125,7 @@ module QueueDispatcher
           # Find next pending task, where all dependent tasks are executed
           all_tasks = acts_as_task_queue_tasks.lock(true).all
           pos       = 0
-          while task.nil? && pos < all_tasks.count do
+          while task.nil? && pos < all_tasks.to_a.count do
             t = all_tasks[pos]
             if t.dependent_tasks_executed?
               task = t if t.state == 'new'
@@ -485,7 +483,7 @@ module QueueDispatcher
       # Interrupt handler
       def handle_interrupts(args = {})
         interrupts.each { |int| send int.to_sym }
-        update_attributes interrupts: []
+        update_attributes :interrupts => []
       rescue => exception
         backtrace = exception.backtrace.join("\n  ")
         log :msg => "Fatal error in method 'handle_interrupts': #{$!}\n  #{backtrace}", :sev => :error, :print_log => args[:print_log]

data/lib/queue_dispatcher/message_sending.rb

@@ -1,7 +1,5 @@
-require 'active_support/basic_object'
-
 module QueueDispatcher
-  class QueueDispatcherProxy < ActiveSupport::BasicObject
+  class QueueDispatcherProxy < ActiveSupport::ProxyObject
     def initialize(target, options = {})
       @target = target
       @options = options

data/lib/queue_dispatcher/psych_ext.rb

@@ -88,7 +88,7 @@ module Psych
           payload = Hash[*object.children.map { |c| accept c }]
           id = payload["attributes"][klass.primary_key]
           begin
-            if ActiveRecord::VERSION::MAJOR == 3
+            if ActiveRecord::VERSION::MAJOR >= 3
               klass.unscoped.find(id)
             else # Rails 2
               klass.with_exclusive_scope { klass.find(id) }

data/lib/queue_dispatcher/version.rb

@@ -1,3 +1,3 @@
 module QueueDispatcher
-  VERSION = "1.5.1"
+  VERSION = "2.1.0"
 end

data/queue_dispatcher.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
   s.summary     = %q{This Gem installs a queue dispatcher for handling asynchronous tasks}
   s.description = %q{Queue_Dispatcher executes asynchronous tasks in the background.}
 
-  s.add_dependency "sys-proctable", '>= 0.9.1'
-  s.add_dependency "deadlock_retry"
-  s.add_dependency "spawn", '>= 1.0.0'
-  s.add_dependency "haml"
-  s.add_dependency "will_paginate"
-  s.add_dependency "jquery-rails"
+  s.add_dependency 'sys-proctable', '>= 0.9.1'
+  s.add_dependency 'deadlock_retry'
+  s.add_dependency 'spawnling'
+  s.add_dependency 'haml'
+  s.add_dependency 'will_paginate'
+  s.add_dependency 'jquery-rails'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/script/queue_worker_dispatcher

@@ -1,16 +1,15 @@
 #!/usr/bin/env ruby
 # BEGIN - rails runner… with a relative path
-DAEMON_ARGV = ARGV.clone
-ARGV.clear
-ARGV << 'runner'
-ARGV << '/dev/null'
-$: << File.dirname(__FILE__)
-load 'rails'
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require APP_PATH
+# set Rails.env here if desired
+Rails.application.require_environment!
 # END - rails runner… with a relative path
 
 require 'sys/proctable'
+require 'spawnling'
 include Sys
-include Spawn
 include IwLogger
 
 
@@ -107,8 +106,10 @@ end
 # Install signal handler for worker
 def worker_install_signal_handler
   install_signal_handler(['TERM'], :trap_msg => "Caught trap signal. Shutdown...", :ignore_signals => ['HUP', 'INT']) do
-    # Shutdown task_queue
-    $worker[:task_queue].update_attributes :state => 'shutdown' if $worker[:task_queue]
+    # Shutdown task_queue. Because of Ruby 2.0, we have to do this in a Thread to prevent "can't be called from trap context"-errors!
+    Thread.new do
+      $worker[:task_queue].update_attributes state: 'shutdown' if $worker[:task_queue]
+    end
     $worker[:work] = false
   end
 end
@@ -145,7 +146,7 @@ def daemon_start
 
   daemon_log :msg => "Starting process..."
   if $daemon[:background]
-    spawn_block { daemon_runner }
+    Spawnling.new { daemon_runner }
   else
     daemon_runner
   end
@@ -159,7 +160,7 @@ def spawn_and_monitor_workers
   while $daemon[:work]
     # (Re)start workers
     while $daemon[:worker_pids].count < $daemon[:worker_count] do
-      sp = spawn_block(:argv => $worker[:process_prefix]) do
+      sp = Spawnling.new(:argv => $worker[:process_prefix]) do
         worker_runner
       end
       $daemon[:worker_pids] << sp.handle
@@ -231,8 +232,8 @@ end
 def daemon_parse_opts
   start = true
 
-  unless DAEMON_ARGV.length == 0
-    case DAEMON_ARGV[0]
+  unless ARGV.length == 0
+    case ARGV[0]
       when '-b', '--background'
         $daemon[:background] = true;
 
@@ -245,7 +246,7 @@ def daemon_parse_opts
         start = false
 
       else
-        puts "Invalid argument: #{DAEMON_ARGV[0]}" if !DAEMON_ARGV[0].nil?
+        puts "Invalid argument: #{ARGV[0]}" if !ARGV[0].nil?
         daemon_show_usage
         start = false
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: queue_dispatcher
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Philip Kurmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spawn
+  name: spawnling
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement