foreman-tasks 0.1.5 → 0.2.0

data/README.md

@@ -10,8 +10,8 @@ Installation
 Put the following to your Foreman's bundle.d/Gemfile.local.rb:
 
 ```ruby
-gem 'dynflow', :git => 'git@github.com:iNecas/dynflow.git'
-gem 'foreman-tasks', :git => 'git@github.com:iNecas/foreman-tasks.git'
+gem 'dynflow',       :git => 'https://github.com/Dynflow/dynflow.git'
+gem 'foreman-tasks', :git => 'https://github.com/iNecas/foreman-tasks.git'
 ```
 
 Run:

data/app/lib/actions/base.rb

@@ -17,7 +17,7 @@ module Actions
 
     # This method should return humanized description of the action, e.g. "Install Package"
     def humanized_name
-      action_class.name[/\w+$/].gsub(/([a-z])([A-Z])/) { "#{$1} #{$2}" }
+      self.class.name[/\w+$/].gsub(/([a-z])([A-Z])/) { "#{$1} #{$2}" }
     end
 
     # This method should return String of Array<String> describing input for the task

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

@@ -1,10 +1,6 @@
 module Actions
   module Helpers
     module ArgsSerialization
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
       class Builder
         attr_reader :hash
         def initialize(*objects)
@@ -22,7 +18,7 @@ module Actions
             unless object.respond_to?(:action_input_key)
               raise "Serialized model has to repond to :action_input_key method"
             end
-            key = object.action_input_key
+            key   = object.action_input_key
             value = object_to_value(object)
             add(key, value)
           when Hash
@@ -45,7 +41,7 @@ module Actions
               raise "Serialized model has to repond to :to_action_input method"
             end
             object.to_action_input
-          when String, Numeric, true, false, nil
+          when String, Numeric, true, false, nil, Dynflow::ExecutionPlan::OutputReference
             object
           else
             object.to_s
@@ -66,24 +62,9 @@ module Actions
         end
       end
 
-      module ClassMethods
-
-        def generate_phase(phase_module)
-          super.tap do |phase_class|
-            if phase_module == Dynflow::Action::PlanPhase
-              phase_class.send(:include, PlanMethods)
-            end
-          end
-        end
-
-      end
-
-      module PlanMethods
-
-        def serialize_args(*objects)
-          Builder.new(*objects).hash
-        end
-
+      def serialize_args(*objects)
+        phase! Dynflow::Action::Plan
+        Builder.new(*objects).hash
       end
     end
   end

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

@@ -1,42 +1,26 @@
 module Actions
   module Helpers
     module Lock
-      def self.included(base)
-        base.extend(ClassMethods)
+      def task
+        ::ForemanTasks::Task::DynflowTask.find_by_external_id!(execution_plan_id)
       end
 
-      module ClassMethods
-
-        def generate_phase(phase_module)
-          super.tap do |phase_class|
-            if phase_module == Dynflow::Action::PlanPhase
-              phase_class.send(:include, PlanMethods)
-            end
-          end
-        end
-
+      # @see Lock.exclusive!
+      def exclusive_lock!(resource)
+        phase! Dynflow::Action::Plan
+        ::ForemanTasks::Lock.exclusive!(resource, task.id)
       end
 
-      module PlanMethods
-
-        def task
-          ::ForemanTasks::Task::DynflowTask.find_by_external_id!(execution_plan_id)
-        end
-
-        # @see Lock.exclusive!
-        def exclusive_lock!(resource)
-          ::ForemanTasks::Lock.exclusive!(resource, task.id)
-        end
-
-        # @see Lock.lock!
-        def lock!(resource, *lock_names)
-          ::ForemanTasks::Lock.lock!(resource, task.id, *lock_names.flatten)
-        end
+      # @see Lock.lock!
+      def lock!(resource, *lock_names)
+        phase! Dynflow::Action::Plan
+        ::ForemanTasks::Lock.lock!(resource, task.id, *lock_names.flatten)
+      end
 
-        # @see Lock.link!
-        def link!(resource)
-          ::ForemanTasks::Lock.link!(resource, task.id)
-        end
+      # @see Lock.link!
+      def link!(resource)
+        phase! Dynflow::Action::Plan
+        ::ForemanTasks::Lock.link!(resource, task.id)
       end
     end
   end

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

@@ -13,7 +13,7 @@ module ForemanTasks
         # 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.action_class.name
+          self.label = main_action.class.name
         end
         update_progress
       end
@@ -28,12 +28,6 @@ module ForemanTasks
       @execution_plan ||= ForemanTasks.dynflow.world.persistence.load_execution_plan(external_id)
     end
 
-    def main_action
-      return @main_action if @main_action
-      main_action_id = execution_plan.root_plan_step.action_id
-      @main_action = execution_plan.actions.find { |action| action.id == main_action_id }
-    end
-
     def input
       main_action.respond_to?(:task_input) && main_action.task_input
     end

data/lib/foreman_tasks.rb

@@ -5,6 +5,7 @@ require 'foreman_tasks/triggers'
 
 module ForemanTasks
   extend Algebrick::TypeCheck
+  extend Algebrick::Matching
 
   def self.dynflow
     @dynflow ||= ForemanTasks::Dynflow.new
@@ -17,9 +18,15 @@ module ForemanTasks
   def self.trigger_task(async, action, *args, &block)
     Match! async, true, false
 
-    run = trigger(action, *args, &block)
-    run.finished.wait if async == false
-    ForemanTasks::Task::DynflowTask.find_by_external_id!(run.id)
+    match trigger(action, *args, &block),
+          (on ::Dynflow::World::PlaningFailed.(error: ~any) |
+                  ::Dynflow::World::ExecutionFailed.(error: ~any) do |error|
+            raise error
+          end),
+          (on ::Dynflow::World::Triggered.(execution_plan_id: ~any, future: ~any) do |id, finished|
+            finished.wait if async == false
+            ForemanTasks::Task::DynflowTask.find_by_external_id!(id)
+          end)
   end
 
   def self.async_task(action, *args, &block)

data/lib/foreman_tasks/triggers.rb

@@ -7,7 +7,7 @@ module ForemanTasks
     end
 
     def trigger(action, *args, &block)
-      foreman_tasks.dynflow.world.trigger action, *args, &block
+      foreman_tasks.trigger action, *args, &block
     end
 
     def trigger_task(async, action, *args, &block)

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails