tasks_scheduler 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 13e0b12aa070c0f451496117460d094aa1f2eec0
-  data.tar.gz: 2c04617ea9741ea2a06748c67f2fe7678f2db03f
+SHA256:
+  metadata.gz: fdf51773f53357b26a3b5442f32351d5365829cdb2c30c5e7579029b62c9e0b8
+  data.tar.gz: eb003ff171837d987d9a1a316914126915d6dc84d2b8082748b7998feb219333
 SHA512:
-  metadata.gz: 1502c2289657bd173cc132612605e8c3f2bfe66e2651707b032b7116e01d0a2681226cadf6e3580d15618e99f97264e13aab1365cbcaaf65ac839f4bed676446
-  data.tar.gz: 59ed1b051e70340e5df8e26d7f2a4b04281db36c127b9c9ab51cdeee2485a1c8dbc82e12777baea74c557f226b3d99b722ec4ee8deae54a630f1d5b7908c21fd
+  metadata.gz: d3a26e6ee7df33383594e9ea0fc117c11e176d9a0e71b8a4a465f57d96a0e498238313906d48c4985e3a269441840bbd496b96894ecd1b9058544a67c55c10cb
+  data.tar.gz: da6715ac5a6c44923c3688a3c8e4561c434a969402ff80be05b4143c758e6d4aaafab1a778b394c61d2c1758bd1c4832f697110cd0cb0766fda3a70d291348d5

data/app/assets/javascripts/{tasks_scheduler.js → tasks_scheduler.js.erb}

@@ -63,14 +63,14 @@ TasksScheduler.Alert = function () {
 
 _A = TasksScheduler.Alert;
 
-_A.DEFAULT_REFRESH_INTERVAL = 60000;
+_A.DEFAULT_REFRESH_INTERVAL = 5000;
 _A.DEFAULT_ELEMENT_SELECTOR = '#tasks_scheduler_alert';
-_A.url = null;
+_A.CSS_CLASSES_PREFIX = 'alert_';
+_A.url = '<%= ::Rails.application.class.routes.url_helpers.status_tasks_scheduler_daemon_path %>';
 
-_A.init = function (url, options) {
+_A.init = function (options) {
   options = typeof options !== 'undefined' ? options : {};
   $(document).ready(function () {
-    _A.url = url;
     _A.options = options;
     if (!_A.options.refresh_interval) {
       _A.options.refresh_interval = _A.DEFAULT_REFRESH_INTERVAL;
@@ -91,14 +91,24 @@ _A.refresh = function () {
     url: _A.url,
     success: function (result) {
       var alert = $(_A.options.element_selector);
-      if (result === 'true') {
-        alert.hide();
-      } else {
-        alert.show();
-      }
+      var pattern = new RegExp('(^|\\s)' + _A.CSS_CLASSES_PREFIX + "\\S+", 'g');
+      alert.removeClass (function (index, className) {
+        return (className.match (pattern) || []).join(' ');
+      });
+      alert.addClass(_A.resultToCssClass(result));
     },
     complete: function (result) {
       _A.setNextRefresh();
     }
   });
 };
+
+_A.resultToCssClass = function(result) {
+  var suffix = "ok"
+  if (!result.daemon_running) {
+    suffix = "daemon_stopped";
+  } else if (!result.tasks_all_ok) {
+    suffix = "task_failed";
+  }
+  return _A.CSS_CLASSES_PREFIX + suffix;
+};

data/app/assets/stylesheets/tasks_scheduler.scss

@@ -1,4 +1,5 @@
 @import 'active_scaffold';
+@import 'tasks_scheduler/alert';
 
 #TaskScheduler_Status_Status {
   font-size: small;

data/app/assets/stylesheets/tasks_scheduler/alert.scss

@@ -0,0 +1,46 @@
+.tasks_scheduler_alert_link {
+  font-weight: bold;
+  content: '!';
+  &::after {
+    content: '!';
+  }
+}
+
+#tasks_scheduler_alert {
+  .daemon_alert {
+    @extend .tasks_scheduler_alert_link;
+    color: red !important;
+  }
+
+  .task_alert {
+    @extend .tasks_scheduler_alert_link;
+    color: yellow !important;
+  }
+
+  &, &.alert_ok {
+    .daemon_alert {
+      display: none;
+    }
+    .task_alert {
+      display: none;
+    }
+  }
+
+  &.alert_daemon_stopped {
+    .daemon_alert {
+      display: inline;
+    }
+    .task_alert {
+      display: none;
+    }
+  }
+
+  &.alert_task_failed {
+    .daemon_alert {
+      display: none;
+    }
+    .task_alert {
+      display: inline;
+    }
+  }
+}

data/app/controllers/tasks_scheduler_daemon_controller.rb

@@ -7,8 +7,9 @@ class TasksSchedulerDaemonController < ApplicationController
     render 'index'
   end
 
-  def running
-    render plain: (::TasksScheduler::Daemon.running? ? 'true' : 'false'), layout: false
+  def status
+    render json: { daemon_running: ::TasksScheduler::Daemon.running?,
+                   tasks_all_ok: !::ScheduledTask.all.any?(&:failed?) }
   end
 
   def download_log

data/app/models/scheduled_task/status.rb

@@ -7,6 +7,10 @@ class ScheduledTask < ActiveRecord::Base
       last_fail_status.present? ? last_fail_status : STATUS_FAILED
     end
 
+    def failed?
+      [STATUS_FAILED, STATUS_ABORTED, STATUS_TIMEOUT].include?(status)
+    end
+
     def running?
       last_run_start.present?
     end

data/app/views/tasks_scheduler/_alert.html.erb

@@ -0,0 +1,4 @@
+<% if can_by_path?(main_app.tasks_scheduler_daemon_path) &&
+    can_by_path?(main_app.status_tasks_scheduler_daemon_path) %>
+<%= render partial: '/tasks_scheduler/alert' %>
+<% end %>

data/config/routes.rb

@@ -13,8 +13,8 @@ Rails.application.routes.draw do
   get '/tasks_scheduler_daemon', to: 'tasks_scheduler_daemon#index', as: :tasks_scheduler_daemon
   post '/tasks_scheduler_daemon/:tasks_scheduler_execute_action',
        to: 'tasks_scheduler_daemon#execute', as: :execute_tasks_scheduler_daemon
-  get '/tasks_scheduler_daemon/running', to: 'tasks_scheduler_daemon#running',
-                                         as: :running_tasks_scheduler_daemon
+  get '/tasks_scheduler_daemon/status', to: 'tasks_scheduler_daemon#status',
+                                        as: :status_tasks_scheduler_daemon
   get '/tasks_scheduler_daemon/download_log', to: 'tasks_scheduler_daemon#download_log',
                                               as: :download_log_tasks_scheduler_daemon
 end

data/lib/tasks_scheduler/version.rb

@@ -1,3 +1,3 @@
 module TasksScheduler
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -92,8 +92,9 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- app/assets/javascripts/tasks_scheduler.js
+- app/assets/javascripts/tasks_scheduler.js.erb
 - app/assets/stylesheets/tasks_scheduler.scss
+- app/assets/stylesheets/tasks_scheduler/alert.scss
 - app/controllers/scheduled_tasks_controller.rb
 - app/controllers/tasks_scheduler_daemon_controller.rb
 - app/helpers/scheduled_tasks_helper.rb
@@ -106,6 +107,7 @@ files:
 - app/views/scheduled_tasks/log.html.erb
 - app/views/scheduled_tasks/status.html.erb
 - app/views/scheduled_tasks/status_content.html.erb
+- app/views/tasks_scheduler/_alert.html.erb
 - app/views/tasks_scheduler/_navbar.html.erb
 - app/views/tasks_scheduler_daemon/_running_status.html.erb
 - app/views/tasks_scheduler_daemon/index.html.erb
@@ -186,46 +188,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Scheduler for Rake tasks.
 test_files:
-- test/fixtures/scheduled_tasks.yml
-- test/models/scheduled_task_test.rb
-- test/dummy/config.ru
+- test/dummy/Rakefile
 - test/dummy/README.rdoc
-- test/dummy/db/schema.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/bin/bundle
 - test/dummy/bin/rails
-- test/dummy/bin/setup
 - test/dummy/bin/rake
-- test/dummy/Rakefile
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
+- test/dummy/bin/bundle
+- test/dummy/bin/setup
 - test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/locales/en.yml
 - test/dummy/config/secrets.yml
+- test/dummy/config/environment.rb
 - test/dummy/config/database.yml
 - test/dummy/config/routes.rb
-- test/dummy/config/environment.rb
-- test/dummy/public/422.html
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/application.rb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/db/schema.rb
 - test/dummy/public/favicon.ico
-- test/dummy/public/404.html
 - test/dummy/public/500.html
+- test/dummy/public/422.html
+- test/dummy/public/404.html
+- test/dummy/config.ru
+- test/models/scheduled_task_test.rb
 - test/test_helper.rb
+- test/fixtures/scheduled_tasks.yml