foreman-tasks 0.5.5 → 0.5.6

data/app/assets/stylesheets/foreman_tasks/application.css.scss

@@ -0,0 +1,50 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */
+
+.spin {
+  -webkit-animation: spin 1s infinite linear;
+  -moz-animation: spin 1s infinite linear;
+  -o-animation: spin 1s infinite linear;
+  animation: spin 1s infinite linear;
+  -webkit-transform-origin: 50% 50%;
+  transform-origin: 50% 50%;
+  -ms-transform-origin: 50% 50%; /* IE 9 */
+}
+
+@-moz-keyframes spin {
+  from {
+    -moz-transform: rotate(0deg);
+  }
+  to {
+    -moz-transform: rotate(360deg);
+  }
+}
+
+@-webkit-keyframes spin {
+  from {
+    -webkit-transform: rotate(0deg);
+  }
+  to {
+    -webkit-transform: rotate(360deg);
+  }
+}
+
+@keyframes spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}

data/app/models/foreman_tasks/lock.rb

@@ -13,7 +13,21 @@ module ForemanTasks
     class LockConflict < StandardError
       attr_reader :required_lock, :conflicting_locks
       def initialize(required_lock, conflicting_locks)
-        super("required lock: #{required_lock} conflicts wiht #{conflicting_locks.inspect}")
+        header = <<-TXT.gsub(/^ *\|/, '')
+          |Required lock is already taken by other running tasks.
+          |Please inspect their state, fix their errors nad resume them.
+          |
+          |Required lock: #{required_lock.name}
+          |Conflicts with tasks:
+        TXT
+        url_helpers       = Rails.application.routes.url_helpers
+        conflicting_tasks = conflicting_locks.
+            map(&:task).
+            uniq.
+            map { |task| "- #{Setting['foreman_url'] + url_helpers.foreman_tasks_task_path(task)}" }.
+            join("\n")
+
+        super header + conflicting_tasks
         @required_lock     = required_lock
         @conflicting_locks = conflicting_locks
       end

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

@@ -1,15 +1,56 @@
 <script>
-  $(document).ready(function () {
-    var reload = function () {
+  task_progress_reloader = {
+    timeoutId: null,
+    reload: function () {
       $.ajax({
         url: "",
         context: document.body,
         success: function (s, x) {
           $(this).html(s);
+          task_progress_reloader.start();
         }
       });
-    };
-    setTimeout(reload, 5000);
+    },
+
+    start: function () {
+      if (!this.timeoutId) {
+        this.timeoutId = setTimeout(this.reload, 5000);
+        var button = $('.reload-button');
+        button.html('<span class="glyphicon glyphicon-refresh spin"></span> <%= _('Stop auto-reloading') %>');
+        button.show();
+      }
+    },
+
+    stop: function () {
+      if (this.timeoutId) {
+        clearTimeout(this.timeoutId);
+        this.timeoutId = null;
+        var button = $('.reload-button');
+        button.html('<span class="glyphicon glyphicon-refresh"></span> <%= _('Start auto-reloading') %>');
+        button.show();
+      }
+    },
+
+    toggle: function () {
+      if (this.timeoutId) {
+        this.stop();
+      } else {
+        this.start();
+      }
+    }
+  };
+
+  $(document).ready(function () {
+    $('.reload-button').click(function (event) {
+      task_progress_reloader.toggle();
+      event.preventDefault();
+    });
+
+    $('.reload-button-stop').click(function (event) {
+      task_progress_reloader.stop();
+    });
+
+    task_progress_reloader.start();
   });
 </script>
 
@@ -18,9 +59,11 @@
   <%= form_for @task, :url => "#" do %>
 
     <p>
+      <%= link_to(_('Auto Reload'), '', class: %w(btn btn-sm btn-default reload-button hidden)) %>
+
       <%= link_to(_('Dynflow console'),
                   format('/foreman_tasks/dynflow/%s', @task.external_id),
-                  class: %w(btn btn-sm btn-info)) if Setting['dynflow_enable_console'] %>
+                  class: %w(btn btn-sm btn-default)) if Setting['dynflow_enable_console'] %>
 
       <%= link_to(_('Resume'),
                   resume_foreman_tasks_task_path(@task),
@@ -29,13 +72,13 @@
 
       <%= link_to(_('Stop'),
                   '',
-                  class:         ['btn', 'btn-sm', 'btn-warning', ('disabled' unless @task.state == 'paused')].compact,
+                  class:         ['btn', 'btn-sm', 'btn-warning', 'reload-button-stop', ('disabled' unless @task.state == 'paused')].compact,
                   :'data-toggle' => "modal",
                   :'data-target' => "#stop_modal") %>
 
       <%= link_to(_('Force Stop'),
                   '',
-                  class:         %w(btn btn-sm btn-danger),
+                  class:         ['btn', 'btn-sm', 'btn-danger', 'reload-button-stop', ('disabled' if @task.state == 'stopped')].compact,
                   :'data-toggle' => "modal",
                   :'data-target' => "#force_stop_modal") %>
     </p>

data/lib/foreman_tasks/dynflow/persistence.rb

@@ -27,9 +27,9 @@ module ForemanTasks
         Lock.owner!(::User.current, task.id) if ::User.current
       elsif data[:state] != :planning
         if task = ::ForemanTasks::Task::DynflowTask.find_by_external_id(execution_plan_id)
-	  unless task.state.to_s == data[:state].to_s
+          unless task.state.to_s == data[:state].to_s
             task.update_from_dynflow(data, true)
-	  end
+          end
         end
       end
     end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -126,6 +126,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/stylesheets/foreman_tasks/application.css.scss
 - app/helpers/foreman_tasks/tasks_helper.rb
 - app/lib/actions/helpers/args_serialization.rb
 - app/lib/actions/helpers/humanizer.rb