foreman-tasks 0.7.5 → 0.7.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmZhMjBlOGVlMDU5NDI1NjNhZWRhNDM3Mjk5MzM3NTdhOTI4ZWE2MQ==
+    ZWM5N2ZhYzFhMzkxNDFhYTk2MGE4ZGRkNzNjNzRiZTlkNjJmNDdhNQ==
   data.tar.gz: !binary |-
-    MmFkYzY1MzcxOTZiNTgxMzUyNjAxZTI4ZDYyOWI2N2FlOGVmMzA5Mw==
+    ODZiMDI1YmY1MDQ1ODBiMGZiZjE0NjMwNDhiNGUzMzY3YmIwM2FjMw==
 SHA512:
   metadata.gz: !binary |-
-    YzIwNTJlMmY5MGVmNWY4OWM2MWMwNjFhODkzZjkzZTFmMDZlYjcyMjI1YjIz
-    YzQ2ZjE0YTFlZDgzYTM4MjQ5Njk5ZmJjZmU5ZTJhY2Y0Y2E3M2M2NDFkOTdl
-    ZTQ5N2ZhMTg4MTA1YWQ3OTIyMjFlY2I1MjgxMDBiNjQ1NWQxNzk=
+    MjIxYzA5NDE2YTlhMzVlZDdhYWFhOWY2ODg2MWNjNTI5ZjkyM2ZlMWU4MmY1
+    MzYzNGVjZTM4NDUyYTc2NDEwNWMxMjQyODdlYjU1YjM4ZjA5ZWRiYmExZjNj
+    NzI2OTkzMGIzZjA5MDI2YTFkMTUzZjdkNDdkY2RhMTM5MjkwZWY=
   data.tar.gz: !binary |-
-    ZTI2YjJjYzc4NzUwZjA1YWIzMzNlZDIxNTk0OTFiZGU5NDZkYzQzNjgyNjE3
-    MGVkODE5ODdjMDhmODlmYWQ5YzI3MGU2ZjZmYzM2NjE2NGYyODA3N2FhNDkx
-    NDRkZGNlNzJhNTE5YzczMDIyYjBhOGU5OGY2NjkwZGFjYzA4ZTg=
+    NDNkMGZlMDkzMTg1MjQ4YmUxZmRhNGFhZTQ5N2Y4YzUxMTBiM2EyZTIzMDIw
+    MGZlM2E0NDQyYzRiZTIwNDU2ZDBjNzQ5OGI1NmFlNTMyZGE2OWVmMGM2NzBl
+    YWMzNDUyMzViYWMxYmI4MjcwOWExNTFlYzI3NmM2MThmODRlZjk=

data/app/helpers/foreman_tasks/tasks_helper.rb

@@ -2,8 +2,8 @@ module ForemanTasks
   module TasksHelper
     def format_task_input(task, include_action = false)
       parts = []
-      parts << task.humanized[:action] if include_action
-      parts << Array(task.humanized[:input]).map do |part|
+      parts << task.get_humanized(:name) if include_action
+      parts << Array(task.get_humanized(:input)).map do |part|
         if part.is_a? Array
           part[1][:text]
         else

data/app/lib/actions/proxy_action.rb

@@ -147,9 +147,10 @@ module Actions
     end
 
     def format_exception(exception)
-      { output[:proxy_task_id] =>
-            { :exception_class => exception.class.name,
-              :execption_message => exception.message } }
+      { :proxy_task_id => output[:proxy_task_id],
+        :exception_class => exception.class.name,
+        :exception_message => exception.message,
+        :timestamp => Time.now.to_f }
     end
 
     def handle_connection_exception(exception, event = nil)

data/app/models/foreman_tasks/task.rb

@@ -31,14 +31,14 @@ module ForemanTasks
     scoped_search :in => :owners,  :on => :login, :complete_value => true, :rename => "owner.login", :ext_method => :search_by_owner
     scoped_search :in => :owners,  :on => :firstname, :complete_value => true, :rename => "owner.firstname", :ext_method => :search_by_owner
 
-    scope :active, -> {  where('state != ?', :stopped) }
-    scope :running, -> {  where("state NOT IN ('stopped', 'paused')") }
+    scope :active, -> {  where('foreman_tasks_tasks.state != ?', :stopped) }
+    scope :running, -> {  where("foreman_tasks_tasks.state NOT IN ('stopped', 'paused')") }
     scope :for_resource,
         (lambda do |resource|
            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)) })
+    scope :for_action_types, (lambda { |action_types| where('foreman_tasks_tasks.label IN (?)', Array(action_types)) })
 
     def input
       {}

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

@@ -83,14 +83,20 @@ module ForemanTasks
     end
 
     def get_humanized(method)
-      Match! method, :humanized_name, :humanized_input, :humanized_output, :humanized_errors
-      if main_action.respond_to? method
-        begin
-          main_action.send method
-        rescue => error
-          "#{error.message} (#{error.class})\n#{error.backtrace.join "\n"}"
-        end
+      @humanized_cache ||= {}
+      if [:name, :input, :output, :error].include?(method)
+        method = "humanized_#{method}".to_sym
       end
+      Match! method, :humanized_name, :humanized_input, :humanized_output, :humanized_errors
+      @humanized_cache[method] ||= begin
+                                     if main_action.respond_to? method
+                                       begin
+                                         main_action.send method
+                                       rescue Exception => error # rubocop:disable Lint/RescueException
+                                         "#{error.message} (#{error.class})\n#{error.backtrace.join "\n"}"
+                                       end
+                                     end
+                                   end
     end
 
     def self.consistency_check

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

data/test/helpers/foreman_tasks/tasks_helper_test.rb

@@ -2,13 +2,12 @@ require "foreman_tasks_test_helper"
 
 module ForemanTasks
   class TasksHelperTest < ActionView::TestCase
-
     describe 'when formatting simple input' do
       before do
         @task = FactoryGirl.build(:dynflow_task, :user_create_task)
-        humanized = {:action=>"Create", :input=>[[:user, {:text=>"user 'Anonymous Admin'", :link=>nil}]], :output=>"", :errors=>[]}
+        humanized = { :humanized_name => "Create", :humanized_input => [[:user, {:text => "user 'Anonymous Admin'", :link => nil}]] }
+        @task.instance_variable_set('@humanized_cache', humanized)
         @task.stubs(:input).returns({"user"=>{"id"=>1, "name"=>"Anonymous Admin"}, "locale"=>"en"})
-        @task.stubs(:humanized).returns(humanized)
       end
 
       it 'formats the task input properly' do
@@ -21,17 +20,15 @@ module ForemanTasks
     describe 'when formatting input' do
       before do
         @task = FactoryGirl.build(:dynflow_task, :product_create_task)
-        humanized = {:action=>"Create",
-                     :input=>[[:product, {:text=>"product 'product-2'", :link=>"#/products/3/info"}], [:organization, {:text=>"organization 'test-0'", :link=>"/organizations/3/edit"}]],
-                     :output=>"",
-                     :errors=>[]}
+        humanized = { :humanized_name => "Create",
+                      :humanized_input => [[:product, { :text => "product 'product-2'", :link => "#/products/3/info"}], [:organization, { :text => "organization 'test-0'", :link => "/organizations/3/edit" }]]}
+        @task.instance_variable_set('@humanized_cache', humanized)
         input = {"product"=>{"id"=>3, "name"=>"product-2", "label"=>"product-2", "cp_id"=>nil},
                  "provider"=>{"id"=>3, "name"=>"Anonymous"},
                  "organization"=>{"id"=>3, "name"=>"test-0", "label"=>"test-0"},
                  "cp_id"=>"1412251033866",
                  "locale"=>"en"}
         @task.stubs(:input).returns(input)
-        @task.stubs(:humanized).returns(humanized)
       end
 
       it 'formats the task input properly' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow