foreman-tasks 0.6.4 → 0.6.5

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

@@ -52,6 +52,9 @@ module ForemanTasks
         param :resource_type, String, :desc => <<-DESC
           In case :type = 'resource', what resource id we're searching the tasks for
         DESC
+        param :action_types, [String], :desc => <<-DESC
+          Return just tasks of given action type, e.g. ["Actions::Katello::Repository::Synchronize"]
+        DESC
         param :active_only, :bool
         param :page, String
         param :per_page, String
@@ -80,6 +83,7 @@ module ForemanTasks
         scope = ordering_scope(scope, search_params)
         scope = search_scope(scope, search_params)
         scope = active_scope(scope, search_params)
+        scope = action_types_scope(scope, search_params)
         scope = pagination_scope(scope, search_params)
         scope.all.map { |task| task_hash(task) }
       end
@@ -122,6 +126,14 @@ module ForemanTasks
         end
       end
 
+      def action_types_scope(scope, search_params)
+        if action_types = search_params[:action_types]
+          scope.for_action_types(action_types)
+        else
+          scope
+        end
+      end
+
       def pagination_scope(scope, search_params)
         page     = search_params[:page] || 1
         per_page = search_params[:per_page] || 10

data/app/lib/actions/base.rb

@@ -20,7 +20,7 @@ module Actions
       self.class.name.demodulize.underscore.humanize
     end
 
-    # This method should return String of Array<String> describing input for the task
+    # This method should return String or Array<String> describing input for the task
     def humanized_input
       if task_input.blank?
         ""
@@ -40,10 +40,11 @@ module Actions
       end
     end
 
-    def humanized_error
+    # This method should return String or Array<String> describing the errors during the action
+    def humanized_errors
       execution_plan.steps_in_state(:skipped, :skipping, :error).map do |step|
-        step.error.message
-      end.join("\n")
+        step.error.message if step.error
+      end.compact
     end
   end
 end

data/app/models/foreman_tasks/lock.rb

@@ -13,13 +13,14 @@ module ForemanTasks
     class LockConflict < StandardError
       attr_reader :required_lock, :conflicting_locks
       def initialize(required_lock, conflicting_locks)
-        header = <<-TXT.gsub(/^ *\|/, '')
-          |Required lock is already taken by other running tasks.
-          |Please inspect their state, fix their errors nad resume them.
-          |
-          |Required lock: #{required_lock.name}
-          |Conflicts with tasks:
-        TXT
+        header = _("Required lock is already taken by other running tasks.")
+        header << "\n"
+        header << _("Please inspect their state, fix their errors and resume them.")
+        header << "\n\n"
+        header << _("Required lock: %s") % required_lock.name
+        header << "\n"
+        header << _("Conflicts with tasks:")
+        header << "\n"
         url_helpers       = Rails.application.routes.url_helpers
         conflicting_tasks = conflicting_locks.
             map(&:task).

data/app/models/foreman_tasks/task.rb

@@ -30,6 +30,7 @@ module ForemanTasks
            joins(:locks).where(:"foreman_tasks_locks.resource_id" => resource.id,
                                :"foreman_tasks_locks.resource_type" => resource.class.name)
          end)
+    scope :for_action_types, (lambda { |action_types| where('label IN (?)', Array(action_types)) })
 
     def input
       {}

data/app/models/foreman_tasks/task/dynflow_task.rb

@@ -5,21 +5,13 @@ module ForemanTasks
 
     scope :for_action, ->(action_class) { where(label: action_class.name) }
 
-    def update_from_dynflow(data, planned)
+    def update_from_dynflow(data)
       self.external_id = data[:id]
       self.started_at  = data[:started_at]
       self.ended_at    = data[:ended_at]
       self.state       = data[:state].to_s
       self.result      = data[:result].to_s
-
-      if planned
-        # for now, this part needs to laod the execution_plan to
-        # load extra data, there is place for optimization on Dynflow side
-        # if needed (getting more keys into the data value)
-        unless self.label
-          self.label = main_action.class.name
-        end
-      end
+      self.label       ||= main_action.class.name
       self.save!
     end
 
@@ -58,7 +50,8 @@ module ForemanTasks
     def humanized
       { action: get_humanized(:humanized_name),
         input:  get_humanized(:humanized_input),
-        output: [get_humanized(:humanized_output), get_humanized(:humanized_error)].reject(&:blank?).join("\n") }
+        output: get_humanized(:humanized_output),
+        errors: get_humanized(:humanized_errors) }
     end
 
     def cli_example
@@ -73,7 +66,7 @@ module ForemanTasks
     end
 
     def get_humanized(method)
-      Match! method, :humanized_name, :humanized_input, :humanized_output, :humanized_error
+      Match! method, :humanized_name, :humanized_input, :humanized_output, :humanized_errors
       if main_action.respond_to? method
         begin
           main_action.send method

data/app/views/foreman_tasks/tasks/_details.html.erb

@@ -2,7 +2,7 @@
   <%= link_to(_('Auto Reload'), '', class: %w(btn btn-sm btn-default reload-button hidden)) %>
 
   <%= link_to(_('Dynflow console'),
-              format('/foreman_tasks/dynflow/%s', @task.external_id),
+              format((defined?(Rails) ? request.script_name : '') + '/foreman_tasks/dynflow/%s', @task.external_id),
               class: %w(btn btn-sm btn-default)) if Setting['dynflow_enable_console'] %>
 
   <%= link_to(_('Resume'),

data/lib/foreman_tasks/dynflow/persistence.rb

@@ -21,14 +21,14 @@ module ForemanTasks
     def on_execution_plan_save(execution_plan_id, data)
       # We can load the data unless the execution plan was properly planned and saved
       # including its steps
-      if data[:state] == :pending
+      if data[:state] == :planning
         task = ::ForemanTasks::Task::DynflowTask.new
-        task.update_from_dynflow(data, false)
+        task.update_from_dynflow(data)
         Lock.owner!(::User.current, task.id) if ::User.current
-      elsif data[:state] != :planning
+      elsif data[:state] != :pending
         if task = ::ForemanTasks::Task::DynflowTask.find_by_external_id(execution_plan_id)
           unless task.state.to_s == data[:state].to_s
-            task.update_from_dynflow(data, true)
+            task.update_from_dynflow(data)
           end
         end
       end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement