workhorse 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa9dc25d7a2e9ec126e65a928ad34ebe2582223372524ca80b2b6ad92eb191e7
-  data.tar.gz: 85074d1dd6e73dd83028f98629bd5c83637cf08c230815c0b7cce390c30acf44
+  metadata.gz: 4bcaee406798a7da933fd0a48c7e556447a589a6be42f73d259902ae3a69b339
+  data.tar.gz: 2201639a37267a0980b873d0398222fbd0da0ac0a672244180a37b7e0b5265aa
 SHA512:
-  metadata.gz: 39b04d08e72d36e17261947dec59a19ca4c62be283856606e37a201a94b923007fd80b885dab1ef267d6a13feea9620cec6609761d15fdb19aeebc8b4bb206b7
-  data.tar.gz: 2f5e84a4272556eaaa94c4893b7552cd730f830b28644869b0360e74e6dbc30c8cacd8c113728d092190f91c58b9e8a9455a5513e7aff23518191ec5a1e2f7fa
+  metadata.gz: 4f7813c2d5945df4a9a4757b2dd3ac2f270da19888b5d47cff50a3e5321bef65ded194d0775b30719754b20018c4050dc46ee0f602f445871661edf400a4afda
+  data.tar.gz: db1da7961291a3eefd8c066fe9b36e8e0d4ce0fcb673968229b364b79e5fbe37e06574f506f1a1024487dbb1d73d667b92a14726d9adcce8791962a850505d8a

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.3.9 – 2019-03-09
+
+* Fixed error where jobs without queue were blocked by a locked/running job
+  that also was without a queue
+
 ## 0.3.8 – 2018-12-19
 
 * Fixed incompatibility in the combination of Oracle DB and Arel < 7.0.0

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Sitrox
+Copyright (c) 2019 Sitrox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -267,4 +267,4 @@ Please consult the [FAQ](FAQ.md).
 
 ## Copyright
 
-Copyright © 2018 Sitrox. See `LICENSE` for further details.
+Copyright © 2019 Sitrox. See `LICENSE` for further details.

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.9

data/lib/workhorse/poller.rb

@@ -187,21 +187,23 @@ module Workhorse
     # Returns an Array of queue names for which a job may be posted
     #
     # This is done in multiple steps. First, all queues with jobs that are in
-    # progress are removed. Second, restrict to only queues for which we may
-    # post jobs. Third, extract the queue names of the remaining queues and
-    # return them in an Array.
+    # progress are removed, with the exception of the nil queue. Second, we
+    # restrict to only queues for which we may post jobs. Third, we extract the
+    # queue names of the remaining queues and return them in an Array.
     #
     # @return [Array] an array of unique queue names
     def valid_queues
       select = valid_ordered_select_id
 
-      # Restrict queues that are currently in progress
+      # Restrict queues that are currently in progress, except for the nil
+      # queue, where jobs may run in parallel
       bad_states = [Workhorse::DbJob::STATE_LOCKED, Workhorse::DbJob::STATE_STARTED]
-      bad_queries_select = table.project(table[:queue])
-                                .where(table[:state].in(bad_states))
+      bad_queues_select = table.project(table[:queue])
+                               .where(table[:queue].not_eq(nil))
+                               .where(table[:state].in(bad_states))
       # .distinct is not chainable in older Arel versions
-      bad_queries_select.distinct
-      select = select.where(table[:queue].not_in(bad_queries_select))
+      bad_queues_select.distinct
+      select = select.where(table[:queue].not_in(bad_queues_select))
 
       # Restrict queues to valid ones as indicated by the options given to the
       # worker

data/test/workhorse/poller_test.rb

@@ -47,4 +47,24 @@ class Workhorse::PollerTest < WorkhorseTest
 
     assert_equal %w[q1 q2], w.poller.send(:valid_queues)
   end
+
+  def test_no_queues
+    w = Workhorse::Worker.new(polling_interval: 60)
+    assert_equal [], w.poller.send(:valid_queues)
+  end
+
+  def test_nil_queues
+    w = Workhorse::Worker.new(pool_size: 2, polling_interval: 60)
+
+    3.times do
+      Workhorse.enqueue BasicJob.new(sleep_time: 2)
+    end
+    jobs = Workhorse::DbJob.all
+
+    assert_equal [nil], w.poller.send(:valid_queues)
+
+    jobs[0].mark_locked!(42)
+
+    assert_equal [nil], w.poller.send(:valid_queues)
+  end
 end

data/test/workhorse/worker_test.rb

@@ -162,10 +162,10 @@ class Workhorse::WorkerTest < WorkhorseTest
   end
 
   def test_polling_interval
-    w = Workhorse::Worker.new(polling_interval: 1)
-    w = Workhorse::Worker.new(polling_interval: 1.1)
+    assert Workhorse::Worker.new(polling_interval: 1)
+    assert Workhorse::Worker.new(polling_interval: 1.1)
     err = assert_raises do
-      w = Workhorse::Worker.new(polling_interval: 1.12)
+      Workhorse::Worker.new(polling_interval: 1.12)
     end
     assert_equal 'Polling interval must be a multiple of 0.1.', err.message
   end

data/workhorse.gemspec

@@ -1,16 +1,16 @@
 # -*- encoding: utf-8 -*-
-# stub: workhorse 0.3.8 ruby lib
+# stub: workhorse 0.3.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2018-12-19"
+  s.date = "2019-04-09"
   s.files = [".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".travis.yml".freeze, "CHANGELOG.md".freeze, "FAQ.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/rubocop".freeze, "lib/generators/workhorse/install_generator.rb".freeze, "lib/generators/workhorse/templates/bin/workhorse.rb".freeze, "lib/generators/workhorse/templates/config/initializers/workhorse.rb".freeze, "lib/generators/workhorse/templates/create_table_jobs.rb".freeze, "lib/workhorse.rb".freeze, "lib/workhorse/daemon.rb".freeze, "lib/workhorse/daemon/shell_handler.rb".freeze, "lib/workhorse/db_job.rb".freeze, "lib/workhorse/enqueuer.rb".freeze, "lib/workhorse/jobs/cleanup_succeeded_jobs.rb".freeze, "lib/workhorse/jobs/run_rails_op.rb".freeze, "lib/workhorse/performer.rb".freeze, "lib/workhorse/poller.rb".freeze, "lib/workhorse/pool.rb".freeze, "lib/workhorse/worker.rb".freeze, "test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.rb".freeze, "test/workhorse/enqueuer_test.rb".freeze, "test/workhorse/performer_test.rb".freeze, "test/workhorse/poller_test.rb".freeze, "test/workhorse/pool_test.rb".freeze, "test/workhorse/worker_test.rb".freeze, "workhorse.gemspec".freeze]
-  s.rubygems_version = "2.7.7".freeze
+  s.rubygems_version = "3.0.3".freeze
   s.summary = "Multi-threaded job backend with database queuing for ruby.".freeze
   s.test_files = ["test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.rb".freeze, "test/workhorse/enqueuer_test.rb".freeze, "test/workhorse/performer_test.rb".freeze, "test/workhorse/poller_test.rb".freeze, "test/workhorse/pool_test.rb".freeze, "test/workhorse/worker_test.rb".freeze]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workhorse
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -211,8 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Multi-threaded job backend with database queuing for ruby.