foreman-tasks 0.7.16 → 0.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31ae188eb51b073634a6022419eca1a9da0386ae
-  data.tar.gz: ac58624747c4767a2a6281a5b528bd7bec73cdfc
+  metadata.gz: 6af64bff2142846ebf7fcc41ca5202b3f1bf5850
+  data.tar.gz: a001ea05b594c4180546b6505f20fd66bf01e14b
 SHA512:
-  metadata.gz: 6ee4441852726080335eed0f0b98b50a90aab99cebeacc774bff9e213068d4d6853338007d7b589a04703f96abd6792721a186536e48d58281f758ed1cb48655
-  data.tar.gz: 2989a4a292c841fcc829f9b3882edb3702915a0e40f32115c722fde27bf74c9f68507830df9938643c9f98a6673d58b6abd786a73f220c3d4114eda9225d7cb1
+  metadata.gz: 995c854d10a044c6cdcd8d33b52b342b639d134623145afe198908936f3c4d14ca2ab97dbdcf4c3f2703b8c27253da788ac87913009f35e633ba8139f862264e
+  data.tar.gz: 343184b0db3a10549586fdda4fc0e89361f39a9dc8576ebdcfc466f0c044411c7abfb5de6c3dfc34c4f65145fa4ab171c2d5cd22263845ec964bb72d55fe0294

data/app/helpers/foreman_tasks/foreman_tasks_helper.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module ForemanTasks
   module ForemanTasksHelper
 
@@ -39,10 +40,26 @@ module ForemanTasks
       end
     end
 
+    def date_f(f, attr, field_options = {}, date_options = {}, html_options = {})
+      f.fields_for attr do |fields|
+        field(fields, attr, field_options) do
+          fields.date_select attr, date_options, html_options
+        end
+      end
+    end
+
     def datetime_f(f, attr, field_options = {}, datetime_options = {}, html_options = {})
       f.fields_for attr do |fields|
         field(fields, attr, field_options) do
-          fields.datetime_select attr, datetime_options, html_options
+          [
+            content_tag(:span, nil, :class => 'date', :style => 'white-space: nowrap;') do
+              fields.date_select(attr, datetime_options, html_options)
+            end,
+            ' — ',
+            content_tag(:span, nil, :class => 'time', :style => 'white-space: nowrap;') do
+              fields.time_select(attr, datetime_options.merge(:ignore_date => true), html_options)
+            end
+          ].join
         end
       end
     end

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

@@ -45,6 +45,25 @@ module ForemanTasks
         dynflow_task_wrap(:save) { super(*args) }
       end
 
+      # this can be used when HostActionSubject is used for orchestration but you want to avoid
+      # triggering more tasks by ActiveRecord callbacks within run/finalize phase of your task
+      # e.g. host.disable_dynflow_hooks { |h| h.save }
+      def disable_dynflow_hooks(&block)
+        @_disable_dynflow_hooks = true
+
+        if block_given?
+          begin
+            block.call(self)
+          ensure
+            @_disable_dynflow_hooks = false
+          end
+        end
+      end
+
+      def enable_dynflow_hooks
+        @_disable_dynflow_hooks = false
+      end
+
       protected
 
       def sync_action_flag_reset!
@@ -96,6 +115,7 @@ module ForemanTasks
       # to unexpected results.
       def dynflow_task_wrap(method)
         if ForemanTasks.dynflow.config.disable_active_record_actions ||
+              @_disable_dynflow_hooks ||
               @_dynflow_task_wrapped
           return yield
         end

data/app/models/foreman_tasks/recurring_logic.rb

@@ -15,8 +15,6 @@ module ForemanTasks
       has_many :task_groups, -> { uniq }, :through => :tasks
     end
 
-    validates :cron_line, :presence => true
-
     scoped_search :on => :id, :complete_value => false
     scoped_search :on => :max_iteration, :complete_value => false, :rename => :iteration_limit
     scoped_search :on => :iteration, :complete_value => false
@@ -69,12 +67,25 @@ module ForemanTasks
       }
     end
 
