foreman-tasks 10.0.0 → 10.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12c497c315d4ddc13756f00588584ebbb26fd0320231cc2e6a2b5e1e285ad1c6
-  data.tar.gz: 404c59c211805039713e0d61411a649d21f318ad9f5e4a1f7872f2d2633dd3c4
+  metadata.gz: 34be658746dd0f136ff054fa6b9f381b9d2ee3758715219f4709f8b745ea1807
+  data.tar.gz: e4240056a3707edfccf95f90ed86c970f6e76d8eb5f7c1273987786a2dc97fb8
 SHA512:
-  metadata.gz: 831bfb836cedcf996170dcb23db17edc1fb9c3606130cb0f1c8c946de3164e7a9059ef61e6bbf5fdde4fb3febe1cc6cd5e07c668f891dfda51926b89b5da6f3e
-  data.tar.gz: e63d4cb1e9f172ff81bae074a6bba0abbb96b1c67369506e6e8a134f42fc161c46236d505ba4503ef8e9805a7ecf9015bb963b98c7bf78a5f88b4777c1345471
+  metadata.gz: b0a7729b58e671ce34f57adf83c052ca9af2e8e670e3302fa0d1dbee1ec82975f327a8a90fde202b2c68953dbdbdc1fd429330232911b002d2fdca77bf157bad
+  data.tar.gz: 2094c271990a108d4e804bf42f3e5b7464427674a4d46d26b130883ad057069141d2303286a0ee7fec7afbcc01bebd48d4d6c4955a64544107d2a2797cd558ad

data/.gitignore

@@ -16,3 +16,4 @@ locale/*/*.po.time_stamp
 node_modules
 package-lock.json
 coverage/
+locale/action_names.rb

data/lib/foreman_tasks/cleaner.rb

@@ -252,7 +252,7 @@ module ForemanTasks
 
     def prepare_filter
       filter_parts = [filter]
-      filter_parts << %(started_at < "#{after.ago.to_s(:db)}") if after > 0
+      filter_parts << %(started_at < "#{after.ago.to_formatted_s(:db)}") if after > 0
       filter_parts << "state ^ (#{states.join(',')})" if states.any?
       filter_parts.select(&:present?).map { |segment| "(#{segment})" }.join(' AND ')
     end

data/lib/foreman_tasks/tasks/export_tasks.rake

@@ -310,15 +310,15 @@ namespace :foreman_tasks do
     SKIP_ERRORS = ['true', '1', 'y', 'yes'].include? (ENV['SKIP_FAILED'] || '').downcase
 
     filter = if ENV['TASK_SEARCH'].nil? && ENV['TASK_DAYS'].nil?
-               "started_at > \"#{7.days.ago.to_s(:db)}\" || " \
-                 "(result != success && started_at > \"#{60.days.ago.to_s(:db)})\""
+               "started_at > \"#{7.days.ago.to_formatted_s(:db)}\" || " \
+                 "(result != success && started_at > \"#{60.days.ago.to_formatted_s(:db)})\""
              else
                ENV['TASK_SEARCH'] || ''
              end
 
     if (days = ENV['TASK_DAYS'])
       filter += ' && ' unless filter == ''
-      filter += "started_at > \"#{days.to_i.days.ago.to_s(:db)}\""
+      filter += "started_at > \"#{days.to_i.days.ago.to_formatted_s(:db)}\""
     end
 
     format = ENV['TASK_FORMAT'] || 'html'

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '10.0.0'.freeze
+  VERSION = '10.0.2'.freeze
 end

data/lib/foreman_tasks.rb

@@ -33,7 +33,7 @@ module ForemanTasks
                 finished.wait(timeout)
                 task = ForemanTasks::Task::DynflowTask.where(:external_id => id).first
                 if task.nil? || (!task.paused? && task.pending?)
-                  raise TimeoutError, "The time waiting for task #{task.try(:id)} to finish exceeded the 'foreman_tasks_sync_task_timeout' (#{timeout}s)"
+                  raise Timeout::Error, "The time waiting for task #{task.try(:id)} to finish exceeded the 'foreman_tasks_sync_task_timeout' (#{timeout}s)"
                 end
               end
               task || ForemanTasks::Task::DynflowTask.where(:external_id => id).first!

data/lib/tasks/gettext.rake

@@ -8,21 +8,27 @@ if gettext_find_task
   namespace :gettext do
     task :store_action_names => :environment do
       storage_file = "#{locale_path}/action_names.rb"
-      klasses = Actions::EntryAction
-                .subclasses
-                .uniq
-                .select do |action|
-        src, = Object.const_source_location(action.to_s)
-        src.start_with? @engine.root.to_s
+      method_names = [:plan, :run, :finalize]
+      instances = Actions::EntryAction
+                  .descendants
+                  .uniq
+                  .map(&:allocate)
+                  .select do |action|
+        method_names.any? do |method_name|
+          if action.respond_to?(method_name)
+            src, = action.method(method_name).source_location
+            src.start_with? @engine.root.to_s
+          end
+        end
       end
 
-      if klasses.any?
+      if instances.any?
         puts "writing action translations to: #{storage_file}"
 
         File.write storage_file,
                    "# Autogenerated!\n" +
-                   klasses
-                   .map { |klass| %[_("#{klass.allocate.humanized_name}")] }
+                   instances
+                   .map { |instance| %[_("#{instance.humanized_name}")] }
                    .sort
                    .join("\n") + "\n"
       elsif File.exist? storage_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.0.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -318,7 +318,6 @@ files:
 - lib/foreman_tasks/version.rb
 - lib/tasks/gettext.rake
 - locale/Makefile
-- locale/action_names.rb
 - locale/de/LC_MESSAGES/foreman_tasks.mo
 - locale/de/foreman_tasks.po
 - locale/en/LC_MESSAGES/foreman_tasks.mo
@@ -642,7 +641,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resources and users

data/locale/action_names.rb

@@ -1,6 +0,0 @@
-# Autogenerated!
-_("Action with sub plans")
-_("Check for long running tasks")
-_("Deliver notifications about long running tasks")
-_("Import Puppet classes")
-_("Import facts")