foreman-tasks 0.8.6 → 0.9.0

data/app/controllers/foreman_tasks/recurring_logics_controller.rb

@@ -1,14 +1,12 @@
 module ForemanTasks
   class RecurringLogicsController < ::ApplicationController
-
-    before_filter :find_recurring_logic, :only => [:show, :cancel]
+    before_action :find_recurring_logic, :only => [:show, :cancel]
 
     def index
       @recurring_logics = filter(resource_base)
     end
 
-    def show
-    end
+    def show; end
 
     def cancel
       @recurring_logic.cancel
@@ -28,6 +26,5 @@ module ForemanTasks
     def filter(scope)
       scope.search_for(params[:search]).paginate(:page => params[:page])
     end
-
   end
 end

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -2,7 +2,7 @@ module ForemanTasks
   class TasksController < ::ApplicationController
     include Foreman::Controller::AutoCompleteSearch
 
-    before_filter :restrict_dangerous_actions, :only => [:unlock, :force_unlock]
+    before_action :restrict_dangerous_actions, :only => [:unlock, :force_unlock]
 
     def show
       @task = Task.find(params[:id])
@@ -10,7 +10,7 @@ module ForemanTasks
 
     def index
       params[:order] ||= 'started_at DESC'
-      @tasks         = filter(resource_base)
+      @tasks = filter(resource_base)
     end
 
     def sub_tasks
@@ -21,7 +21,7 @@ module ForemanTasks
 
     def cancel_step
       task = find_dynflow_task
-      flash[:notice] = _("Trying to cancel step %s") % params[:step_id]
+      flash[:notice] = _('Trying to cancel step %s') % params[:step_id]
       ForemanTasks.dynflow.world.event(task.external_id, params[:step_id].to_i, ::Dynflow::Action::Cancellable::Cancel).wait
       redirect_to foreman_tasks_task_path(task)
     end
@@ -54,7 +54,7 @@ module ForemanTasks
         task.save!
         flash[:notice] = _('The task resources were unlocked.')
       else
-        flash[:warning] =  _('The execution has to be paused.')
+        flash[:warning] = _('The execution has to be paused.')
       end
       redirect_to :back
     end
@@ -93,7 +93,7 @@ module ForemanTasks
       end
     end
 
-    def resource_scope(options = {})
+    def resource_scope(_options = {})
       @resource_scope ||= ForemanTasks::Task.authorized("#{action_permission}_foreman_tasks")
     end
 
@@ -102,9 +102,8 @@ module ForemanTasks
     end
 
     def filter(scope)
-      scope.search_for(params[:search], :order => params[:order]).
-          paginate(:page => params[:page]).select('DISTINCT foreman_tasks_tasks.*')
+      scope.search_for(params[:search], :order => params[:order])
+           .paginate(:page => params[:page]).select('DISTINCT foreman_tasks_tasks.*')
     end
-
   end
 end

data/app/helpers/foreman_tasks/foreman_tasks_helper.rb

@@ -1,18 +1,17 @@
 # coding: utf-8
 module ForemanTasks
   module ForemanTasksHelper
-
     def recurring_logic_state(recurring_logic)
       icon, status = case recurring_logic.state
-             when 'active'
-               'glyphicon-info-sign'
-             when 'finished'
-               ['glyphicon-ok-sign', 'status-ok']
-             when 'cancelled'
-               ['glyphicon-warning-sign', 'status-error']
-             else
-               'glyphicon-question-sign'
-             end
+                     when 'active'
+                       'glyphicon-info-sign'
+                     when 'finished'
+                       ['glyphicon-ok-sign', 'status-ok']
+                     when 'cancelled'
+                       ['glyphicon-warning-sign', 'status-error']
+                     else
+                       'glyphicon-question-sign'
+                     end
       content_tag(:i, '&nbsp'.html_safe, :class => "glyphicon #{icon}") + content_tag(:span, recurring_logic.humanized_state, :class => status)
     end
 
@@ -20,14 +19,14 @@ module ForemanTasks
       return 'task-status pficon-help' if task.state != 'stopped'
 
       icon_class = case task.result
-                     when 'success'
-                       'pficon-ok'
-                     when 'error'
-                       'pficon-error-circle-o'
-                     when 'warning'
-                       'pficon-ok status-warn'
-                     else
-                       'pficon-help'
+                   when 'success'
+                     'pficon-ok'
+                   when 'error'
+                     'pficon-error-circle-o'
+                   when 'warning'
+                     'pficon-ok status-warn'
+                   else
+                     'pficon-help'
                    end
 
       "task-status #{icon_class}"
@@ -38,7 +37,7 @@ module ForemanTasks
         _('N/A')
       else
         content_tag :span, (time > Time.now.utc ? _('in %s') : _('%s ago')) % time_ago_in_words(time),
-                    { :'data-original-title' => time.try(:in_time_zone), :rel => 'twipsy' }
+                    :'data-original-title' => time.try(:in_time_zone), :rel => 'twipsy'
       end
     end
 
@@ -47,14 +46,14 @@ module ForemanTasks
         _('N/A')
       else
         content_tag :span, distance_of_time_in_words(start, finish),
-                    { :'data-original-title' => number_with_delimiter((finish - start).to_i) + _(' seconds'), :rel => 'twipsy' }
+                    :'data-original-title' => number_with_delimiter((finish - start).to_i) + _(' seconds'), :rel => 'twipsy'
       end
     end
 
     def recurring_logic_action_buttons(recurring_logic)
       buttons = []
       if authorized_for(:permission => :edit_recurring_logics, :auth_object => recurring_logic)
-        buttons << link_to(N_("Cancel"), cancel_foreman_tasks_recurring_logic_path(recurring_logic), :method => :post, :class => 'btn btn-danger') unless %w(cancelled finished).include? recurring_logic.state
+        buttons << link_to(N_('Cancel'), cancel_foreman_tasks_recurring_logic_path(recurring_logic), :method => :post, :class => 'btn btn-danger') unless %w(cancelled finished).include? recurring_logic.state
       end
       button_group buttons
     end
@@ -107,7 +106,7 @@ module ForemanTasks
       end
     end
 
-    def trigger_selector(f, triggering = Triggering.new, options = {})
+    def trigger_selector(f, triggering = Triggering.new, _options = {})
       render :partial => 'common/trigger_form', :locals => { :f => f, :triggering => triggering }
     end
 
@@ -116,15 +115,16 @@ module ForemanTasks
     def future_mode_fieldset(f, triggering)
       tags = []
       tags << text_f(f, :start_at_raw, :label => _('Start at'), :placeholder => 'YYYY-mm-dd HH:MM')
-      tags << text_f(f, :start_before_raw, :label => _('Start before'), :placeholder => 'YYYY-mm-dd HH:MM', :help_inline => popover(_('Explanation'), _('Indicates that the action should be cancelled if it cannot be started before this time.')))
-      content_tag(:fieldset, nil, :id => "trigger_mode_future", :class => "trigger_mode_form #{'hidden' unless triggering.future?}") do
+      tags << text_f(f, :start_before_raw, :label => _('Start before'), :placeholder => 'YYYY-mm-dd HH:MM',
+                     :label_help => _('Indicates that the action should be cancelled if it cannot be started before this time.'))
+      content_tag(:fieldset, nil, :id => 'trigger_mode_future', :class => "trigger_mode_form #{'hidden' unless triggering.future?}") do
         tags.join.html_safe
       end
     end
 
     def recurring_mode_fieldset(f, triggering)
       tags = []
-      tags << selectable_f(f, :input_type, %w(cronline monthly weekly daily hourly), {}, :label => _("Repeats"), :id => 'input_type_selector')
+      tags << selectable_f(f, :input_type, %w(cronline monthly weekly daily hourly), {}, :label => _('Repeats'), :id => 'input_type_selector')
       tags += [
         cronline_fieldset(f, triggering),
         monthly_fieldset(f, triggering),
@@ -150,17 +150,15 @@ module ForemanTasks
         # TRANSLATORS: this translation is referring to an option which is a time interval
         _('is day of week (range: 0-6)')
       ].map { |opt| content_tag(:li, opt) }.join
-      help = content_tag(:span, nil, :class => 'help-inline') do
-        popover(_('Explanation'),
-                _("Cron line format 'a b c d e', where: %s") % ("<br><ol type=\"a\">#{options}</ol>"))
-      end
-      content_tag(:fieldset, nil, :class => "input_type_form #{'hidden' unless triggering.input_type == :cronline}", :id => "input_type_cronline") do
-        text_f f, :cronline, :label => _('Cron line'), :placeholder => '* * * * *', :help_inline => help
+
+      help = _("Cron line format 'a b c d e', where: %s") % "<br><ol type=\"a\">#{options}</ol>".html_safe
+      content_tag(:fieldset, nil, :class => "input_type_form #{'hidden' unless triggering.input_type == :cronline}", :id => 'input_type_cronline') do
+        text_f f, :cronline, :label => _('Cron line'), :placeholder => '* * * * *', :label_help => help
       end
     end
 
     def monthly_fieldset(f, triggering)
-      content_tag(:fieldset, nil, :id => "input_type_monthly", :class => "input_type_form #{'hidden' unless triggering.input_type == :monthly}") do
+      content_tag(:fieldset, nil, :id => 'input_type_monthly', :class => "input_type_form #{'hidden' unless triggering.input_type == :monthly}") do
         text_f(f, :days, :label => _('Days'), :placeholder => '1,2...')
       end
     end
@@ -170,14 +168,14 @@ module ForemanTasks
         f.fields_for :days_of_week do |days_of_week|
           inline_checkboxes_f(days_of_week,
                               :weekday,
-                              { :label => _("Days of week") },
-                              { 1 => _("Mon"),
-                                2 => _("Tue"),
-                                3 => _("Wed"),
-                                4 => _("Thu"),
-                                5 => _("Fri"),
-                                6 => _("Sat"),
-                                7 => _("Sun") })
+                              { :label => _('Days of week') },
+                              1 => _('Mon'),
+                              2 => _('Tue'),
+                              3 => _('Wed'),
+                              4 => _('Thu'),
+                              5 => _('Fri'),
+                              6 => _('Sat'),
+                              7 => _('Sun'))
         end
       end
     end
@@ -186,16 +184,16 @@ module ForemanTasks
       tags = []
       tags << content_tag(:fieldset, nil, :id => 'time_picker', :class => "input_type_form #{'hidden' if triggering.input_type == :cronline}") do
         # TRANSLATORS: Time widget for when a task should start
-        time_f(f, :time, { :label => _("At"), :id => 'something' }, { :time_separator => '' })
+        time_f(f, :time, { :label => _('At'), :id => 'something' }, :time_separator => '')
       end
       tags << number_f(f, :max_iteration, :label => _('Repeat N times'), :min => 1, :placeholder => 'N')
-      tags << field(f, :end_time_limit_select, :label => _("Ends"), :control_group_id => "end_time_limit_select") do
-        radio_button_f(f, :end_time_limited, :value => false, :checked=> true, :text => _("Never"), :class => 'end_time_limit_selector') +
-        # TRANSLATORS: Button text for saying when a task should end
-        radio_button_f(f, :end_time_limited, :value => true, :text => _("On"), :class => 'end_time_limit_selector')
+      tags << field(f, :end_time_limit_select, :label => _('Ends'), :control_group_id => 'end_time_limit_select') do
+        radio_button_f(f, :end_time_limited, :value => false, :checked => true, :text => _('Never'), :class => 'end_time_limit_selector') +
+          # TRANSLATORS: Button text for saying when a task should end
+          radio_button_f(f, :end_time_limited, :value => true, :text => _('On'), :class => 'end_time_limit_selector')
       end
       tags << content_tag(:fieldset, nil, :id => 'end_time_limit_form', :class => "input_type_form #{'hidden' unless triggering.end_time_limited}") do
-        datetime_f f, :end_time, { :label => _("Ends at") }, { :use_month_numbers => true, :use_two_digit_numbers => true, :time_separator => '' }
+        datetime_f f, :end_time, { :label => _('Ends at') }, :use_month_numbers => true, :use_two_digit_numbers => true, :time_separator => ''
       end
       tags.join.html_safe
     end

data/app/helpers/foreman_tasks/tasks_helper.rb

@@ -11,7 +11,7 @@ module ForemanTasks
           part.to_s
         end
       end.join('; ')
-      parts.join(" ")
+      parts.join(' ')
     end
 
     def format_recurring_logic_limit(thing)

data/app/lib/actions/action_with_sub_plans.rb

@@ -1,21 +1,20 @@
 module Actions
-
   class Actions::ActionWithSubPlans < Actions::EntryAction
-
     middleware.use Actions::Middleware::KeepCurrentUser
 
     include Dynflow::Action::WithSubPlans
+    include Dynflow::Action::WithBulkSubPlans
 
-    def plan(*args)
+    def plan(*_args)
       raise NotImplementedError
     end
 
     def humanized_output
       return unless counts_set?
-      _("%{total} task(s), %{success} success, %{failed} fail") %
-          { total:   output[:total_count],
-            success: output[:success_count],
-            failed:  output[:failed_count] }
+      _('%{total} task(s), %{success} success, %{failed} fail') %
+        { total:   output[:total_count],
+          success: output[:success_count],
+          failed:  output[:failed_count] }
     end
 
     def run_progress
@@ -25,6 +24,5 @@ module Actions
         0.1
       end
     end
-
   end
 end

data/app/lib/actions/base.rb

@@ -1,6 +1,5 @@
 module Actions
   class Base < Dynflow::Action
