foreman-tasks 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b55e0faa2c0c85d85d432c28bd50b9fea076a338
-  data.tar.gz: eb3840f629fe5b52380423e0ca0821f7d1562f95
+  metadata.gz: 92e635ff069d028c5e508c825046421fbb15ab24
+  data.tar.gz: 7db062afc016cbe574b668f506acd8b6ed15c249
 SHA512:
-  metadata.gz: ddb0a9efe1b688fd922970c6ba03a7ee39518221696c553428d00946ec27ac56bd356b788b808317ce5b6caa346fe2bc830f04c36991ea5cf413ade2e5e4c95c
-  data.tar.gz: 05b76b8b00ea367e193d30b404ef17b824f890ca362938b680bc3a55beb7f3162b21c1221859beb613abde70241312b9419d3e23c1bef9b4c12ad4e4a63445da
+  metadata.gz: cc9435af11573a58fe294b01faf8e000daca7d8302a43fcb35e6a3d334989af3a6bdb5af352ea47e2eaef693eed292d1db21274bcac58031581927eeb3abf889
+  data.tar.gz: fd81d5816a6b0155e94e11a6a802fff790b73f7c037b1d608824615e18fa03dc391a18b15e1a0108907d8b15ce94ea2211134d924746dd10de13f6707a0905f2

data/app/models/foreman_tasks/lock.rb

@@ -52,7 +52,7 @@ module ForemanTasks
 
     # returns true if it's possible to aquire this kind of lock
     def available?
-      not colliding_locks.any?
+      not colliding_locks.exists?
     end
 
     # returns a scope of the locks colliding with this one

data/app/views/foreman_tasks/recurring_logics/index.html.erb

@@ -1,5 +1,5 @@
 <% title _("Recurring logics") %>
-<% title_actions help_path %>
+<% title_actions SETTINGS[:version].short <= '1.13' ? help_path : help_button %>
 
 <table class="table table-fixed table-bordered table-striped table-condensed">
   <thead>

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

@@ -5,7 +5,7 @@
       <%= _("No running steps") %>
     <% else %>
       <% running_steps.each do |step| %>
-        <% action = ForemanTasks.dynflow.world.persistence.load_action(step) %>
+        <% action = step.action(@task.execution_plan) %>
         <div class="alert alert-warning">
           <p>
             <% if @task.cancellable_action?(action) %>

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

@@ -1,5 +1,5 @@
 <% title _("Tasks") %>
