foreman-tasks 0.6.12 → 0.6.13

data/app/helpers/foreman_tasks/tasks_helper.rb

@@ -10,7 +10,7 @@ module ForemanTasks
           part.to_s
         end
       end.join('; ')
-      h(parts.join(" "))
+      parts.join(" ")
     end
   end
 end

data/app/lib/actions/action_with_sub_plans.rb

@@ -0,0 +1,30 @@
+module Actions
+
+  class Actions::ActionWithSubPlans < Actions::EntryAction
+
+    middleware.use Actions::Middleware::KeepCurrentUser
+
+    include Dynflow::Action::WithSubPlans
+
+    def plan(*args)
+      raise NotImplementedError
+    end
+
+    def humanized_output
+      return unless counts_set?
+      _("%{total} tasks, %{success} success, %{failed} fail") %
+          { total:   output[:total_count],
+            success: output[:success_count],
+            failed:  output[:failed_count] }
+    end
+
+    def run_progress
+      if counts_set? && output[:total_count] > 0
+        (output[:success_count] + output[:failed_count]).to_f / output[:total_count]
+      else
+        0.1
+      end
+    end
+
+  end
+end

data/app/lib/actions/bulk_action.rb

@@ -1,14 +1,6 @@
 module Actions
 
-  class BulkAction < Actions::EntryAction
-
-    middleware.use Actions::Middleware::KeepCurrentUser
-
-    SubPlanFinished = Algebrick.type do
-      fields! :execution_plan_id => String,
-              :success           => type { variants TrueClass, FalseClass }
-    end
-
+  class BulkAction < Actions::ActionWithSubPlans
     # == Parameters:
     # actions_class::
     #   Class of action to trigger on targets
@@ -25,7 +17,15 @@ module Actions
     end
 
     def humanized_name
-      _("Bulk action")
+      if task.sub_tasks.first
+         task.sub_tasks.first.humanized[:action]
+      else
+        _("Bulk action")
+      end
+    end
+
+    def rescue_strategy
+      Dynflow::Action::Rescue::Skip
     end
 
     def humanized_input
@@ -36,32 +36,6 @@ module Actions
       end
     end
 
-    def humanized_output
-      return unless counts_set?
-      _("%{total} tasks, %{success} success, %{failed} fail") %
-          { total:   output[:total_count],
-            success: output[:success_count],
-            failed:  output[:failed_count] }
-    end
-
-    def run(event = nil)
-      case(event)
-      when nil
-        if output[:total_count]
-          resume
-        else
-          initiate_sub_plans
-        end
-      when SubPlanFinished
-        mark_as_done(event.execution_plan_id, event.success)
-        if done?
-          check_for_errors!
-        else
-          suspend
-        end
-      end
-    end
-
     # @api override when the logic for the initiation of the subtasks
     #      is different from the default one
     def create_sub_plans
@@ -70,85 +44,10 @@ module Actions
       targets = target_class.where(:id => input[:target_ids])
 
       targets.map do |target|
-        ForemanTasks.trigger(action_class, target, *input[:args])
-      end
-    end
-
-    def initiate_sub_plans
-      output.update(total_count: 0,
-                    failed_count: 0,
-                    success_count: 0)
-
-      planned, failed = create_sub_plans.partition(&:planned?)
-
-      sub_plan_ids = ((planned + failed).map(&:execution_plan_id))
-      set_parent_task_id(sub_plan_ids)
-
-      output[:total_count] = sub_plan_ids.size
-      output[:failed_count] = failed.size
-
-      if planned.any?
-        wait_for_sub_plans(planned)
-      else
-        check_for_errors!
-      end
-    end
-
-    def resume
-      if task.sub_tasks.active.any?
-        fail _("Some sub tasks are still not finished")
+        trigger(action_class, target, *input[:args])
       end
     end
 
-    def rescue_strategy
-      Dynflow::Action::Rescue::Skip
-    end
-
-    def wait_for_sub_plans(plans)
-      suspend do |suspended_action|
-        plans.each do |plan|
-          plan.finished.do_then do |value|
-            suspended_action << SubPlanFinished[plan.execution_plan_id,
-                                                value.result == :success]
-          end
-        end
-      end
-    end
-
-    def mark_as_done(plan_id, success)
-      if success
-        output[:success_count] += 1
-      else
-        output[:failed_count] += 1
-      end
-    end
-
-    def done?
-      if counts_set?
-        output[:total_count] - output[:success_count] - output[:failed_count] <= 0
-      else
-        false
-      end
-    end
-
-    def run_progress
-      if counts_set?
-        (output[:success_count] + output[:failed_count]).to_f / output[:total_count]
-      else
-        0.1
-      end
-    end
-
-    def counts_set?
-      output[:total_count] && output[:success_count] && output[:failed_count]
-    end
-
-    def set_parent_task_id(sub_plan_ids)
-      ForemanTasks::Task::DynflowTask.
-          where(external_id: sub_plan_ids).
-          update_all(parent_task_id: task.id)
-    end
-
     def check_targets!(targets)
       if targets.empty?
         fail _("Empty bulk action")
@@ -158,9 +57,5 @@ module Actions
       end
     end
 
-    def check_for_errors!
-      fail _("A sub task failed") if output[:failed_count] > 0
-    end
-
   end
 end

data/app/models/foreman_tasks/lock.rb

@@ -57,7 +57,8 @@ module ForemanTasks
 
     # returns a scope of the locks colliding with this one
     def colliding_locks
-      colliding_locks_scope = Lock.active.where(Lock.arel_table[:task_id].not_eq(task_id))
+      task_ids = task.self_and_parents.map(&:id)
+      colliding_locks_scope = Lock.active.where(Lock.arel_table[:task_id].not_in(task_ids))
       colliding_locks_scope = colliding_locks_scope.where(name:          name,
                                                           resource_id:   resource_id,
                                                           resource_type: resource_type)

data/app/models/foreman_tasks/task.rb

@@ -77,6 +77,14 @@ module ForemanTasks
       self.state == 'paused'
     end
 
+    def self_and_parents
+      [self].tap do |ret|
+        if parent_task
+          ret.concat(parent_task.self_and_parents)
+        end
+      end
+    end
+
     def self.search_by_generic_resource(key, operator, value)
       key =  "resource_type" if key.blank?
       key_name = self.connection.quote_column_name(key.sub(/^.*\./,''))

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

@@ -6,12 +6,17 @@ module ForemanTasks
     scope :for_action, ->(action_class) { where(label: action_class.name) }
 
     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
-      self.label       ||= main_action.class.name
+      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
+      self.parent_task_id ||= begin
+                                if main_action.caller_execution_plan_id
+                                  DynflowTask.find_by_external_id!(main_action.caller_execution_plan_id).id
+                                end
+                              end
+      self.label          ||= main_action.class.name
       self.save!
     end
 

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

@@ -124,6 +124,8 @@
                               'progress-bar-success'
                             when 'error'
                               'progress-bar-danger'
+                            when 'warning'
+                              'progress-bar-warning'
                             else
                               nil
                             end
@@ -143,9 +145,21 @@
     <%= progress.round %>%
   </div>
 </div>
+
+<% unless @task.humanized[:output].blank? %>
 <div>
   <span class="param-name"><%= _("Output") %>:</span>
   <span class="param-value">
     <pre><%= @task.humanized[:output] %></pre>
   </span>
 </div>
+<% end %>
+
+<% unless @task.humanized[:errors].blank? %>
+<div>
+  <span class="param-name"><%= _("Errors") %>:</span>
+  <span class="param-value">
+    <pre><%= @task.humanized[:errors].join("\n") %></pre>
+  </span>
+</div>
+<% end %>

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

@@ -2,9 +2,6 @@
 <% title_actions help_path%>
 
 <style>
-  .task-id {
-    white-space: nowrap;
-  }
   .param-name {
     display: inline-block;
     width: 10em;
@@ -37,7 +34,7 @@ $(document).on('click', ".table-two-pane td.two-pane-link", function(e) {
   <% for task in @tasks %>
     <tr>
       <td class="task-id two-pane-link">
-        <%= link_to_if_authorized(format_task_input(task, true),
+        <%= link_to_if_authorized(trunc_with_tooltip(format_task_input(task, true), 80),
         hash_for_foreman_tasks_task_path(:id => task)) %>
       </td>
       <td><%= task.state %></td>

data/lib/foreman_tasks/engine.rb

@@ -87,8 +87,10 @@ module ForemanTasks
 
 
     rake_tasks do
-      load File.expand_path('../tasks/dynflow.rake', __FILE__)
-      load File.expand_path('../tasks/test.rake', __FILE__)
+      %w[dynflow.rake test.rake].each do |rake_file|
+        full_path = File.expand_path("../tasks/#{rake_file}", __FILE__)
+        load full_path if File.exists?(full_path)
+      end
     end
   end
 

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.6.12"
+  VERSION = "0.6.13"
 end

data/test/helpers/foreman_tasks/tasks_helper_test.rb

@@ -12,10 +12,8 @@ module ForemanTasks
       end
 
       it 'formats the task input properly' do
-        expects(:h).with("user 'Anonymous Admin'")
-        format_task_input(@task)
-        expects(:h).with("Create user 'Anonymous Admin'")
-        format_task_input(@task, true)
+        format_task_input(@task).must_equal("user 'Anonymous Admin'")
+        format_task_input(@task, true).must_equal("Create user 'Anonymous Admin'")
       end
 
     end
@@ -38,10 +36,8 @@ module ForemanTasks
 
       it 'formats the task input properly' do
         response = "product 'product-2'; organization 'test-0'"
-        expects(:h).with(response)
-        format_task_input(@task)
-        expects(:h).with("Create #{response}")
-        format_task_input(@task, true)
+        format_task_input(@task).must_equal(response)
+        format_task_input(@task, true).must_equal("Create #{response}")
       end
     end
   end

data/test/unit/actions/action_with_sub_plans_test.rb

@@ -0,0 +1,58 @@
+require "foreman_tasks_test_helper"
+
+module ForemanTasks
+  class ActionWithSubPlansTest <  ActiveSupport::TestCase
+    self.use_transactional_fixtures = false
+
+    before do
+      User.current = User.where(:login => 'apiadmin').first
+    end
+
+    # to be able to use the locking
+    class ::User < User.parent
+      include ForemanTasks::Concerns::ActionSubject
+    end
+
+    class ParentAction < Actions::ActionWithSubPlans
+      def plan(user)
+        action_subject(user)
+        plan_self(user_id: user.id)
+      end
+
+      def create_sub_plans
+        user = User.find(input[:user_id])
+        trigger(ChildAction, user)
+      end
+    end
+
+    class ChildAction < Actions::EntryAction
+      def plan(user)
+        action_subject(user)
+        plan_self(user_id: user.id)
+      end
+      def run
+      end
+    end
+
+    describe Actions::ActionWithSubPlans do
+      let(:task) do
+        user = FactoryGirl.create(:user)
+        triggered = ForemanTasks.trigger(ParentAction, user)
+        raise triggered.error if triggered.respond_to?(:error)
+        triggered.finished.wait(2)
+        ForemanTasks::Task.find_by_external_id(triggered.id)
+      end
+
+      specify "the sub-plan stores the information about its parent" do
+        task.sub_tasks.size.must_equal 1
+        task.sub_tasks.first.label.must_equal ChildAction.name
+      end
+
+      specify "the locks of the sub-plan don't colide with the locks of its parent" do
+        child_task = task.sub_tasks.first
+        assert(child_task.locks.any? { |lock| lock.name == 'write' }, "it's locks don't conflict with parent's")
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ files:
 - app/lib/actions/foreman/architecture/destroy.rb
 - app/lib/actions/foreman/host/import_facts.rb
 - app/lib/actions/entry_action.rb
+- app/lib/actions/action_with_sub_plans.rb
 - app/lib/actions/base.rb
 - app/lib/actions/middleware/keep_current_user.rb
 - app/views/foreman_tasks/tasks/_details.html.erb
@@ -140,7 +141,6 @@ files:
 - lib/tasks/gettext.rake
 - lib/foreman-tasks.rb
 - lib/foreman_tasks/tasks/dynflow.rake
-- lib/foreman_tasks/tasks/test.rake
 - lib/foreman_tasks/version.rb
 - lib/foreman_tasks/triggers.rb
 - lib/foreman_tasks/dynflow.rb
@@ -160,6 +160,7 @@ files:
 - test/controllers/api/tasks_controller_test.rb
 - test/factories/task_factory.rb
 - test/unit/dynflow_console_authorizer_test.rb
+- test/unit/actions/action_with_sub_plans_test.rb
 - test/unit/task_test.rb
 homepage: https://github.com/theforeman/foreman-tasks
 licenses: []
@@ -192,5 +193,6 @@ test_files:
 - test/controllers/api/tasks_controller_test.rb
 - test/factories/task_factory.rb
 - test/unit/dynflow_console_authorizer_test.rb
+- test/unit/actions/action_with_sub_plans_test.rb
 - test/unit/task_test.rb
 has_rdoc: 

data/lib/foreman_tasks/tasks/test.rake

@@ -1,22 +0,0 @@
-namespace :test do
-  task :foreman_tasks => 'db:test:prepare' do
-    test_task = Rake::TestTask.new('foreman_tasks_test_task') do |t|
-      t.libs << ["test", "#{ForemanTasks::Engine.root}/test"]
-      t.test_files = ["#{ForemanTasks::Engine.root}/test/**/*_test.rb"]
-      t.verbose = true
-    end
-
-    Rake::Task[test_task.name].invoke
-  end
-end
-
-Rake::Task[:test].enhance do
-  Rake::Task['test:foreman_tasks'].invoke
-end
-
-load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task["jenkins:unit"].enhance do
-    Rake::Task['test:foreman_tasks'].invoke
-  end
-end