-    def can_continue?(time = Time.now)
-      self.state == 'active' &&
-        (end_time.nil? || next_occurrence_time(time) < end_time) &&
+    def valid?(*_)
+      cron_line.present? && valid_cronline? && !self.state.nil? || can_start?
+    end
+
+    def valid_cronline?
+      !!next_occurrence_time
+    rescue ArgumentError => _
+      false
+    end
+
+    def can_start?(time = Time.now)
+      (end_time.nil? || next_occurrence_time(time) < end_time) &&
         (max_iteration.nil? || iteration < max_iteration)
     end
 
+    def can_continue?(time = Time.now)
+      self.state == 'active' && can_start?(time)
+    end
+
     def finished?
       self.state == 'finished'
     end

data/app/models/foreman_tasks/triggering.rb

@@ -15,10 +15,6 @@ module ForemanTasks
       end
     end
 
-    after_find do |triggering|
-      triggering.mode = triggering.mode.to_sym
-    end
-
     ALLOWED_MODES = [:immediate, :future, :recurring]
     ALLOWED_INPUT_TYPES = [:cronline, :monthly, :weekly, :daily, :hourly]
 
@@ -39,7 +35,8 @@ module ForemanTasks
                         :message => _("%{value} is wrong format"), :allow_blank => true
     validates_format_of :days, :with => DAYS_REGEXP,
                         :if => Proc.new { |t| t.recurring? && t.input_type == :monthly }
-    validate :correct_cronline, :if => Proc.new { |t| t.recurring? && t.input_type == :cronline }
+    validate :can_start_recurring, :if => :recurring?
+    validate :can_start_future, :if => :future?
 
     def self.new_from_params(params = {})
       self.new(params.except(:mode, :start_at, :start_before)).tap do |triggering|
@@ -47,6 +44,19 @@ module ForemanTasks
         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.recurring_logic = ::ForemanTasks::RecurringLogic.new_from_triggering(triggering) if triggering.recurring?
+      end
+    end
+
+    def mode
+      super.to_sym
+    end
+
+    def mode=(mod)
+      if (mod.is_a?(String) || mod.is_a?(Symbol)) && ALLOWED_MODES.map(&:to_s).include?(mod.downcase.to_s)
+        super(mod.downcase.to_sym)
+      else
+        raise ArgumentError, _('mode has to be one of %{allowed_modes}') % { :allowed_modes => ALLOWED_MODES.join(', ') }
       end
     end
 
@@ -59,8 +69,7 @@ module ForemanTasks
                              delay_options,
                              *args
       when :recurring
-        ::ForemanTasks::RecurringLogic.new_from_triggering(self)
-        .start(action, *args)
+        recurring_logic.start(action, *args)
       end
     end
 
@@ -93,10 +102,15 @@ module ForemanTasks
 
     private
 
-    def correct_cronline
-      ForemanTasks::RecurringLogic.new_from_cronline(cronline).next_occurrence_time
-    rescue ArgumentError => _
-      self.errors.add(:cronline, _("%s is not valid format of cron line")) % (cronline)
+    def can_start_recurring
+      self.errors.add(:input_type, _('No task could be started')) unless recurring_logic.valid?
+      self.errors.add(:cronline, _('%s is not valid format of cron line') % (cronline)) unless recurring_logic.valid_cronline?
+    end
+
+    def can_start_future
+      parse_start_before!
+      parse_start_at!
+      self.errors.add(:start_before_raw, _('The task could not be started')) if !start_before.nil? && start_before < start_at
     end
   end
 end

data/app/views/common/_trigger_form.html.erb

@@ -12,11 +12,12 @@
       <%= radio_button_f trigger_fields, :mode, :class => 'trigger_mode_selector', :value => 'immediate', :text => _("Execute now") %>
       <%= radio_button_f trigger_fields, :mode, :class => 'trigger_mode_selector', :value => 'future',    :text => _("Schedule future execution") %>
       <%= radio_button_f trigger_fields, :mode, :class => 'trigger_mode_selector', :value => 'recurring', :text => _("Set up recurring execution") %>
-
-      <div class="trigger_fields">
-        <%= future_mode_fieldset trigger_fields, triggering %>
-        <%= recurring_mode_fieldset trigger_fields, triggering %>
-      </div>
-    <% end %>
   </div>
 </div>
