foreman-tasks 0.7.17 → 0.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6af64bff2142846ebf7fcc41ca5202b3f1bf5850
-  data.tar.gz: a001ea05b594c4180546b6505f20fd66bf01e14b
+  metadata.gz: 09501ff6d55c7b3dd3433795384e07b36813b746
+  data.tar.gz: 1c38dfc4abcb803584cd88d5154ea66115840904
 SHA512:
-  metadata.gz: 995c854d10a044c6cdcd8d33b52b342b639d134623145afe198908936f3c4d14ca2ab97dbdcf4c3f2703b8c27253da788ac87913009f35e633ba8139f862264e
-  data.tar.gz: 343184b0db3a10549586fdda4fc0e89361f39a9dc8576ebdcfc466f0c044411c7abfb5de6c3dfc34c4f65145fa4ab171c2d5cd22263845ec964bb72d55fe0294
+  metadata.gz: 9bb4ca4e6a26e38604f4d5b4e6bb58296c2b07c676f3f615126de2a88e545d475453e5a10b5dc80aff3201deb1082a3b7cb7f37d2219808046f766bb4452fb63
+  data.tar.gz: 5fcbb29b5e8e1a33cb37a1d233f83be129c8377357d721cfe0793f18b723a1d6587b774ba21494fe6322c9e1749bb9342ce2813dff3d8aa21b31be9870728839

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

@@ -6,13 +6,14 @@ module ForemanTasks
     scope :for_action, ->(action_class) { where(label: action_class.name) }
 
     def update_from_dynflow(data)
+      utc_zone = ActiveSupport::TimeZone.new('UTC')
       self.external_id    = data[:id]
-      self.started_at     = data[:started_at]
-      self.ended_at       = data[:ended_at]
+      self.started_at     = utc_zone.parse(data[:started_at]) unless data[:started_at].nil?
+      self.ended_at       = utc_zone.parse(data[:ended_at]) unless data[:ended_at].nil?
       self.state          = data[:state].to_s
       self.result         = data[:result].to_s
-      self.start_at       = data[:start_at] if data[:start_at]
-      self.start_before   = data[:start_before] if data[:start_before]
+      self.start_at       = utc_zone.parse(data[:start_at]) if data[:start_at]
+      self.start_before   = utc_zone.parse(data[:start_before]) if data[:start_before]
       self.parent_task_id ||= begin
                                 if main_action.caller_execution_plan_id
                                   DynflowTask.where(:external_id => main_action.caller_execution_plan_id).first!.id

data/app/models/foreman_tasks/triggering.rb

@@ -11,7 +11,7 @@ module ForemanTasks
         parse_start_at!
         parse_start_before!
       else
-        self.start_at ||= Time.now
+        self.start_at ||= Time.zone.now
       end
     end
 
@@ -43,7 +43,7 @@ module ForemanTasks
         triggering.mode = params.fetch(:mode, :immediate).to_sym
         triggering.input_type = params.fetch(:input_type, :daily).to_sym
         triggering.end_time_limited = params[:end_time_limited] == "true"
-        triggering.start_at_raw ||= Time.now.strftime(TIME_FORMAT)
+        triggering.start_at_raw ||= Time.zone.now.strftime(TIME_FORMAT)
         triggering.recurring_logic = ::ForemanTasks::RecurringLogic.new_from_triggering(triggering) if triggering.recurring?
       end
     end
@@ -75,8 +75,8 @@ module ForemanTasks
 
     def delay_options
       {
-        :start_at => start_at,
-        :start_before => start_before
+        :start_at => start_at.utc,
+        :start_before => start_before.try(:utc)
       }
     end
 
@@ -93,11 +93,11 @@ module ForemanTasks
     end
 
     def parse_start_at!
-      self.start_at ||= Time.strptime(start_at_raw, TIME_FORMAT)
+      self.start_at ||= Time.zone.parse(start_at_raw)
     end
 
     def parse_start_before!
-      self.start_before ||= Time.strptime(start_before_raw, TIME_FORMAT) unless start_before_raw.blank?
+      self.start_before ||= Time.zone.parse(start_before_raw) unless start_before_raw.blank?
     end
 
     private

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

@@ -184,7 +184,7 @@
 <div>
   <span class="param-name"><%= _("Errors") %>:</span>
   <span class="param-value">
-    <pre><%= @task.humanized[:errors].join("\n") %></pre>
+    <pre><%=Array(@task.humanized[:errors]).join("\n") %></pre>
   </span>
 </div>
 <% end %>

data/lib/foreman_tasks/dynflow.rb

@@ -43,6 +43,7 @@ module ForemanTasks
         unless config.remote?
           # don't try to do any rescuing until the tables are properly migrated
           if !Foreman.in_rake?('db:migrate') && (ForemanTasks::Task.table_exists? rescue(false))
+            config.run_on_init_hooks(world)
             world.auto_execute
             ForemanTasks::Task::DynflowTask.consistency_check
           end

data/lib/foreman_tasks/dynflow/configuration.rb

@@ -54,10 +54,12 @@ module ForemanTasks
       @on_init << block
     end
 
+    def run_on_init_hooks(world)
+      @on_init.each { |init| init.call(world) }
+    end
+
     def initialize_world(world_class = ::Dynflow::World)
-      world_class.new(world_config).tap do |world|
-        @on_init.each { |init| init.call(world) }
-      end
+      world_class.new(world_config)
     end
 
     # No matter what config.remote says, when the process is marked as executor,

data/lib/foreman_tasks/dynflow/persistence.rb

@@ -31,11 +31,9 @@ module ForemanTasks
       when :scheduled
         delayed_plan = load_delayed_plan(execution_plan_id)
         raise Foreman::Exception.new('Plan is delayed but the delay record is missing') if delayed_plan.nil?
-        # TODO: Rework this
-        delayed_plan = ::Dynflow::DelayedPlan.new_from_hash(ForemanTasks.dynflow.world, delayed_plan)
-        task = ::ForemanTasks::Task::DynflowTask.where(:external_id => execution_plan_id).first
-        task.update_from_dynflow(data.merge(:start_at => delayed_plan.start_at,
-                                            :start_before => delayed_plan.start_before))
+        task = ::ForemanTasks::Task::DynflowTask.find_by!(:external_id => execution_plan_id)
+        task.update_from_dynflow(data.merge(:start_at => delayed_plan[:start_at],
+                                            :start_before => delayed_plan[:start_before]))
       when :planning
         task = ::ForemanTasks::Task::DynflowTask.where(:external_id => execution_plan_id).first
         task.update_from_dynflow(data)

data/lib/foreman_tasks/engine.rb

@@ -122,8 +122,13 @@ module ForemanTasks
       end
     end
 
-    initializer "foreman_tasks.initialize_dynflow" do
+    config.to_prepare do
+      ForemanTasks.dynflow.eager_load_actions! if ForemanTasks.dynflow.initialized?
+
+      Authorizer.send(:include, AuthorizerExt)
+    end
 
+    config.after_initialize do
       ForemanTasks.dynflow.eager_load_actions!
       ForemanTasks.dynflow.config.increase_db_pool_size
 
@@ -140,13 +145,6 @@ module ForemanTasks
       end
     end
 
-    config.to_prepare do
-      ForemanTasks.dynflow.eager_load_actions!
-
-      Authorizer.send(:include, AuthorizerExt)
-    end
-
-
     rake_tasks do
       %w[dynflow.rake test.rake export_tasks.rake cleanup.rake].each do |rake_file|
         full_path = File.expand_path("../tasks/#{rake_file}", __FILE__)

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.7.17"
+  VERSION = "0.7.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.17
+  version: 0.7.18
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow