foreman-tasks 0.7.6 → 0.7.7

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.7.6"
+  VERSION = "0.7.7"
 end

data/test/unit/recurring_logic_test.rb

@@ -0,0 +1,74 @@
+require 'foreman_tasks_test_helper'
+
+class RecurringLogicsTest < ActiveSupport::TestCase
+
+  describe 'generating times' do
+
+    it 'assembles cronline' do
+      hash = { }
+      ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* * * * *'
+      hash.update :minutes => '*'
+      ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* * * * *'
+      hash.update :hours => '0,12'
+      ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* 0,12 * * *'
+      hash.update :days => '*/2'
+      ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* 0,12 */2 * *'
+      hash.update :months  => '12'
+      ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* 0,12 */2 12 *'
+      hash.update :days_of_week => '1,2,3,4,5,6,7'
+      ForemanTasks::RecurringLogic.assemble_cronline(hash).must_equal '* 0,12 */2 12 1,2,3,4,5,6,7'
+    end
+
+    it 'generates correct times' do
+      year, month, day, hour, minute = [2015, 9, 29, 15, 0]
+      reference_time = Time.new(year, month, day, hour, minute)
+      parser = ForemanTasks::RecurringLogic.new_from_cronline('* * * * *')
+      parser.next_occurrence_time(reference_time).must_equal Time.new(year, month, day, hour, minute + 1)
+      parser = ForemanTasks::RecurringLogic.new_from_cronline('*/2 * * * *')
+      parser.next_occurrence_time(reference_time).must_equal Time.new(year, month, day, hour, minute + 2)
+      parser = ForemanTasks::RecurringLogic.new_from_cronline('*/2 18,19 * * *')
+      parser.next_occurrence_time(reference_time).must_equal Time.new(year, month, day, 18)
+      parser = ForemanTasks::RecurringLogic.new_from_cronline('*/2 18,19 10 * *')
+      parser.next_occurrence_time(reference_time).must_equal Time.new(year, month + 1, 10, 18, minute)
+      parser = ForemanTasks::RecurringLogic.new_from_cronline('*/2 18,19 10 11,12 *')
+      parser.next_occurrence_time(reference_time).must_equal Time.new(year, 11, 10, 18, 0)
+      parser = ForemanTasks::RecurringLogic.new_from_cronline('* * * * 1')
+      parser.next_occurrence_time(reference_time).must_equal Time.new(year, month + 1, 5)
+    end
+
+    it 'can have limited number of repeats' do
+      parser = ForemanTasks::RecurringLogic.new_from_cronline('* * * * *')
+      parser.state = 'active'
+      parser.must_be :can_continue?
+      parser.max_iteration = 5
+      parser.expects(:iteration).twice.returns(5)
+      parser.wont_be :can_continue?
+      parser.max_iteration = nil
+      time = Time.new(2015, 9, 29, 15, 0)
+      parser.end_time = time
+      parser.wont_be :can_continue?, time
+      parser.end_time = time + 120
+      parser.must_be :can_continue?, time
+      parser.max_iteration = 5
+      parser.wont_be :can_continue?, time
+    end
+
+    it 'generates delay options' do
+      parser = ForemanTasks::RecurringLogic.new_from_cronline('* * * * *')
+      parser.stubs(:id).returns(1)
+      reference_time = Time.new(2015, 9, 29, 15)
+      expected_hash = { :start_at => reference_time + 60, :start_before => nil, :recurring_logic_id => parser.id }
+      parser.generate_delay_options(reference_time).must_equal expected_hash
+      parser.generate_delay_options(reference_time, 'start_before' => reference_time + 3600)
+        .must_equal expected_hash.merge(:start_before => reference_time + 3600)
+    end
+
+    it 'can start' do
+      recurring_logic = ForemanTasks::RecurringLogic.new_from_cronline('* * * * *')
+      ::ForemanTasks.expects(:delay)
+      recurring_logic.expects(:save!).twice
+      recurring_logic.start(::Support::DummyDynflowAction)
+    end
+  end
+
+end

data/test/unit/task_groups_test.rb