+
+<div class="trigger_fields">
+  <%= future_mode_fieldset trigger_fields, triggering %>
+  <%= recurring_mode_fieldset trigger_fields, triggering %>
+</div>
+<% end %>
+

data/lib/foreman_tasks/tasks/export_tasks.rake

@@ -93,6 +93,14 @@ namespace :foreman_tasks do
         end
       end
 
+      def show_world(world_id)
+        if registered_world = world.coordinator.find_worlds(false, id: world_id).first
+          "%{world_id} %{world_meta}" % { world_id: world_id, world_meta: registered_world.meta.inspect }
+        else
+          world_id
+        end
+      end
+
       def show_action_data(label, value)
         value_html = prettyprint(value)
         if !value_html.empty?

data/lib/foreman_tasks/version.rb

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

data/test/factories/triggering_factory.rb

@@ -13,6 +13,7 @@ FactoryGirl.define do
       mode :recurring
       input_type :cronline
       cronline '* * * * *'
+      after(:build) { |triggering| triggering.recurring_logic = build(:recurring_logic) }
     end
 
     trait :end_time_limited do

data/test/unit/recurring_logic_test.rb

@@ -87,9 +87,34 @@ class RecurringLogicsTest < ActiveSupport::TestCase
     end
 
     it 'can be created from triggering' do
-      triggering = FactoryGirl.create(:triggering, :recurring, :end_time_limited)
+      triggering = FactoryGirl.build(:triggering, :recurring, :end_time_limited)
       logic = ForemanTasks::RecurringLogic.new_from_triggering(triggering)
       logic.end_time.must_equal triggering.end_time
     end
+
+    describe 'validation' do
+      let(:logic) { FactoryGirl.build(:recurring_logic) }
+
+      it 'is valid by default' do
+        logic.must_be :valid?
+      end
+
+      it 'is invalid when end time in past' do
+        logic.end_time = (Time.now - 120)
+        logic.wont_be :valid?
+      end
+
+      it 'is invalid when iteration limit < 1' do
+        logic.max_iteration = 0
+        logic.wont_be :valid?
+      end
+
+      it 'is valid when in active state' do
+        logic.end_time = (Time.now - 120)
+        logic.wont_be :valid?
+        logic.state = 'active'
+        logic.must_be :valid?
+      end
+    end
   end
 end

data/test/unit/triggering_test.rb

@@ -0,0 +1,31 @@
+require 'foreman_tasks_test_helper'
+
+class TriggeringTest < ActiveSupport::TestCase
+
+  describe 'validation' do
+    it 'is valid when immediate' do
+      FactoryGirl.build(:triggering).must_be :valid?
+    end
+
+    it 'is validates future execution' do
+      triggering = FactoryGirl.build(:triggering, :future)
+      triggering.must_be :valid?
+      triggering.start_before = triggering.start_at - 120
+      triggering.wont_be :valid?
+    end
+
+    it 'is invalid when recurring logic is invalid' do
+      triggering = FactoryGirl.build(:triggering, :recurring)
+      triggering.must_be :valid?
+      triggering.recurring_logic.stubs(:valid?).returns(false)
+      triggering.wont_be :valid?
+    end
+  end
+
+  it 'cannot have mode set to arbitrary value' do
+    triggering = FactoryGirl.build(:triggering)
+    triggering.must_be :valid?
+    proc { triggering.mode = 'bogus' }.must_raise ArgumentError
+    proc { triggering.mode = 27 }.must_raise ArgumentError
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.16
+  version: 0.7.17
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -225,6 +225,7 @@ files:
 - test/unit/recurring_logic_test.rb
 - test/unit/task_groups_test.rb
 - test/unit/task_test.rb
+- test/unit/triggering_test.rb
 homepage: https://github.com/theforeman/foreman-tasks
 licenses: []
 metadata: {}
@@ -265,4 +266,5 @@ test_files:
 - test/unit/recurring_logic_test.rb
 - test/unit/task_groups_test.rb
 - test/unit/task_test.rb
+- test/unit/triggering_test.rb
 has_rdoc: