foreman-tasks 0.1.3 → 0.1.4

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

@@ -3,12 +3,14 @@ module Actions
 
     class Humanizer
 
-      PARTS_ORDER = [:repository,
+      PARTS_ORDER = [:user,
+                     :repository,
                      :product,
                      :system,
                      :organization]
       # Just to get the trings into pot file
-      PARTS_TRANSLATIONS = [N_('repository'),
+      PARTS_TRANSLATIONS = [N_('user'),
+                            N_('repository'),
                             N_('product'),
                             N_('system'),
                             N_('organization')]

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

@@ -5,6 +5,10 @@ module ForemanTasks
       extend ActiveSupport::Concern
 
       included do
+        before_create :before_plan_action
+        before_update :before_plan_action
+        before_destroy :before_plan_action
+
         after_create :plan_create_action
         after_update :plan_update_action
         after_destroy :plan_destroy_action
@@ -52,6 +56,17 @@ module ForemanTasks
         return result
       end
 
+      # dynflow actions are async by default
+      def before_plan_action
+        @dynflow_sync_action = false
+        return true
+      end
+
+      # to make the triggered action synchronous
+      def sync_action!
+        @dynflow_sync_action = true
+      end
+
       def create_action
       end
 
@@ -93,7 +108,8 @@ module ForemanTasks
       # Execute the prepared execution plan after the db transaction was commited
       def execute_planned_action
         if @execution_plan
-          ::ForemanTasks.dynflow.world.execute(@execution_plan.id)
+          run = ::ForemanTasks.dynflow.world.execute(@execution_plan.id)
+          run.finished.wait if @dynflow_sync_action
         end
         return true
       end

data/lib/foreman_tasks.rb

@@ -1,8 +1,10 @@
 require 'foreman_tasks/version'
 require 'foreman_tasks/engine'
 require 'foreman_tasks/dynflow'
+require 'foreman_tasks/triggers'
 
 module ForemanTasks
+  extend Algebrick::TypeCheck
 
   def self.dynflow
     @dynflow ||= ForemanTasks::Dynflow.new
@@ -12,9 +14,21 @@ module ForemanTasks
     dynflow.world.trigger action, *args, &block
   end
 
-  def self.async_task(action, *args, &block)
+  def self.trigger_task(async, action, *args, &block)
+    Match! async, true, false
+
     run = trigger(action, *args, &block)
-    ForemanTasks::Task::DynflowTask.find_by_external_id(run.id)
+    run.finished.wait if async == false
+    ForemanTasks::Task::DynflowTask.find_by_external_id!(run.id)
+  end
+
+  def self.async_task(action, *args, &block)
+    trigger_task true, action, *args, &block
+  end
+
+  def self.sync_task(action, *args, &block)
+    # TODO raise aggregation error when there are failed run-steps
+    trigger_task false, action, *args, &block
   end
 
 end

data/lib/foreman_tasks/dynflow.rb

@@ -38,11 +38,6 @@ module ForemanTasks
       config.initialize_world.tap do |world|
         @world = world
 
-        ActionDispatch::Reloader.to_prepare do
-          ForemanTasks.dynflow.eager_load_actions!
-          world.reload!
-        end
-
         unless config.remote?
           at_exit { world.terminate.wait }
 
@@ -100,6 +95,7 @@ module ForemanTasks
           require_dependency file
         end
       end
+      @world.reload! if @world
     end
   end
 end

data/lib/foreman_tasks/engine.rb

@@ -40,6 +40,11 @@ module ForemanTasks
     end
 
     initializer "foreman_tasks.initialize_dynflow" do
+      ForemanTasks.dynflow.eager_load_actions!
+      ActionDispatch::Reloader.to_prepare do
+        ForemanTasks.dynflow.eager_load_actions!
+      end
+
       unless ForemanTasks.dynflow.config.lazy_initialization
         if defined?(PhusionPassenger)
           PhusionPassenger.on_event(:starting_worker_process) do |forked|

data/lib/foreman_tasks/triggers.rb

@@ -0,0 +1,25 @@
+module ForemanTasks
+  module Triggers
+    # for test overrides if needed
+    attr_writer :foreman_tasks
+    def foreman_tasks
+      @foreman_tasks ||= ForemanTasks
+    end
+
+    def trigger(action, *args, &block)
+      foreman_tasks.dynflow.world.trigger action, *args, &block
+    end
+
+    def trigger_task(async, action, *args, &block)
+      foreman_tasks.trigger_task(async, action, *args, &block)
+    end
+
+    def async_task(action, *args, &block)
+      foreman_tasks.async_task(action, *args, &block)
+    end
+
+    def sync_task(action, *args, &block)
+      foreman_tasks.sync_task(action, *args, &block)
+    end
+  end
+end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -132,7 +132,6 @@ files:
 - app/lib/actions/helpers/lock.rb
 - app/lib/actions/entry_action.rb
 - app/lib/actions/base.rb
-- app/lib/actions/test_action.rb
 - app/lib/actions/foreman/host/import_facts.rb
 - app/lib/actions/foreman/architecture/create.rb
 - app/lib/actions/foreman/architecture/update.rb
@@ -156,6 +155,7 @@ files:
 - lib/foreman_tasks/tasks/dynflow.rake
 - lib/foreman_tasks/engine.rb
 - lib/foreman_tasks/version.rb
+- lib/foreman_tasks/triggers.rb
 - lib/foreman_tasks/dynflow/configuration.rb
 - lib/foreman_tasks/dynflow/persistence.rb
 - lib/foreman_tasks/dynflow/daemon.rb

data/app/lib/actions/test_action.rb

@@ -1,17 +0,0 @@
-module Actions
-  class TestAction < Base
-
-    def run(event = nil)
-      case event
-      when nil
-        suspend do |suspended_action|
-          puts "Execution plan id is #{suspended_action.execution_plan_id}"
-          puts "Step id is #{suspended_action.step_id}"
-        end
-      else
-        puts event.inspect
-      end
-    end
-
-  end
-end