foreman-tasks 0.7.11 → 0.7.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 52b001e513de0c0d5f488f10c6d8189947322374
+  data.tar.gz: c706e8621d354642f59ab9eab53b01fadc1f4e60
+SHA512:
+  metadata.gz: 422cb384a3bcfb144f5c845b4fe31a3aa4bfebaf3b58143900d4a1ce26891a4c5bd0af9804a94c3547d0c8d9564e9cc43062435809d8d5103250d9594df5aa9d
+  data.tar.gz: bf86c24e79a38c54011b3fe9bb0852ebb5cac94071af659be497dc6f2f096607a1fa906fc35a73a507d7b7aa561308e74ee45efe8e52c4515200261a96ad50e3

data/app/controllers/foreman_tasks/concerns/environments_extension.rb

@@ -0,0 +1,24 @@
+module ForemanTasks
+  module Concerns
+    module EnvironmentsExtension
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method_chain :obsolete_and_new, :dynflow
+      end
+
+      def obsolete_and_new_with_dynflow
+        task = ForemanTasks.async_task(::Actions::Foreman::Puppetclass::Import,
+                                       params)
+
+        notice _("Added import task to queue, it will be run shortly")
+        rescue ::Foreman::Exception => e
+          error _("Failed to add task to queue: %s") % e.to_s
+        ensure
+          redirect_to :controller => controller_path
+        end
+
+    end
+  end
+end
+

data/app/lib/actions/foreman/puppetclass/import.rb

@@ -0,0 +1,28 @@
+module Actions
+  module Foreman
+    module Puppetclass
+      class Import < Actions::EntryAction
+        def resource_locks
+          :import_puppetclasses
+        end
+
+        def run
+          output[:results] = ::PuppetClassImporter.new.obsolete_and_new(input[:changed])
+        end
+
+        def rescue_strategy
+          ::Dynflow::Action::Rescue::Skip
+        end
+
+        def humanized_name
+          _("Import puppetclasses")
+        end
+
+        # default value for cleaning up the tasks, it can be overriden by settings
+        def self.cleanup_after
+          '30d'
+        end
+      end
+    end
+  end
+end

data/app/models/foreman_tasks/recurring_logic.rb

@@ -112,7 +112,7 @@ module ForemanTasks
                    ::ForemanTasks::RecurringLogic.assemble_cronline(cronline_hash triggering.input_type, triggering.time, triggering.days_of_week)
                  end
       ::ForemanTasks::RecurringLogic.new_from_cronline(cronline).tap do |manager|
-        manager.end_time = Time.new(*recurring_options.end_time.values) if triggering.end_time_limited
+        manager.end_time = triggering.end_time unless triggering.end_time_limited.blank?
         manager.max_iteration = triggering.max_iteration unless triggering.max_iteration.blank?
         manager.triggering = triggering
       end

data/db/migrate/20131205204140_create_foreman_tasks.rb

@@ -1,7 +1,7 @@
 class CreateForemanTasks < ActiveRecord::Migration
   def change
-    create_table :foreman_tasks_tasks, :id => false do |t|
-      t.string :id, primary_key: true
+    create_table :foreman_tasks_tasks, :id => false, :primary_key => :id do |t|
+      t.string :id, null: false
       t.string :type, index: true, null: false
       t.string :label, index: true
       t.datetime :started_at, index: true

data/lib/foreman_tasks/engine.rb

@@ -103,6 +103,8 @@ module ForemanTasks
 
       config.to_prepare do
         ::Api::V2::HostsController.send :include, ForemanTasks::Concerns::HostsControllerExtension
+        ::PuppetclassesController.send :include, ForemanTasks::Concerns::EnvironmentsExtension
+        ::EnvironmentsController.send :include, ForemanTasks::Concerns::EnvironmentsExtension
         ::Host::Base.send :include, ForemanTasks::Concerns::HostActionSubject
         ::Architecture.send :include, ForemanTasks::Concerns::ArchitectureActionSubject
       end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.7.11"
+  VERSION = "0.7.12"
 end

data/test/factories/triggering_factory.rb

@@ -0,0 +1,24 @@
+FactoryGirl.define do
+  factory :triggering, :class => ForemanTasks::Triggering do
+    mode :immediate
+
+    trait :future do
+      time = Time.now
+      mode :future
+      start_at time
+      start_at_raw(time.strftime(ForemanTasks::Triggering::TIME_FORMAT))
+    end
+
+    trait :recurring do
+      mode :recurring
+      input_type :cronline
+      cronline '* * * * *'
+    end
+
+    trait :end_time_limited do
+      end_time_limited true
+      end_time(Time.now + 60)
+    end
+  end
+
+end

data/test/unit/recurring_logic_test.rb

@@ -85,6 +85,11 @@ class RecurringLogicsTest < ActiveSupport::TestCase
       recurring_logic.expects(:save!).twice
       recurring_logic.start(::Support::DummyDynflowAction)
     end
-  end
 
+    it 'can be created from triggering' do
+      triggering = FactoryGirl.create(:triggering, :recurring, :end_time_limited)
+      logic = ForemanTasks::RecurringLogic.new_from_triggering(triggering)
+      logic.end_time.must_equal triggering.end_time
+    end
+  end
 end

metadata

@@ -1,273 +1,256 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.11
-  prerelease: 
+  version: 0.7.12
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: parse-cron
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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.
-
-'
+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: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - app/assets/javascripts/trigger_form.js
-- app/assets/stylesheets/foreman_tasks/trigger_form.css
 - app/assets/stylesheets/foreman_tasks/application.css.scss
+- app/assets/stylesheets/foreman_tasks/trigger_form.css
+- app/controllers/foreman_tasks/api/recurring_logics_controller.rb
+- app/controllers/foreman_tasks/api/tasks_controller.rb
+- app/controllers/foreman_tasks/concerns/environments_extension.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
+- app/lib/actions/bulk_action.rb
+- app/lib/actions/entry_action.rb
+- app/lib/actions/foreman/architecture/create.rb
+- app/lib/actions/foreman/architecture/destroy.rb
+- app/lib/actions/foreman/architecture/update.rb
+- app/lib/actions/foreman/host/import_facts.rb
+- app/lib/actions/foreman/puppetclass/import.rb
 - app/lib/actions/helpers/args_serialization.rb
 - app/lib/actions/helpers/humanizer.rb
 - app/lib/actions/helpers/lock.rb
-- app/lib/actions/entry_action.rb
-- app/lib/actions/base.rb
-- app/lib/actions/proxy_action.rb
-- app/lib/actions/serializers/active_record_serializer.rb
-- app/lib/actions/bulk_action.rb
-- app/lib/actions/action_with_sub_plans.rb
-- app/lib/actions/middleware/recurring_logic.rb
 - app/lib/actions/middleware/inherit_task_groups.rb
 - app/lib/actions/middleware/keep_current_user.rb
-- app/lib/actions/foreman/host/import_facts.rb
-- app/lib/actions/foreman/architecture/create.rb
-- app/lib/actions/foreman/architecture/update.rb
-- app/lib/actions/foreman/architecture/destroy.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
-- app/views/foreman_tasks/api/tasks/show.json.rabl
+- app/models/foreman_tasks/concerns/action_subject.rb
+- app/models/foreman_tasks/concerns/action_triggering.rb
+- 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/recurring_logics/base.json.rabl
 - app/views/foreman_tasks/api/recurring_logics/index.json.rabl
 - app/views/foreman_tasks/api/recurring_logics/main.json.rabl
-- app/views/foreman_tasks/api/recurring_logics/base.json.rabl
 - app/views/foreman_tasks/api/recurring_logics/show.json.rabl
-- app/views/foreman_tasks/tasks/_running_steps.html.erb
-- app/views/foreman_tasks/tasks/show.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/index.html.erb
+- app/views/foreman_tasks/tasks/_errors.html.erb
+- app/views/foreman_tasks/tasks/_locks.html.erb
 - app/views/foreman_tasks/tasks/_raw.html.erb
+- app/views/foreman_tasks/tasks/_running_steps.html.erb
 - app/views/foreman_tasks/tasks/dashboard/_latest_tasks_in_error_warning.html.erb
 - app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb
-- app/views/foreman_tasks/tasks/_errors.html.erb
-- app/views/foreman_tasks/tasks/_locks.html.erb
-- app/views/foreman_tasks/task_groups/_detail.html.erb
-- app/views/foreman_tasks/task_groups/_common.html.erb
-- app/views/foreman_tasks/task_groups/recurring_logic_task_groups/_recurring_logic_task_group.html.erb
-- app/views/foreman_tasks/task_groups/_tab_related.html.erb
-- app/views/foreman_tasks/recurring_logics/show.html.erb
-- app/views/foreman_tasks/recurring_logics/index.html.erb
-- app/views/foreman_tasks/recurring_logics/_tab_related.html.erb
-- app/views/common/_trigger_form.html.erb
-- app/controllers/foreman_tasks/api/tasks_controller.rb
-- app/controllers/foreman_tasks/api/recurring_logics_controller.rb
-- app/controllers/foreman_tasks/tasks_controller.rb
-- app/controllers/foreman_tasks/recurring_logics_controller.rb
-- app/controllers/foreman_tasks/concerns/hosts_controller_extension.rb
-- app/models/foreman_tasks/recurring_logic.rb
-- app/models/foreman_tasks/task_group_member.rb
-- app/models/foreman_tasks/triggering.rb
-- app/models/foreman_tasks/concerns/architecture_action_subject.rb
-- app/models/foreman_tasks/concerns/action_triggering.rb
-- app/models/foreman_tasks/concerns/host_action_subject.rb
-- app/models/foreman_tasks/concerns/action_subject.rb
-- app/models/foreman_tasks/task_group.rb
-- app/models/foreman_tasks/task_groups/recurring_logic_task_group.rb
-- app/models/foreman_tasks/task/dynflow_task.rb
-- app/models/foreman_tasks/task/status_explicator.rb
-- app/models/foreman_tasks/task/task_cancelled_exception.rb
-- app/models/foreman_tasks/task/summarizer.rb
-- app/models/foreman_tasks/lock.rb
-- app/models/foreman_tasks/task.rb
-- app/models/setting/foreman_tasks.rb
+- app/views/foreman_tasks/tasks/index.html.erb
+- app/views/foreman_tasks/tasks/show.html.erb
 - bin/dynflow-executor
 - bin/foreman-tasks
-- config/routes.rb
 - config/foreman-tasks.yaml.example
-- db/seeds.d/61-foreman_tasks_bookmarks.rb
-- db/seeds.d/60-dynflow_proxy_feature.rb
-- db/seeds.d/20-foreman_tasks_permissions.rb
-- db/migrate/20151112152108_create_triggerings.rb
-- db/migrate/20150814204140_add_task_type_value_index.rb
-- db/migrate/20150907124936_create_recurring_logic.rb
-- db/migrate/20131209122644_create_foreman_tasks_locks.rb
+- config/routes.rb
 - db/migrate/20131205204140_create_foreman_tasks.rb
+- db/migrate/20131209122644_create_foreman_tasks_locks.rb
 - db/migrate/20140324104010_remove_foreman_tasks_progress.rb
-- db/migrate/20150907131503_create_task_groups.rb
 - db/migrate/20140813215942_add_parent_task_id.rb
-- db/migrate/20151022123457_add_recurring_logic_state.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
 - deploy/foreman-tasks.init
 - deploy/foreman-tasks.service
 - deploy/foreman-tasks.sysconfig
-- lib/tasks/gettext.rake
-- lib/foreman_tasks/tasks/export_tasks.rake
-- lib/foreman_tasks/tasks/dynflow.rake
-- lib/foreman_tasks/tasks/cleanup.rake
-- lib/foreman_tasks/engine.rb
-- lib/foreman_tasks/version.rb
-- lib/foreman_tasks/cleaner.rb
-- lib/foreman_tasks/triggers.rb
+- lib/foreman-tasks.rb
+- lib/foreman_tasks.rb
 - lib/foreman_tasks/authorizer_ext.rb
