foreman-tasks 0.17.3 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95c9f8364b129d0fcaccad4e7f8673deb1ff18ab1d5e47b74f2c85fe366af7a3
-  data.tar.gz: c36bb9f6aedcab3dc1c590797c09b470dd3097c0295a00f9e61dd1b695a011dd
+  metadata.gz: 6d2cab32dfa0f863a101a5d4e6edfe28bc25c5f76c4fac5718856de5a7a4c489
+  data.tar.gz: 1ecc4c1acc4f1b02a7915602a6248b0b0523ff678f60e7d2b51020c3182996a4
 SHA512:
-  metadata.gz: 453f74187dd7bc334ff64dfc0544a317dd60b06e23c83057577a8f346f70281f2a8b71749d200f5edbb09c810f8ec241965a2a5311a7fb849d26166f14a391ae
-  data.tar.gz: 3a256485bd5f4c92a39cad572c8b402105c0fb5768c173390ea33e75fbfc590899e8c73f455c157f69d48328308e8c88da0a14038f07d659fd8cd46597943d21
+  metadata.gz: a6e35951542561fa3adff4efd4e92f519b0d4b723599d587bcb29b0575f1f46aa941c76500b91c71749478888615f0eacd4e11a1f170e92cd06a2dbdf7733ae3
+  data.tar.gz: bad6ba1e5959c8b8ab28e4461f36e0a1294bfc286c333b60e575ae7c2df12a92a8ebaabb27a5843012f4378bf64687b1d26f9f7ea7ec3b6347d0c3c8985d38d0

data/.rubocop.yml

@@ -1,3 +1,5 @@
+require: rubocop-rails
+
 # TODO: remove this file by either moving cops here or fixing code
 inherit_from:
   - .rubocop_todo.yml
@@ -34,9 +36,6 @@ Style/StringLiterals:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-Style/FormatStringToken:
-  EnforcedStyle: template
-
 Rails/SkipsModelValidations:
   Enabled: false
 
@@ -87,9 +86,6 @@ Style/IfUnlessModifier:
 Style/NumericPredicate:
   Enabled: false
 
-Style/IfUnlessModifier:
-  Enabled: false
-
 Style/SafeNavigation:
   Enabled: false
 
@@ -116,3 +112,6 @@ Rails/HelperInstanceVariable:
 
 Naming/RescuedExceptionsVariableName:
   Enabled: false
+
+Style/WordArray:
+  Enabled: false

data/.rubocop_todo.yml

@@ -190,3 +190,6 @@ Style/GuardClause:
 Style/RedundantReturn:
   Exclude:
     - 'app/models/foreman_tasks/concerns/action_triggering.rb'
+
+Lint/SendWithMixinArgument:
+  Enabled: false

data/app/controllers/foreman_tasks/api/tasks_controller.rb

@@ -240,7 +240,7 @@ module ForemanTasks
         sort_by = ordering_params[:sort_by] || 'started_at'
         sort_order = ordering_params[:sort_order] || 'DESC'
         scope = scope.select("*, coalesce(ended_at, current_timestamp) - coalesce(coalesce(started_at, ended_at), current_timestamp) as duration")
-        scope.order("#{sort_by} #{sort_order}")
+        scope.order(sort_by => sort_order)
       end
 
       def task_hash(task)

data/app/lib/actions/helpers/with_delegated_action.rb

@@ -46,9 +46,9 @@ module Actions
 
       def delegated_action
         # TODO: make it easier in dynflow to load action data
-        delegated_step = task.execution_plan.steps.values.find_all do |step|
+        delegated_step = task.execution_plan.steps.values.reverse.find do |step|
           step.action_id == input[:delegated_action_id]
-        end.last
+        end
         return unless delegated_step
         world.persistence.load_action(delegated_step)
       end

data/app/models/foreman_tasks/lock.rb

@@ -19,7 +19,7 @@ module ForemanTasks
         | #{_('Required lock: %s') % required_lock.name}
         | #{_('Conflicts with tasks:')}
         HEADER
-        url_helpers       = Rails.application.routes.url_helpers
+        url_helpers = Rails.application.routes.url_helpers
         conflicting_tasks = conflicting_locks
                             .map(&:task)
                             .uniq

data/app/views/foreman_tasks/api/tasks/show.json.rabl

@@ -3,4 +3,4 @@ object @task if @task
 attributes :id, :label, :pending, :action
 attributes :username, :started_at, :ended_at, :state, :result, :progress
 attributes :input, :output, :humanized, :cli_example
-node(:available_actions) { |t| {cancellable: t.execution_plan&.cancellable?, resumable: t.resumable? }}
+node(:available_actions) { |t| { cancellable: t.execution_plan&.cancellable?, resumable: t.resumable? } }