@@ -0,0 +1,76 @@
+require "foreman_tasks_test_helper"
+
+module ForemanTasks
+  class TaskGroupsTest < ActiveSupport::TestCase
+    self.use_transactional_fixtures = false
+    include ::Dynflow::Testing
+
+    before do
+      User.current = User.where(:login => 'apiadmin').first
+    end
+
+    after do
+      ::ForemanTasks::TaskGroup.all.each(&:destroy)
+      ::ForemanTasks::Task::DynflowTask.all.each(&:destroy)
+    end
+
+    class ParentAction < Actions::ActionWithSubPlans
+
+      middleware.use ::Actions::Middleware::InheritTaskGroups
+
+      def plan(count)
+        task_group = ::ForemanTasks::TaskGroups::RecurringLogicTaskGroup.new
+        task_group.id = 1
+        task_group.save!
+        task.add_missing_task_groups(task_group)
+        plan_self :count => count
+      end
+      
+      def create_sub_plans
+        input[:count].times.map { |i| trigger InheritingChildAction, i + 2 }
+      end
+    end
+
+    class ChildAction < Actions::EntryAction
+      def plan(number = 1)
+        task_group = ::ForemanTasks::TaskGroups::RecurringLogicTaskGroup.new
+        task_group.id = number
+        task_group.save!
+        task.add_missing_task_groups task_group
+        input[:id] = task_group.id
+      end
+    end
+
+    class InheritingChildAction < ChildAction
+      middleware.use ::Actions::Middleware::InheritTaskGroups
+    end
+
+    describe ForemanTasks::TaskGroup do
+      let(:spawn_task) do
+        lambda do |action_class, *args|
+          triggered = ForemanTasks.trigger(action_class, *args)
+          raise triggered.error if triggered.respond_to?(:error)
+          triggered.finished.wait
+          ForemanTasks::Task.find_by_external_id(triggered.id)
+        end
+      end
+
+      it 'has the task group assigned' do
+        task = spawn_task.call ChildAction
+        task.task_groups.map(&:id).must_equal [1]
+      end
+
+      it 'tasks inherit task groups correctly' do
+        children_count = 3
+        task = spawn_task.call ParentAction, children_count
+        # Parent task has task groups of its children
+        task.task_groups.map(&:id).must_equal [1, 2, 3, 4]
+        # Children have the parent's and their own, they don't have their siblings' task groups
+        task.sub_tasks.count.must_equal children_count
+        task.sub_tasks.each do |sub_task|
+          sub_task.task_groups.map(&:id).must_equal [1, sub_task.input[:id]]
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,84 +1,90 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'The goal of this plugin is to unify the way of showing task statuses
-  across the Foreman instance.
-
-  It defines Task model for keeping the information about the tasks and Lock for assigning
-  the tasks
-
-  to resources. The locking allows dealing with preventing multiple colliding tasks
-  to be run on the
-
-  same resource. It also optionally provides Dynflow infrastructure for using it for
-  managing the tasks.
-
-'
+- !ruby/object:Gem::Dependency
+  name: parse-cron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+description: |
+  The goal of this plugin is to unify the way of showing task statuses across the Foreman instance.
+  It defines Task model for keeping the information about the tasks and Lock for assigning the tasks
+  to resources. The locking allows dealing with preventing multiple colliding tasks to be run on the
+  same resource. It also optionally provides Dynflow infrastructure for using it for managing the tasks.
 email:
 - inecas@redhat.com
 executables: []
@@ -87,10 +93,13 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- app/assets/javascripts/trigger_form.js
 - app/assets/stylesheets/foreman_tasks/application.css.scss
 - app/controllers/foreman_tasks/api/tasks_controller.rb
 - app/controllers/foreman_tasks/concerns/hosts_controller_extension.rb
+- app/controllers/foreman_tasks/recurring_logics_controller.rb
 - app/controllers/foreman_tasks/tasks_controller.rb
+- app/helpers/foreman_tasks/foreman_tasks_helper.rb
 - app/helpers/foreman_tasks/tasks_helper.rb
 - app/lib/actions/action_with_sub_plans.rb
 - app/lib/actions/base.rb
@@ -103,7 +112,9 @@ files:
 - app/lib/actions/helpers/args_serialization.rb
 - app/lib/actions/helpers/humanizer.rb
 - app/lib/actions/helpers/lock.rb
+- app/lib/actions/middleware/inherit_task_groups.rb
 - app/lib/actions/middleware/keep_current_user.rb
+- app/lib/actions/middleware/recurring_logic.rb
 - app/lib/actions/proxy_action.rb
 - app/lib/actions/serializers/active_record_serializer.rb
 - app/lib/proxy_api/foreman_dynflow/dynflow_proxy.rb
@@ -112,13 +123,26 @@ files:
 - app/models/foreman_tasks/concerns/architecture_action_subject.rb
 - app/models/foreman_tasks/concerns/host_action_subject.rb
 - app/models/foreman_tasks/lock.rb
+- app/models/foreman_tasks/recurring_logic.rb
 - app/models/foreman_tasks/task.rb
 - app/models/foreman_tasks/task/dynflow_task.rb
 - app/models/foreman_tasks/task/status_explicator.rb
 - app/models/foreman_tasks/task/summarizer.rb
 - app/models/foreman_tasks/task/task_cancelled_exception.rb
+- app/models/foreman_tasks/task_group.rb
+- app/models/foreman_tasks/task_group_member.rb
+- app/models/foreman_tasks/task_groups/recurring_logic_task_group.rb
+- app/models/foreman_tasks/triggering.rb
 - app/models/setting/foreman_tasks.rb
+- app/views/common/_trigger_form.html.erb
 - app/views/foreman_tasks/api/tasks/show.json.rabl
+- app/views/foreman_tasks/recurring_logics/_tab_related.html.erb
+- app/views/foreman_tasks/recurring_logics/index.html.erb
+- app/views/foreman_tasks/recurring_logics/show.html.erb
+- app/views/foreman_tasks/task_groups/_common.html.erb
+- app/views/foreman_tasks/task_groups/_detail.html.erb
+- app/views/foreman_tasks/task_groups/_tab_related.html.erb
+- app/views/foreman_tasks/task_groups/recurring_logic_task_groups/_recurring_logic_task_group.html.erb
 - app/views/foreman_tasks/tasks/_details.html.erb
 - app/views/foreman_tasks/tasks/_errors.html.erb
 - app/views/foreman_tasks/tasks/_locks.html.erb
@@ -136,7 +160,12 @@ files:
 - db/migrate/20131209122644_create_foreman_tasks_locks.rb
 - db/migrate/20140324104010_remove_foreman_tasks_progress.rb
 - db/migrate/20140813215942_add_parent_task_id.rb
+- db/migrate/20150814204140_add_task_type_value_index.rb
 - db/migrate/20150817102538_add_delay_attributes.rb
+- db/migrate/20150907124936_create_recurring_logic.rb
+- db/migrate/20150907131503_create_task_groups.rb
+- db/migrate/20151022123457_add_recurring_logic_state.rb
+- db/migrate/20151112152108_create_triggerings.rb
 - db/seeds.d/20-foreman_tasks_permissions.rb
 - db/seeds.d/60-dynflow_proxy_feature.rb
 - db/seeds.d/61-foreman_tasks_bookmarks.rb
@@ -171,6 +200,8 @@ files:
 - test/unit/actions/proxy_action_test.rb
 - test/unit/cleaner_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
+- test/unit/recurring_logic_test.rb
+- test/unit/task_groups_test.rb
 - test/unit/task_test.rb
 homepage: https://github.com/theforeman/foreman-tasks
 licenses: []
@@ -181,17 +212,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resoruces and users
@@ -204,7 +235,8 @@ test_files:
 - test/factories/task_factory.rb
 - test/unit/cleaner_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
+- test/unit/recurring_logic_test.rb
 - test/unit/actions/proxy_action_test.rb
 - test/unit/actions/action_with_sub_plans_test.rb
 - test/unit/task_test.rb
-has_rdoc: 
+- test/unit/task_groups_test.rb