-<% title_actions help_path%>
+<% title_actions SETTINGS[:version].short <= '1.13' ? help_path : help_button %>
 
 <style>
   .param-name {

data/db/migrate/20160920151810_add_more_lock_indexes.rb

@@ -0,0 +1,8 @@
+class AddMoreLockIndexes < ActiveRecord::Migration
+  def change
+    add_index(:foreman_tasks_tasks, [:id, :state],
+              :name => 'index_foreman_tasks_id_state')
+    add_index(:foreman_tasks_locks, [:name, :resource_type, :resource_id],
+              :name => 'index_foreman_tasks_locks_name_resource_type_resource_id')
+  end
+end

data/db/migrate/20160924213030_change_tasks_widget_names.rb

@@ -0,0 +1,15 @@
+class ChangeTasksWidgetNames < ActiveRecord::Migration
+  def up
+    Widget.where(:name => 'Tasks Status table').\
+      update_all(:name => 'Task Status')
+    Widget.where(:name => 'Tasks in Error/Warning').\
+      update_all(:name => 'Latest Warning/Error Tasks')
+  end
+
+  def down
+    Widget.where(:name => 'Task Status').\
+      update_all(:name => 'Tasks Status table')
+    Widget.where(:name => 'Latest Warning/Error Tasks').\
+      update_all(:name => 'Tasks in Error/Warning')
+  end
+end

data/db/migrate/20161003091412_add_missing_indexes.rb

@@ -0,0 +1,30 @@
+class AddMissingIndexes < ActiveRecord::Migration
+  # since this is just making sure the indexes we defined before are
+  # really added we don't define the down direction here.
+  # The support for defining index at column definition was added in Rails here
+  # https://github.com/rails/rails/commit/9a0d35e820464f872b0340366dded639f00e19b9
+  # We need to fix migrations that happened before Rails 4.2
+  def up
+    add_index_unless_exists(:foreman_tasks_task_groups, :type)
+    add_index_unless_exists(:foreman_tasks_tasks, :id)
+    add_index_unless_exists(:foreman_tasks_tasks, :type)
+    add_index_unless_exists(:foreman_tasks_tasks, :label)
+    add_index_unless_exists(:foreman_tasks_tasks, :started_at)
+    add_index_unless_exists(:foreman_tasks_tasks, :start_at)
+    add_index_unless_exists(:foreman_tasks_tasks, :start_before)
+    add_index_unless_exists(:foreman_tasks_tasks, :ended_at)
+    add_index_unless_exists(:foreman_tasks_tasks, :state)
+    add_index_unless_exists(:foreman_tasks_tasks, :result)
+    add_index_unless_exists(:foreman_tasks_tasks, :external_id)
+    add_index_unless_exists(:foreman_tasks_tasks, :parent_task_id)
+    add_index_unless_exists(:foreman_tasks_locks, :task_id)
+    add_index_unless_exists(:foreman_tasks_locks, :name)
+    add_index_unless_exists(:foreman_tasks_locks, :exclusive)
+  end
+
+  def add_index_unless_exists(table, attribute)
+    unless indexes(table).any? { |index| index.columns == [attribute.to_s] }
+      add_index(table, attribute)
+    end
+  end
+end

data/foreman-tasks.gemspec

@@ -29,7 +29,7 @@ DESC
   s.extra_rdoc_files = Dir['README*', 'LICENSE']
 
   s.add_dependency "foreman-tasks-core"
-  s.add_dependency "dynflow", '~> 0.8.13'
+  s.add_dependency "dynflow", '~> 0.8.16'
   s.add_dependency "sequel" # for Dynflow process persistence
   s.add_dependency "sinatra" # for Dynflow web console
   s.add_dependency "daemons" # for running remote executor

data/lib/foreman_tasks/dynflow.rb

@@ -44,8 +44,11 @@ module ForemanTasks
           # 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
+            # leave this just for long-running executors
+            unless config.rake_task_with_executor?
+              world.auto_execute
+              ForemanTasks::Task::DynflowTask.consistency_check
+            end
           end
         end
       end
@@ -88,6 +91,9 @@ module ForemanTasks
           end
         end
 
+        set(:custom_navigation) do
+          { _("Back to tasks") => "/#{ForemanTasks::TasksController.controller_path}" }
+        end
         set(:world) { ForemanTasks.dynflow.world }
       end
     end

data/lib/foreman_tasks/engine.rb

@@ -47,7 +47,7 @@ module ForemanTasks
 
         menu :top_menu, :recurring_logics,
              :url_hash => { :controller => 'foreman_tasks/recurring_logics', :action => :index },
-             :caption  => N_('Recurring logics'),
+             :caption  => N_('Recurring Logics'),
              :parent   => :monitor_menu,
              :last     => true
 
@@ -73,8 +73,8 @@ 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')
+        widget 'foreman_tasks/tasks/dashboard/tasks_status', :sizex=>6, :sizey=>1, :name=> N_('Task Status')
+        widget 'foreman_tasks/tasks/dashboard/latest_tasks_in_error_warning', :sizex=>6, :sizey=>1,:name=> N_('Latest Warning/Error Tasks')
       end
     end
 

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/test/unit/dynflow_console_authorizer_test.rb

@@ -12,11 +12,7 @@ module ForemanTasks
     let(:foreign_task) { FactoryGirl.create(:dynflow_task) }
 
     let(:edit_foreman_tasks_permission) do
-      FactoryGirl.build(:permission).tap do |permission|
-        permission.name = :edit_foreman_tasks
-        permission.resource_type = ForemanTasks::Task.name
-        permission.save!
-      end
+      Permission.where(:name => :edit_foreman_tasks).first
     end
 
     def dynflow_console_authorized?(task = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.13
+        version: 0.8.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.13
+        version: 0.8.16
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +197,9 @@ files:
 - db/migrate/20150907131503_create_task_groups.rb
 - db/migrate/20151022123457_add_recurring_logic_state.rb
 - db/migrate/20151112152108_create_triggerings.rb
+- db/migrate/20160920151810_add_more_lock_indexes.rb
+- db/migrate/20160924213030_change_tasks_widget_names.rb
+- db/migrate/20161003091412_add_missing_indexes.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