foreman-tasks 0.8.6 → 0.9.0

data/app/lib/actions/foreman/puppetclass/import.rb

@@ -15,7 +15,7 @@ module Actions
         end
 
         def humanized_name
-          _("Import Puppet classes")
+          _('Import Puppet classes')
         end
 
         # default value for cleaning up the tasks, it can be overriden by settings

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

@@ -62,4 +62,3 @@ module Actions
     end
   end
 end
-

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

@@ -1,8 +1,6 @@
 module Actions
   module Helpers
-
     class Humanizer
-
       def initialize(action)
         @action = action
         @input  = action.respond_to?(:task_input) ? action.task_input : action.input
@@ -20,7 +18,7 @@ module Actions
       end
 
       def self.default_parts
-        self.resource_classes_order.map { |klass| klass.new.name }
+        resource_classes_order.map { |klass| klass.new.name }
       end
 
       # Registers the resource class to the humanizer. Usually, this
@@ -29,25 +27,23 @@ module Actions
       # The `register_resource` can be run more times for the same class,
       # effectively moving the resource to the end of the humanized form.
       def self.register_resource(resource_class)
-        self.resource_classes_order.delete_if { |klass| klass.name == resource_class.name }
-        self.resource_classes_order << resource_class
+        resource_classes_order.delete_if { |klass| klass.name == resource_class.name }
+        resource_classes_order << resource_class
       end
 
       def input(*parts)
-        if parts.empty?
-          parts = self.class.default_parts
-        end
+        parts = self.class.default_parts if parts.empty?
         included_parts(parts, @input).map do |part|
           [part, humanize_resource(part, @input)]
         end
       end
 
       def included_parts(parts, data)
-        parts.select { |part| data.has_key?(part) }
+        parts.select { |part| data.key?(part) }
       end
 
       def humanize_resource(name, data)
-        if resource = self.class.resource(name)
+        if (resource = self.class.resource(name))
           { text: "#{resource.humanized_name} '#{resource.humanized_value(data)}'",
             link: resource.link(data) }
         end
@@ -62,13 +58,12 @@ module Actions
           name
         end
 
-        def link(data)
-        end
+        def link(data); end
 
         def humanized_value(data)
           fetch_data(data, name, :name) ||
-              fetch_data(data, name, :label) ||
-              fetch_data(data, name, :id)
+            fetch_data(data, name, :label) ||
+            fetch_data(data, name, :id)
         end
 
         def self.inherited(klass)
@@ -79,10 +74,10 @@ module Actions
 
         def fetch_data(data, *subkeys)
           if subkeys.empty?
-            return data
+            data
           else
             head, *tail = subkeys
-            if data.is_a?(Hash) && data.has_key?(head)
+            if data.is_a?(Hash) && data.key?(head)
               return fetch_data(data[head], *tail)
             else
               return nil
@@ -101,7 +96,7 @@ module Actions
         end
 
         def link(data)
-          if ackey_id = fetch_data(data, :activation_key, :id)
+          if (ackey_id = fetch_data(data, :activation_key, :id))
             "/activation_keys/#{ackey_id}/info"
           end
         end
@@ -156,7 +151,7 @@ module Actions
         end
 
         def link(data)
-          if content_view_id = fetch_data(data, :content_view, :id)
+          if (content_view_id = fetch_data(data, :content_view, :id))
             "#/content_views/#{content_view_id}/versions"
           end
         end
@@ -172,7 +167,7 @@ module Actions
         end
 
         def link(data)
-          if product_id = fetch_data(data, :product, :id)
+          if (product_id = fetch_data(data, :product, :id))
             "#/products/#{product_id}/info"
           end
         end
@@ -188,7 +183,7 @@ module Actions
         end
 
         def link(data)
-          if system_uuid = fetch_data(data, :system, :uuid)
+          if (system_uuid = fetch_data(data, :system, :uuid))
             "#/systems/#{system_uuid}/info"
           end
         end
@@ -204,7 +199,7 @@ module Actions
         end
 
         def link(data)
-          if org_id = fetch_data(data, :organization, :id)
+          if (org_id = fetch_data(data, :organization, :id))
             "/organizations/#{org_id}/edit"
           end
         end

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

@@ -23,4 +23,3 @@ module Actions
     end
   end
 end
-

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

@@ -7,12 +7,12 @@ module Actions
         case proxy
         when :not_defined
           if klass.is_a?(String)
-            raise ::Foreman::Exception.new(_('No proxy defined for execution'))
+            raise Foreman::Exception, _('No proxy defined for execution')
           else
             delegated_action = plan_action(klass, options)
           end
         when :not_available
-          raise ::Foreman::Exception.new(_('All proxies with the required feature are unavailable at the moment'))
+          raise Foreman::Exception, _('All proxies with the required feature are unavailable at the moment')
         when ::SmartProxy
           delegated_action = plan_action(::Actions::ProxyAction, proxy, klass, options)
         end

data/app/lib/actions/middleware/inherit_task_groups.rb

@@ -1,18 +1,17 @@
 module Actions
   module Middleware
     class InheritTaskGroups < Dynflow::Middleware
-
       def delay(*args)
-        pass *args
+        pass(*args)
       end
 
       def plan(*args)
         inherit_task_groups
-        pass *args
+        pass(*args)
       end
 
       def run(*args)
-        pass *args
+        pass(*args)
         collect_children_task_groups
       end
 
@@ -36,4 +35,3 @@ module Actions
     end
   end
 end
-

data/app/lib/actions/middleware/keep_current_user.rb

@@ -13,9 +13,7 @@
 
 module Actions
   module Middleware
-
     class KeepCurrentUser < Dynflow::Middleware
-
       def delay(*args)
         pass(*args).tap { store_current_user }
       end
@@ -54,7 +52,6 @@ module Actions
       ensure
         User.current = nil
       end
-
     end
   end
 end

data/app/lib/actions/middleware/recurring_logic.rb

@@ -1,7 +1,6 @@
 module Actions
   module Middleware
     class RecurringLogic < ::Dynflow::Middleware
-
       # ::Actions::Middleware::RecurringLogic
       #
       # A middleware designed to make action repeatable.

data/app/lib/actions/proxy_action.rb

@@ -47,7 +47,7 @@ module Actions
         response = proxy.trigger_task(proxy_action_name,
                                       input.merge(:callback => { :task_id => task.id,
                                                                  :step_id => run_step_id }))
-        output[:proxy_task_id] = response["task_id"]
+        output[:proxy_task_id] = response['task_id']
       end
     end
 
@@ -56,7 +56,7 @@ module Actions
         response = proxy.status_of_task(output[:proxy_task_id])
         if %w(stopped paused).include? response['state']
           if response['result'] == 'error'
-            raise ::Foreman::Exception, _("The smart proxy task %s failed.") % (output[:proxy_task_id])
+            raise ::Foreman::Exception, _('The smart proxy task %s failed.') % output[:proxy_task_id]
           else
             on_data(response['actions'].find { |block_action| block_action['class'] == proxy_action_name }['output'])
           end
@@ -70,7 +70,7 @@ module Actions
 
     def cancel_proxy_task
       if output[:cancel_sent]
-        error! ForemanTasks::Task::TaskCancelledException.new(_("Cancel enforced: the task might be still running on the proxy"))
+        error! ForemanTasks::Task::TaskCancelledException.new(_('Cancel enforced: the task might be still running on the proxy'))
       else
         proxy.cancel_task(output[:proxy_task_id])
         output[:cancel_sent] = true
@@ -112,7 +112,7 @@ module Actions
     def fill_continuous_output(continuous_output)
       failed_proxy_tasks.each do |failure_data|
         message = _('Initialization error: %s') %
-            "#{failure_data[:exception_class]} - #{failure_data[:exception_message]}"
+                  "#{failure_data[:exception_class]} - #{failure_data[:exception_message]}"
         continuous_output.add_output(message, 'debug', failure_data[:timestamp])
       end
     end
@@ -136,7 +136,7 @@ module Actions
     end
 
     def set_timeout!
-      time = Time.now + input[:connection_options][:timeout]
+      time = Time.zone.now + input[:connection_options][:timeout]
       schedule_timeout(time)
       metadata[:timeout] = time.to_s
     end
@@ -145,8 +145,8 @@ module Actions
       # Fails if the plan is not finished within 60 seconds from the first task trigger attempt on the smart proxy
       # If the triggering fails, it retries 3 more times with 15 second delays
       { :retry_interval => Setting['foreman_tasks_proxy_action_retry_interval'] || 15,
-        :retry_count    => Setting['foreman_tasks_proxy_action_retry_count' ]   || 4,
-        :timeout        => Setting['foreman_tasks_proxy_action_start_timeout']  || 60 }
+        :retry_count    => Setting['foreman_tasks_proxy_action_retry_count'] || 4,
+        :timeout        => Setting['foreman_tasks_proxy_action_start_timeout'] || 60 }
     end
 
     private
@@ -179,7 +179,7 @@ module Actions
       if failed_proxy_tasks.count < options[:retry_count]
         suspend do |suspended_action|
           @world.clock.ping suspended_action,
-                            Time.now + options[:retry_interval],
+                            Time.zone.now + options[:retry_interval],
                             event
         end
       else

data/app/lib/actions/serializers/active_record_serializer.rb

@@ -1,6 +1,5 @@
 module Actions
   module Serializers
-
     class ActiveRecordSerializer < ::Dynflow::Serializers::Noop
       def serialize(arg)
         if arg.is_a? ActiveRecord::Base
@@ -20,7 +19,5 @@ module Actions
         end
       end
     end
-
   end
 end
-

data/app/lib/proxy_api/foreman_dynflow/dynflow_proxy.rb

@@ -1,7 +1,7 @@
 module ProxyAPI
   module ForemanDynflow
     class DynflowProxy
-      PREFIX = 'dynflow'
+      PREFIX = 'dynflow'.freeze
 
       class Task < ProxyAPI::Resource
         def initialize(args)
@@ -24,11 +24,11 @@ module ProxyAPI
 
       # Cancel the command
       def cancel_task(proxy_task_id)
-        MultiJson.load(Task.new(@args).send(:post, "", "#{ proxy_task_id }/cancel"))
+        MultiJson.load(Task.new(@args).send(:post, '', "#{proxy_task_id}/cancel"))
       end
 
       def status_of_task(proxy_task_id)
-        MultiJson.load(Task.new(@args).send(:get, "#{ proxy_task_id }/status"))
+        MultiJson.load(Task.new(@args).send(:get, "#{proxy_task_id}/status"))
       end
 
       def tasks_count(state)

data/app/models/foreman_tasks/concerns/action_subject.rb

@@ -1,7 +1,6 @@
 module ForemanTasks
   module Concerns
     module ActionSubject
-
       extend ActiveSupport::Concern
 
       module ClassMethods
@@ -15,10 +14,10 @@ module ForemanTasks
       end
 
       def to_action_input
-        raise 'The resource needs to be saved first' if self.new_record?
+        raise 'The resource needs to be saved first' if new_record?
 
         { id: id, name: name }.tap do |hash|
-          hash.update(label: label) if self.respond_to? :label
+          hash.update(label: label) if respond_to? :label
         end
       end
 
@@ -36,13 +35,12 @@ module ForemanTasks
       def all_related_resources
         mine = Set.new Array(related_resources)
 
-        get_all_related_resources = -> resource do
+        get_all_related_resources = lambda do |resource|
           resource.is_a?(ActionSubject) ? resource.all_related_resources : []
         end
 
-        mine + mine.reduce(Set.new) { |s, resource| s + get_all_related_resources.(resource) }
+        mine + mine.reduce(Set.new) { |s, resource| s + get_all_related_resources.call(resource) }
       end
-
     end
   end
 end

data/app/models/foreman_tasks/concerns/action_triggering.rb

@@ -1,29 +1,25 @@
 module ForemanTasks
   module Concerns
     module ActionTriggering
-
       extend ActiveSupport::Concern
 
       included do
-        after_create :plan_create_action
-        after_update :plan_update_action
-        after_destroy :plan_destroy_action
+        after_create :plan_hook_action
+        after_update :plan_hook_action
+        after_destroy :plan_hook_action
 
         alias_method_chain :save, :dynflow_task_wrap
       end
 
+      # These three *_action methods are called before the save/destroy actually occurs
       # @override
-      def create_action
-      end
+      def create_action; end
 
       # @override
-      def update_action
-      end
+      def update_action; end
 
       # @override
-      def destroy_action
-      end
-
+      def destroy_action; end
 
       def save_with_dynflow_task_wrap(*args)
         dynflow_task_wrap(:save) { save_without_dynflow_task_wrap(*args) }
@@ -48,12 +44,12 @@ module ForemanTasks
       # this can be used when HostActionSubject is used for orchestration but you want to avoid
       # triggering more tasks by ActiveRecord callbacks within run/finalize phase of your task
       # e.g. host.disable_dynflow_hooks { |h| h.save }
-      def disable_dynflow_hooks(&block)
+      def disable_dynflow_hooks
         @_disable_dynflow_hooks = true
 
         if block_given?
           begin
-            block.call(self)
+            yield(self)
           ensure
             @_disable_dynflow_hooks = false
           end
@@ -75,19 +71,9 @@ module ForemanTasks
         @dynflow_sync_action = true
       end
 
-      def plan_create_action
-        plan_action(create_action, self) if create_action
-        return true
-      end
-
-      def plan_update_action
-        plan_action(update_action, self) if update_action
-        return true
-      end
-
-      def plan_destroy_action
-        plan_action(destroy_action, self) if destroy_action
-        return true
+      def plan_hook_action
+        plan_action(@_dynflow_hook_action, self) if @_dynflow_hook_action
+        true
       end
 
       # Perform planning phase of the action tied with the model event.
@@ -115,26 +101,27 @@ module ForemanTasks
       # to unexpected results.
       def dynflow_task_wrap(method)
         if ForemanTasks.dynflow.config.disable_active_record_actions ||
-              @_disable_dynflow_hooks ||
-              @_dynflow_task_wrapped
+           @_disable_dynflow_hooks ||
+           @_dynflow_task_wrapped
           return yield
         end
         @_dynflow_task_wrapped = true
 
-        action = case method
+        @_dynflow_hook_action = case method
                  when :save
-                   self.new_record? ? create_action : update_action
+                   new_record? ? create_action : update_action
                  when :destroy
                    destroy_action
                  else
                    raise 'unexpected method'
                  end
-        ensure_not_in_transaction! if action
+        ensure_not_in_transaction! if @_dynflow_hook_action
         yield.tap do |result|
           execute_planned_action if result
           sync_action_flag_reset!
         end
       ensure
+        @_dynflow_hook_action = nil
         @_dynflow_task_wrapped = false
       end
 
@@ -143,7 +130,7 @@ module ForemanTasks
       def ensure_not_in_transaction!
         # we don't care about transactions when using InThreadWorld
         if defined?(::Dynflow::Testing::InThreadWorld) &&
-              ForemanTasks.dynflow.world.is_a?(::Dynflow::Testing::InThreadWorld)
+           ForemanTasks.dynflow.world.is_a?(::Dynflow::Testing::InThreadWorld)
           return
         end
         if self.class.connection.open_transactions > 0
@@ -159,7 +146,7 @@ module ForemanTasks
             run.wait
             if run.value.error?
               task = ForemanTasks::Task::DynflowTask.where(:external_id => @execution_plan.id).first!
-              raise ForemanTasks::TaskError.new(task)
+              raise ForemanTasks::TaskError, task
             end
           end
         end