-
     def task
       @task ||= ::ForemanTasks::Task::DynflowTask.where(:external_id => execution_plan_id).first!
     end
@@ -8,7 +7,7 @@ module Actions
     # This method says what data form input gets into the task details in Rest API
     # By default, it sends the whole input there.
     def task_input
-      self.input
+      input
     end
 
     # This method says what data form output gets into the task details in Rest API
@@ -16,7 +15,7 @@ module Actions
     # perhaps also aggraget data from subactions if needed (using +all_actions+) method
     # of Dynflow::Action::Presenter
     def task_output
-      self.output
+      output
     end
 
     # This method should return humanized description of the action, e.g. "Install package"
@@ -27,7 +26,7 @@ module Actions
     # This method should return String or Array<String> describing input for the task
     def humanized_input
       if task_input.blank?
-        ""
+        ''
       else
         task_input.pretty_inspect
       end
@@ -38,7 +37,7 @@ module Actions
     # description of restuls of the action
     def humanized_output
       if task_output.blank?
-        ""
+        ''
       else
         task_output.pretty_inspect
       end
@@ -52,8 +51,8 @@ module Actions
     end
 
     def already_running?
-      ForemanTasks::Task::DynflowTask.for_action(self.class).
-        running.where('external_id != ?', execution_plan_id).any?
+      ForemanTasks::Task::DynflowTask.for_action(self.class)
+                                     .running.where('external_id != ?', execution_plan_id).any?
     end
 
     def serializer_class

data/app/lib/actions/bulk_action.rb

@@ -1,5 +1,4 @@
 module Actions
-
   class BulkAction < Actions::ActionWithSubPlans
     # == Parameters:
     # actions_class::
@@ -22,9 +21,9 @@ module Actions
 
     def humanized_name
       if task.sub_tasks.first
-         task.sub_tasks.first.humanized[:action]
+        task.sub_tasks.first.humanized[:action]
       else
-        _("Bulk action")
+        _('Bulk action')
       end
     end
 
@@ -36,7 +35,7 @@ module Actions
       a_sub_task = task.sub_tasks.first
       if a_sub_task
         [a_sub_task.humanized[:action].to_s.downcase] +
-            Array(a_sub_task.humanized[:input]) + ['...']
+          Array(a_sub_task.humanized[:input]) + ['...']
       end
     end
 
@@ -45,7 +44,7 @@ module Actions
     def create_sub_plans
       action_class = input[:action_class].constantize
       target_class = input[:target_class].constantize
-      targets = target_class.where(:id => input[:target_ids])
+      targets = target_class.where(:id => current_batch)
 
       targets.map do |target|
         trigger(action_class, target, *input[:args])
@@ -53,13 +52,18 @@ module Actions
     end
 
     def check_targets!(targets)
-      if targets.empty?
-        fail ::Foreman::Exception.new(N_("Empty bulk action"))
-      end
+      raise Foreman::Exception, N_('Empty bulk action') if targets.empty?
       if targets.map(&:class).uniq.length > 1
-        fail ::Foreman::Exception.new(N_("The targets are of different types"))
+        raise Foreman::Exception, N_('The targets are of different types')
       end
     end
 
+    def batch(from, size)
+      input[:target_ids].slice(from, size)
+    end
+
+    def total_count
+      input[:target_ids].count
+    end
   end
 end

data/app/lib/actions/entry_action.rb

@@ -1,5 +1,4 @@
 module Actions
-
   class EntryAction < Actions::Base
     include Helpers::ArgsSerialization
     include Helpers::Lock
@@ -57,12 +56,11 @@ module Actions
     end
 
     def delay(_schedule_options, *args)
-      self.serializer_class.new args
+      serializer_class.new args
     end
 
     def self.serializer_class
       Serializers::ActiveRecordSerializer
     end
-
   end
 end

data/app/lib/actions/foreman/host/import_facts.rb

@@ -1,14 +1,12 @@
 module Actions
   module Foreman
     module Host
-
       class ImportFacts < Actions::EntryAction
-
         def resource_locks
           :import_facts
         end
 
-        def plan(host_type, host_name, facts, certname, proxy_id)
+        def plan(_host_type, host_name, facts, certname, proxy_id)
           facts['domain'].try(:downcase!)
           host = ::Host::Base.import_host(host_name, certname, facts, proxy_id)
           action_subject(host, :facts => facts)
@@ -37,7 +35,7 @@ module Actions
         end
 
         def humanized_name
-          _("Import facts")
+          _('Import facts')
         end
 
         def humanized_input
@@ -48,7 +46,6 @@ module Actions
         def self.cleanup_after
           '30d'
         end
-
       end
     end
   end