foreman-tasks 0.6.14 → 0.6.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njc1OWI4YzE5OWI1ZmNhMmI3YjIwMzc3NDRjZjVjMTViMzNjZjNhOQ==
+    OWU1NDFhZjAxYjZkNDAwYzJkZTA0YTBlOTcxMGQ3NGIxYTQzNWFiYg==
   data.tar.gz: !binary |-
-    ZTMzODQyZWM1MDljMmNmZDcxMGM0OTc5MDExOTVjOGE3YWNhMmMyNg==
+    YmVmNjMwODk3YTNiYTY1NGNjYWUyMDI3NDBkZTM4ZmVjN2M1ZDllMA==
 SHA512:
   metadata.gz: !binary |-
-    N2M3NTQzNzFiMGVlN2NiZDE5NTU2YmM1ZmYzMWU2YWQwYWRmYmFmNzUxZDMz
-    MDkzYzc3NmFkMjYwZGE3MjgzMTI4ZWZlMjM1NzU4NjkzY2Q4ODU3NTAxNDM5
-    MTZmY2Q4YzU3MWM5MjNmNGU3Mzg5NmI5NzdhZTgwOWQzNzk0NWQ=
+    MzM3NjM1M2Y1ODA2NmYwZDMzZjE1OTZiN2I3NDRmOWNmOTFkOTc5ZWQ2Yzc3
+    NWI0ZTZmOGU5OWU1MzhlMTM3NmQ3MDZjYjIxNTEzOTY1OGYzYzI3ODE4ZGZi
+    NzhhZGExNDkxZjMwYjJmZjFmYzUyYTk5NDI2YmY0N2I1NWE0ODk=
   data.tar.gz: !binary |-
-    YmUzZTYyNjUyOTFkZjFiZWVlZDJmNGFmMjEyNTYwYmJmM2IwMGViNGMzMWQ4
-    Y2VkMzM2YzdhNTg2YmYzNTk3NDNhODg1Yzk2ODU2ZmY5NDE2MjU2NjU3YjE1
-    YzUyYmU1OTZhZGYzYmJiZThmMzAwOWQ2NzUzMjEwYmQwNDNlYTI=
+    YTIyM2QxZDVkZjY0ODhlMTMwNjdmODMyOGYyMjViNDg3MjhhN2QyYmZjNzc3
+    MTJmNTAxODA0ZGNiZmJkZjVkYTRhYTEzYzc0ZjVjZWI3NTMxN2JhNjQxYTlj
+    ZTJkMzM4MmQyNTcwYjgyNjI1NzI2NWY1ZTFkYjgyYTE1YTUzN2Y=

data/lib/foreman_tasks.rb

@@ -4,7 +4,6 @@ require 'foreman_tasks/engine'
 require 'foreman_tasks/dynflow'
 require 'foreman_tasks/triggers'
 require 'foreman_tasks/authorizer_ext'
-require 'foreman_tasks/widget_manager'
 
 module ForemanTasks
   extend Algebrick::TypeCheck

data/lib/foreman_tasks/dynflow.rb

@@ -43,14 +43,17 @@ module ForemanTasks
         unless config.remote?
           at_exit { world.terminate.wait }
 
-          # for now, we can check the consistency only when there
-          # is no remote executor. We should be able to check the consistency
-          # every time the new world is created when there is a register
-          # of executors
-          world.consistency_check
-          world.execute_planned_execution_plans
-
-          Task::DynflowTask.consistency_check
+          # 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))
+            # for now, we can check the consistency only when there
+            # is no remote executor. We should be able to check the consistency
+            # every time the new world is created when there is a register
+            # of executors
+            world.consistency_check
+            world.execute_planned_execution_plans
+
+            ForemanTasks::Task::DynflowTask.consistency_check
+          end
         end
       end
     end

data/lib/foreman_tasks/engine.rb

@@ -8,7 +8,7 @@ module ForemanTasks
 
     initializer 'foreman_tasks.register_plugin', :after => :finisher_hook do |app|
       Foreman::Plugin.register :"foreman-tasks" do
-        requires_foreman '> 1.3'
+        requires_foreman '>= 1.6'
         divider :top_menu, :parent => :monitor_menu, :after => :audits
         menu :top_menu, :tasks,
              :url_hash => { :controller => 'foreman_tasks/tasks', :action => :index },
@@ -24,6 +24,9 @@ module ForemanTasks
 
         role "Tasks Manager", [:view_foreman_tasks, :edit_foreman_tasks]
         role "Tasks Reader", [:view_foreman_tasks]
+
+        widget 'foreman_tasks/tasks/dashboard/tasks_status', :sizex=>6, :sizey=>1, :name=> N_('Tasks Status table')
+        widget 'foreman_tasks/tasks/dashboard/latest_tasks_in_error_warning', :sizex=>6, :sizey=>1,:name=> N_('Tasks in Error/Warning')
       end
     end
 
@@ -80,10 +83,6 @@ module ForemanTasks
       end
     end
 
-    initializer "foreman_tasks.initialize_dynflow", :after => 'foreman_tasks.initializer'  do
-      ::ForemanTasks::WidgetManager.register_widgets
-    end
-
     config.to_prepare do
       ForemanTasks.dynflow.eager_load_actions!
 

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.6.14"
+  VERSION = "0.6.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.6.15
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -149,7 +149,6 @@ files:
 - lib/foreman_tasks/tasks/export_tasks.rake
 - lib/foreman_tasks/triggers.rb
 - lib/foreman_tasks/version.rb
-- lib/foreman_tasks/widget_manager.rb
 - lib/tasks/gettext.rake
 - test/controllers/api/tasks_controller_test.rb
 - test/factories/task_factory.rb
@@ -183,12 +182,12 @@ signing_key:
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resoruces and users
 test_files:
-- test/support/dummy_dynflow_action.rb
-- test/factories/task_factory.rb
 - test/helpers/foreman_tasks/tasks_helper_test.rb
+- test/support/dummy_dynflow_action.rb
 - test/foreman_tasks_test_helper.rb
 - test/controllers/api/tasks_controller_test.rb
+- test/factories/task_factory.rb
 - test/unit/dynflow_console_authorizer_test.rb
-- test/unit/task_test.rb
 - test/unit/actions/action_with_sub_plans_test.rb
+- test/unit/task_test.rb
 has_rdoc: 

data/lib/foreman_tasks/widget_manager.rb

@@ -1,16 +0,0 @@
-module ForemanTasks
-  class WidgetManager
-    DEFAULT_WIDGETS = [
-      {:template=>'foreman_tasks/tasks/dashboard/tasks_status', :sizex=>6, :sizey=>1, :name=> N_('Tasks Status table')},
-      {:template=>'foreman_tasks/tasks/dashboard/latest_tasks_in_error_warning', :sizex=>6, :sizey=>1,:name=> N_('Tasks in Error/Warning')}
-    ]
-
-    def self.register_widgets
-      if ForemanTasks.dynflow.required?
-        DEFAULT_WIDGETS.each do |widget|
-          Dashboard::Manager.register_default_widget(widget)
-        end
-      end
-    end
-  end
-end