foreman-tasks 0.5.2 → 0.5.3

data/app/models/foreman_tasks/lock.rb

@@ -1,12 +1,12 @@
 module ForemanTasks
   class Lock < ActiveRecord::Base
 
-    LINK_LOCK_NAME = :link_resource
+    LINK_LOCK_NAME  = :link_resource
     OWNER_LOCK_NAME = :task_owner
 
     # not really intedet to be created in database, but it's used for
     # explicitly stating that the all the locks for resource should be used
-    ALL_LOCK_NAME = :all
+    ALL_LOCK_NAME   = :all
 
     RESERVED_LOCK_NAMES = [LINK_LOCK_NAME, OWNER_LOCK_NAME, ALL_LOCK_NAME]
 
@@ -31,25 +31,25 @@ module ForemanTasks
 
     validate do
       unless available?
-        raise LockConflict.new(self, coliding_locks)
+        raise LockConflict.new(self, colliding_locks)
       end
     end
 
     # returns true if it's possible to aquire this kind of lock
     def available?
-      return true unless coliding_locks.any?
+      not colliding_locks.any?
     end
 
-    # returns a scope of the locks coliding with this one
-    def coliding_locks
-      coliding_locks_scope = Lock.active.where('foreman_tasks_locks.task_id != ?', task_id)
-      coliding_locks_scope = coliding_locks_scope.where(name:          name,
-                                                        resource_id:  resource_id,
-                                                        resource_type: resource_type)
+    # returns a scope of the locks colliding with this one
+    def colliding_locks
+      colliding_locks_scope = Lock.active.where(Lock.arel_table[:task_id].not_eq(task_id))
+      colliding_locks_scope = colliding_locks_scope.where(name:          name,
+                                                          resource_id:   resource_id,
+                                                          resource_type: resource_type)
       unless self.exclusive?
-        coliding_locks_scope = coliding_locks_scope.where(:exclusive => true)
+        colliding_locks_scope = colliding_locks_scope.where(:exclusive => true)
       end
-      return coliding_locks_scope
+      return colliding_locks_scope
     end
 
     class << self
@@ -63,7 +63,7 @@ module ForemanTasks
       end
 
       def exclusive?(resource)
-        build_exclusive_locks(resource).all?(:available?)
+        build_exclusive_locks(resource).all?(&:available?)
       end
 
 
@@ -82,10 +82,19 @@ module ForemanTasks
         build_locks(resource, lock_names, uuid).each(&:save!)
       end
 
-      def lock?(resource, uuid, *lock_names)
+      def lockable?(resource, uuid, *lock_names)
         build_locks(resource, lock_names, uuid).all?(&:available?)
       end
 
+      def locked?(resource, uuid, *lock_names)
+        not lockable?(resource, uuid, *lock_names)
+      end
+
+      def colliding_locks(resource, uuid, *lock_names)
+        build_locks(resource, lock_names, uuid).
+            inject([]) { |collisions, lock| collisions.concat lock.colliding_locks.to_a }
+      end
+
       # Assigns the resource to the task to easily track the task in context of
       # the resource. This doesn't prevent other actions to lock the resource
       # and should be used only for actions that tolerate other actions to be
@@ -111,7 +120,7 @@ module ForemanTasks
       def all_lock_names(resource, include_links = false)
         lock_names = []
         if resource.class.respond_to?(:available_locks) &&
-              resource.class.available_locks.any?
+            resource.class.available_locks.any?
           lock_names.concat(resource.class.available_locks)
         else
           raise "The resource #{resource.class.name} doesn't define any available lock"

data/app/models/setting/foreman_tasks.rb

@@ -0,0 +1,17 @@
+class Setting::ForemanTasks < Setting
+
+  def self.load_defaults
+    # Check the table exists
+    return unless super
+
+    self.transaction do
+      [
+          self.set('dynflow_enable_console', N_("Enable the dynflow console (/foreman_tasks/dynflow) for debugging"), false),
+      ].each { |s| self.create! s.update(:category => "Setting::ForemanTasks")}
+    end
+
+    true
+
+  end
+
+end

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

@@ -1,3 +1,18 @@
+<script>
+  $(document).ready(function () {
+    var reload = function () {
+      $.ajax({
+        url: "",
+        context: document.body,
+        success: function (s, x) {
+          $(this).html(s);
+        }
+      });
+    };
+    setTimeout(reload, 5000);
+  });
+</script>
+
 <div class="task-details">
   <%= form_for @task, :url => "#" do %>
     <div>

data/lib/foreman_tasks/dynflow.rb

@@ -81,8 +81,9 @@ module ForemanTasks
     def web_console
       ::Dynflow::WebConsole.setup do
         before do
-          # TODO: propper authentication
-          User.current = User.first
+          if !Setting[:dynflow_enable_console]
+            redirect('dashboard')
+          end
         end
 
         set(:world) { ForemanTasks.dynflow.world }

data/lib/foreman_tasks/engine.rb

@@ -2,6 +2,10 @@ module ForemanTasks
   class Engine < ::Rails::Engine
     engine_name "foreman_tasks"
 
+    initializer 'foreman_tasks.load_default_settings', :before => :load_config_initializers do
+      require_dependency File.expand_path('../../../app/models/setting/foreman_tasks.rb', __FILE__) if (Setting.table_exists? rescue(false))
+    end
+
     initializer 'foreman_tasks.register_plugin', :after => :finisher_hook do |app|
       Foreman::Plugin.register :"foreman-tasks" do
         requires_foreman '> 1.3'

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,6 +149,7 @@ files:
 - app/models/foreman_tasks/task/dynflow_task.rb
 - app/models/foreman_tasks/lock.rb
 - app/models/foreman_tasks/task.rb
+- app/models/setting/foreman_tasks.rb
 - bin/dynflow-executor
 - bin/foreman-tasks
 - config/routes.rb