maintenance_tasks 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dbf3120a28de1ce88571561ba3be52d160743d365f862a65573b24fcc64cc24
-  data.tar.gz: 87fda9aaf48c7643a85cc542cbda6d89721ea0b656396329abd9a2d4a42cab68
+  metadata.gz: b11e5edbefa677caf704bd6af59a14185ab89ff29da35d966253b78143a76af1
+  data.tar.gz: a103be6c53d5d6dae55d63f451d293abe1c0a4e763cb1c2bd9e3dcfea3a6bc72
 SHA512:
-  metadata.gz: 77cc4fad4f591683cb3b6062265c487efb8f15b7f31aca2620730af3b74dd57296f8451d7077256fe2f5718762b8ba3de76e7f1affe2c888c202c585a781a570
-  data.tar.gz: 15e9c05f39cc0cc6216b66081ec051eebd4a669e5c5e002672f2028d5a160fa8dd4a9144e726bc455aa7a60b96018c2fe1a572079a9d705d7b299b7762e483df
+  metadata.gz: 3415d87b545e09fc65494cecb03a7cea9a5c84838c66c209a129f8017efc611eee7521852c2460ada50c389b2885bb95dcd2bfe807ea8a84693e9b86e2123409
+  data.tar.gz: 19fce32dfc506afe512ce6ebc2ddfd0a2fd195b61e4611c4a3febae5ad4bfe09d39ac47e902a1c21f830de9e3c5f953379d8011919ba0a381dc6010599eb289e

data/app/jobs/concerns/maintenance_tasks/task_job_concern.rb

@@ -47,6 +47,7 @@ module MaintenanceTasks
             a batch enumerator with the "start" or "finish" options.
           MSG
         end
+
         # For now, only support automatic count based on the enumerator for
         # batches
         @enumerator = enumerator_builder.active_record_on_batch_relations(
@@ -151,7 +152,7 @@ module MaintenanceTasks
     def after_perform
       @run.persist_transition
       if defined?(@reenqueue_iteration_job) && @reenqueue_iteration_job
-        reenqueue_iteration_job(should_ignore: false)
+        reenqueue_iteration_job(should_ignore: false) unless @run.stopped?
       end
     end
 

data/app/models/maintenance_tasks/run.rb

@@ -52,6 +52,7 @@ module MaintenanceTasks
     # Ensure ActiveStorage is in use before preloading the attachments
     scope :with_attached_csv, -> do
       return unless defined?(ActiveStorage)
+
       with_attached_csv_file if ActiveStorage::Attachment.table_exists?
     end
 
@@ -240,6 +241,7 @@ module MaintenanceTasks
         # Preserve swap-and-replace solution for data races until users
         # run migration to upgrade to optimistic locking solution
         return if stopping?
+
         updated = self.class.where(id: id).where.not(status: STOPPING_STATUSES)
           .update_all(status: :running, updated_at: Time.now) > 0
         if updated
@@ -384,6 +386,7 @@ module MaintenanceTasks
     def csv_file
       return unless defined?(ActiveStorage)
       return unless ActiveStorage::Attachment.table_exists?
+
       super
     end
 
@@ -426,6 +429,7 @@ module MaintenanceTasks
     def truncate(attribute_name, value)
       limit = self.class.column_for_attribute(attribute_name).limit
       return value unless limit
+
       value&.first(limit)
     end
   end

data/app/models/maintenance_tasks/task.rb

@@ -38,6 +38,7 @@ module MaintenanceTasks
         unless task.is_a?(Class) && task < Task
           raise NotFoundError.new("#{name} is not a Task.", name)
         end
+
         task
       end
 
@@ -172,6 +173,7 @@ module MaintenanceTasks
       def load_constants
         namespace = MaintenanceTasks.tasks_module.safe_constantize
         return unless namespace
+
         namespace.constants.map { |constant| namespace.const_get(constant) }
       end
     end

data/app/models/maintenance_tasks/task_data.rb

@@ -73,6 +73,7 @@ module MaintenanceTasks
     # @return [nil] if the Task file was deleted.
     def code
       return if deleted?
+
       task = Task.named(name)
       file = if Object.respond_to?(:const_source_location)
         Object.const_source_location(task.name).first
@@ -88,6 +89,7 @@ module MaintenanceTasks
     # @return [nil] if there are no Runs associated with the Task.
     def last_run
       return @last_run if defined?(@last_run)
+
       @last_run = runs.first
     end
 
@@ -100,6 +102,7 @@ module MaintenanceTasks
     #   record previous to the last Run.
     def previous_runs
       return Run.none unless last_run
+
       runs.where.not(id: last_run.id)
     end
 
@@ -150,6 +153,7 @@ module MaintenanceTasks
     # @return [nil] if the Task file was deleted.
     def new
       return if deleted?
+
       MaintenanceTasks::Task.named(name).new
     end
 

data/app/models/maintenance_tasks/ticker.rb

@@ -41,6 +41,7 @@ module MaintenanceTasks
     # row will call the block at most once (if it had been throttled).
     def persist
       return if @ticks_recorded == 0
+
       now = Time.now
       duration = now - @last_persisted
       @last_persisted = now

data/lib/maintenance_tasks.rb

@@ -66,6 +66,7 @@ module MaintenanceTasks
   # @private
   def self.error_handler
     return @error_handler if defined?(@error_handler)
+
     @error_handler = ->(_error, _task_context, _errored_element) {}
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maintenance_tasks
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Shopify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-25 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ homepage: https://github.com/Shopify/maintenance_tasks
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/Shopify/maintenance_tasks/tree/v1.8.1
+  source_code_uri: https://github.com/Shopify/maintenance_tasks/tree/v1.8.2
   allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []