workhorse 1.1.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0994338972770f1cb6f44db74a01c54c7ebdb9aa88afd1e9938a1565997edc8
-  data.tar.gz: f48f3df959cca6b69a84f77a501989b6430cc04582e56345a7441af4258f62c0
+  metadata.gz: 93b228777ca0a882fb947c596c9a6a961126527f5aa595369ad11ea00b00b1f1
+  data.tar.gz: c0a9a1c4e9a5a2966c37cbefec09b6d672667eac93a77fb6776875fc0a49bf69
 SHA512:
-  metadata.gz: 2631da0ac85ffb054b9705cee07174a56c56d4b773fcd25b341ece72a6e92244eb10fb88f7748dfd905fb5d01f8fd17b64425b1d479b71b40ca850af607d6581
-  data.tar.gz: a4ac3e1f039fc3884e2ef0a066ff2d152b351d87926139a3098fba81ab7bedb8dd80c783e57ea0de79a6187296feee1aea73949207d0f8631af9b4415ab8cb68
+  metadata.gz: ca3d24bcad02360518f164fcdad08850f4cb3ac9d7f4617005a2a7c679d0916a6b8b58f46377320013e94606b08d181d121ddbca54293290264aa6b44fd6a651
+  data.tar.gz: f9b00bba4af33ee685185dee998384d0e5b158db951ef9eed4bf632f681c2fb9b2fcb253f09e40a0816b6ed5728aaf5454c0cae3badec3252c2ae15634f4a990

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Workhorse Changelog
 
+## 1.2.3 - 2021-02-09
+
+* Fix warning with ruby 2.7
+
+## 1.2.2 - 2021-01-27
+
+* Remove unused gem dependency to `schemacop`
+
+## 1.2.1 - 2021-01-27
+
+* Log job description (if given) when performing job
+
+## 1.2.0 - 2021-01-27
+
+* `Workhorse.enqueue_active_job`
+  * Change `perform_at` to a keyword arument
+  * Allow passing `:description` and `:queue`
+
+Note that when upgrading, change:
+
+```ruby
+# From
+Workhorse.enqueue_active_job MyJob, 5.minutes.from_now
+
+# To
+Workhorse.enqueue_active_job MyJob, perform_at: 5.minutes.from_now
+```
+
+## 1.1.1 - 2021-01-19
+
+* Remove deprecation warnings with Ruby 2.7
+
 ## 1.1.0 - 2020-12-24
 
 * Add `description` column to `DbJob`.
@@ -10,7 +42,7 @@ to your `DbJob` table, e.g. with such a migration:
 ```ruby
 class AddDescriptionToWorkhorseDbJobs < ActiveRecord::Migration[6.0]
   def change
-    add_column :db_jobs, :description, :string, after: :perform_at, null: true
+    add_column :jobs, :description, :string, after: :perform_at, null: true
   end
 end
 ```

data/README.md

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

data/Rakefile

@@ -22,7 +22,6 @@ task :gemspec do
     spec.add_development_dependency 'pry'
     spec.add_dependency 'activesupport'
     spec.add_dependency 'activerecord'
-    spec.add_dependency 'schemacop', '~> 2.0'
     spec.add_dependency 'concurrent-ruby'
   end
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.3

data/lib/active_job/queue_adapters/workhorse_adapter.rb

@@ -14,8 +14,8 @@ module ActiveJob
         Workhorse.enqueue_active_job(job)
       end
 
-      def enqueue_at(job, timestamp) #:nodoc:
-        Workhorse.enqueue_active_job(job, timestamp)
+      def enqueue_at(job, timestamp = Time.now) #:nodoc:
+        Workhorse.enqueue_active_job(job, perform_at: timestamp)
       end
     end
   end

data/lib/workhorse/daemon/shell_handler.rb

@@ -1,6 +1,6 @@
 module Workhorse
   class Daemon::ShellHandler
-    def self.run(options = {}, &block)
+    def self.run(**options, &block)
       unless ARGV.count == 1
         usage
         exit 99