data/foreman-tasks.gemspec

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 $LOAD_PATH.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:

data/lib/foreman_tasks/tasks/cleanup.rake

@@ -4,15 +4,15 @@ namespace :foreman_tasks do
       Clean tasks based on filter and age. ENV variables:
 
         * TASK_SEARCH : scoped search filter (example: 'label = "Actions::Foreman::Host::ImportFacts"')
-        * AFTER       : delete tasks created after *AFTER* period. Expected format is a number followed by the time unit (s,h,m,y), such as '10d' for 10 days
+        * AFTER       : delete tasks started after *AFTER* period. Expected format is a number followed by the time unit (s = seconds, m = minutes, h = hours, d = days, y = years), such as '10d' for 10 days
         * STATES      : comma separated list of task states to touch with the cleanup, by default only stopped tasks are covered, special value all can be used to clean the tasks, disregarding their states
         * NOOP        : set to "true" if the task should not actually perform the deletion
         * VERBOSE     : set to "true" for more verbose output
         * BATCH_SIZE  : the size of batches the tasks get processed in (1000 by default)
         * TASK_BACKUP : set to "true" or "false" to enable/disable task backup
 
-      If none of TASK_SEARCH, BEFORE, STATES is specified, the tasks will be cleaned based
-      configuration in settings
+      If TASK_SEARCH is set then AFTER, STATES can be set and it's used for cleanup. If TASK_SEARCH is not set then
+      the cleanup respects the configuration file and setting AFTER or STATES will throw exception.
     DESC
     task :run => 'environment' do
       options = {}

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.17.3'.freeze
+  VERSION = '0.17.4'.freeze
 end

data/test/controllers/api/tasks_controller_test.rb

@@ -11,6 +11,24 @@ module ForemanTasks
         @request.env['CONTENT_TYPE'] = 'application/json'
       end
 
+      describe 'GET /api/tasks' do
+        it 'lists all tasks with default sorting' do
+          FactoryBot.create_list(:dynflow_task, 5, :user_create_task)
+          get :index
+          assert_response :success
+          data = JSON.parse(response.body)
+          _(data['results'].count).must_equal 5
+        end
+
+        it 'supports searching' do
+          FactoryBot.create_list(:dynflow_task, 5, :user_create_task)
+          get :index, params: { :search => 'label = Actions::User::Create' }
+          assert_response :success
+          data = JSON.parse(response.body)
+          _(data['results'].count).must_equal 5
+        end
+      end
+
       describe 'GET /api/tasks/show' do
         it 'searches for task' do
           task = FactoryBot.create(:dynflow_task, :user_create_task)

data/test/unit/cleaner_test.rb

@@ -79,10 +79,10 @@ class TasksTest < ActiveSupport::TestCase
       tasks_to_delete = [FactoryBot.create(:dynflow_task, :user_create_task),
                          FactoryBot.create(:dynflow_task, :product_create_task)]
 
-      tasks_to_keep   = [FactoryBot.create(:dynflow_task, :user_create_task) do |task|
-                           task.started_at = task.ended_at = Time.zone.now
-                           task.save
-                         end]
+      tasks_to_keep = [FactoryBot.create(:dynflow_task, :user_create_task) do |task|
+                         task.started_at = task.ended_at = Time.zone.now
+                         task.save
+                       end]
       cleaner.expects(:tasks_to_csv)
       cleaner.delete
       ForemanTasks::Task.where(id: tasks_to_delete).must_be_empty

data/test/unit/recurring_logic_test.rb

@@ -44,9 +44,9 @@ class RecurringLogicsTest < ActiveSupport::TestCase
       days = '11'
       days_of_week = { '1' => '1', '2' => '0', '3' => '0', '4' => '1', '5' => '0', '6' => '1', '7' => '0' }
       time_hash = { '0' => '2015', '1' => '12', '2' => '10', '3' => hours, '4' => minutes }
-      expected_result_hourly  = { :minutes => minutes }
-      expected_result_daily   = { :minutes => minutes, :hours => hours }
-      expected_result_weekly  = { :minutes => minutes, :hours => hours, :days_of_week => '1,4,6' }
+      expected_result_hourly = { :minutes => minutes }
+      expected_result_daily = { :minutes => minutes, :hours => hours }
+      expected_result_weekly = { :minutes => minutes, :hours => hours, :days_of_week => '1,4,6' }
       expected_result_monthly = { :minutes => minutes, :hours => hours, :days => days }
       ForemanTasks::RecurringLogic.cronline_hash(:hourly,  time_hash, days, days_of_week).must_equal expected_result_hourly
       ForemanTasks::RecurringLogic.cronline_hash(:daily,   time_hash, days, days_of_week).must_equal expected_result_daily

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.17.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core