-- lib/foreman_tasks/test_extensions.rb
-- lib/foreman_tasks/task_error.rb
+- lib/foreman_tasks/cleaner.rb
+- lib/foreman_tasks/dynflow.rb
 - lib/foreman_tasks/dynflow/configuration.rb
-- lib/foreman_tasks/dynflow/persistence.rb
-- lib/foreman_tasks/dynflow/daemon.rb
 - lib/foreman_tasks/dynflow/console_authorizer.rb
-- lib/foreman_tasks/dynflow.rb
-- lib/foreman_tasks.rb
-- lib/foreman-tasks.rb
-- LICENSE
-- README.md
-- test/support/dummy_proxy_action.rb
-- test/support/dummy_dynflow_action.rb
+- lib/foreman_tasks/dynflow/daemon.rb
+- lib/foreman_tasks/dynflow/persistence.rb
+- lib/foreman_tasks/engine.rb
+- lib/foreman_tasks/task_error.rb
+- lib/foreman_tasks/tasks/cleanup.rake
+- lib/foreman_tasks/tasks/dynflow.rake
+- lib/foreman_tasks/tasks/export_tasks.rake
+- lib/foreman_tasks/test_extensions.rb
+- lib/foreman_tasks/triggers.rb
+- lib/foreman_tasks/version.rb
+- lib/tasks/gettext.rake
+- test/controllers/api/recurring_logics_controller_test.rb
+- test/controllers/api/tasks_controller_test.rb
+- test/factories/recurring_logic_factory.rb
+- test/factories/task_factory.rb
+- test/factories/triggering_factory.rb
+- test/foreman_tasks_test_helper.rb
 - test/helpers/foreman_tasks/tasks_helper_test.rb
-- test/unit/task_groups_test.rb
-- test/unit/actions/proxy_action_test.rb
+- test/support/dummy_dynflow_action.rb
+- test/support/dummy_proxy_action.rb
 - test/unit/actions/action_with_sub_plans_test.rb
+- test/unit/actions/proxy_action_test.rb
 - test/unit/cleaner_test.rb
-- test/unit/task_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
 - test/unit/recurring_logic_test.rb
-- test/factories/recurring_logic_factory.rb
-- test/factories/task_factory.rb
-- test/controllers/api/recurring_logics_controller_test.rb
-- test/controllers/api/tasks_controller_test.rb
-- test/foreman_tasks_test_helper.rb
+- test/unit/task_groups_test.rb
+- test/unit/task_test.rb
 homepage: https://github.com/theforeman/foreman-tasks
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Foreman plugin for showing tasks information for resoruces and users
 test_files:
-- test/support/dummy_proxy_action.rb
-- test/support/dummy_dynflow_action.rb
 - test/helpers/foreman_tasks/tasks_helper_test.rb
-- test/unit/task_groups_test.rb
-- test/unit/actions/proxy_action_test.rb
-- test/unit/actions/action_with_sub_plans_test.rb
+- test/support/dummy_dynflow_action.rb
+- test/support/dummy_proxy_action.rb
+- test/foreman_tasks_test_helper.rb
+- test/controllers/api/recurring_logics_controller_test.rb
+- test/controllers/api/tasks_controller_test.rb
+- test/factories/task_factory.rb
+- test/factories/triggering_factory.rb
+- test/factories/recurring_logic_factory.rb
 - test/unit/cleaner_test.rb
-- test/unit/task_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
 - test/unit/recurring_logic_test.rb
-- test/factories/recurring_logic_factory.rb
-- test/factories/task_factory.rb
-- test/controllers/api/recurring_logics_controller_test.rb
-- test/controllers/api/tasks_controller_test.rb
-- test/foreman_tasks_test_helper.rb
-has_rdoc: 
+- test/unit/actions/proxy_action_test.rb
+- test/unit/actions/action_with_sub_plans_test.rb
+- test/unit/task_test.rb
+- test/unit/task_groups_test.rb