@@ -10,7 +10,7 @@ module Workhorse
       lockfile = File.open(lockfile_path, 'a')
       lockfile.flock(File::LOCK_EX || File::LOCK_NB)
 
-      daemon = Workhorse::Daemon.new(options, &block)
+      daemon = Workhorse::Daemon.new(**options, &block)
 
       begin
         case ARGV.first

data/lib/workhorse/enqueuer.rb

@@ -12,10 +12,16 @@ module Workhorse
     end
 
     # Enqueue an ActiveJob job
-    def enqueue_active_job(job, perform_at = Time.now)
+    def enqueue_active_job(job, perform_at: Time.now, queue: nil, description: nil)
       wrapper_job = Jobs::RunActiveJob.new(job.serialize)
-      queue = job.queue_name.blank? ? nil : job.queue_name
-      db_job = enqueue(wrapper_job, queue: queue, priority: job.priority || 0, perform_at: Time.at(perform_at))
+      queue ||= job.queue_name if job.queue_name.present?
+      db_job = enqueue(
+        wrapper_job,
+        queue:       queue,
+        priority:    job.priority || 0,
+        perform_at:  Time.at(perform_at),
+        description: description
+      )
       job.provider_job_id = db_job.id
       return db_job
     end
@@ -36,7 +42,7 @@ module Workhorse
       end
 
       job = Workhorse::Jobs::RunRailsOp.new(cls, op_args)
-      enqueue job, workhorse_args
+      enqueue job, **workhorse_args
     end
   end
 end

data/lib/workhorse/performer.rb

@@ -59,6 +59,7 @@ module Workhorse
       # Deserialize and perform job
       # ---------------------------------------------------------------
       log 'Performing', :info
+      log "Description: #{@db_job.description}", :info unless @db_job.description.blank?
 
       if Workhorse.perform_jobs_in_tx
         Workhorse.tx_callback.call do

data/lib/workhorse/worker.rb

@@ -13,8 +13,8 @@ module Workhorse
 
     # Instantiates and starts a new worker with the given arguments and then
     # waits for its completion (i.e. an interrupt).
-    def self.start_and_wait(*args)
-      worker = new(*args)
+    def self.start_and_wait(**args)
+      worker = new(**args)
       worker.start
       worker.wait
     end

data/workhorse.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: workhorse 1.1.0 ruby lib
+# stub: workhorse 1.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "workhorse".freeze
-  s.version = "1.1.0"
+  s.version = "1.2.3"
 
   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 = "2020-12-24"
+  s.date = "2021-02-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/active_job/queue_adapters/workhorse_adapter.rb".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/detect_stale_jobs_job.rb".freeze, "lib/workhorse/jobs/run_active_job.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/scoped_env.rb".freeze, "lib/workhorse/worker.rb".freeze, "test/active_job/queue_adapters/workhorse_adapter_test.rb".freeze, "test/lib/db_schema.rb".freeze, "test/lib/jobs.rb".freeze, "test/lib/test_helper.rb".freeze, "test/workhorse/db_job_test.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 = "3.0.3".freeze
   s.summary = "Multi-threaded job backend with database queuing for ruby.".freeze
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<pry>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<schemacop>.freeze, ["~> 2.0"])
       s.add_runtime_dependency(%q<concurrent-ruby>.freeze, [">= 0"])
     else
       s.add_dependency(%q<bundler>.freeze, [">= 0"])
@@ -43,7 +42,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry>.freeze, [">= 0"])
       s.add_dependency(%q<activesupport>.freeze, [">= 0"])
       s.add_dependency(%q<activerecord>.freeze, [">= 0"])
-      s.add_dependency(%q<schemacop>.freeze, ["~> 2.0"])
       s.add_dependency(%q<concurrent-ruby>.freeze, [">= 0"])
     end
   else
@@ -58,7 +56,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<pry>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 0"])
     s.add_dependency(%q<activerecord>.freeze, [">= 0"])
-    s.add_dependency(%q<schemacop>.freeze, ["~> 2.0"])
     s.add_dependency(%q<concurrent-ruby>.freeze, [">= 0"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workhorse
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.3
 platform: ruby
 authors:
 - Sitrox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: schemacop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement