tasks_scheduler 0.4.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a16067c62acba647e2e5d6b0ba72aefd8e394766242c7aa7222cdc26efa515d
-  data.tar.gz: 15605017849c697fe146a8ac1ad69981846c5ebb1aa4b54fc8d0695d555f498c
+  metadata.gz: 75a6de697f21d110f7bd19830666b84ebc8f6bceddebfe7b5690b7fcbfc362d0
+  data.tar.gz: 59ca3d0f8830902424d1a3ff3927d16b1b1a13513b3f9b7f1d02865e07e64c90
 SHA512:
-  metadata.gz: f850e1b47685482e850d93b61a49339fae6f508f25b042e960d8da8f9fb78f50b3d46f84acf8049db43b0a675de91485335f3f04df3575b9345f6fb58a652be0
-  data.tar.gz: d0d33e8ba43ca019a9f4ec70aeb614cfd53c3693f1f5b86c4cf705ef69a62e98ec9d90e11ec7654fc5573e8c61fbd2e943fc1571ec66d9877133823e7ff97022
+  metadata.gz: fb5b96594aec114c1e8f3f08ed6fa03d638eb869fc9ef8c4cec3fb7b24f765945e879cf97597142726746a2709bf65733b800454477da2dd8378a419c6882376
+  data.tar.gz: 38f1f53610c2830ba8e2deeed0ad32bd9a21165926cf92bc898291303829bd3843917c83c647e667478361540b59dfd3bed1dbc4482fc3a4342dda5c818d3f0c

data/app/assets/javascripts/tasks_scheduler.js

@@ -1,115 +1,4 @@
 //= require active_scaffold
 //= require js-routes
-
-function TasksScheduler() {
-}
-
-TasksScheduler.Status = function () {
-};
-
-// Shortcut
-var _S = TasksScheduler.Status;
-
-_S.initialized = false;
-
-_S.init = function (url, interval_max) {
-  if (!_S.initialized) {
-    _S.initialized = true;
-    _S.url = url;
-    _S.interval_max = interval_max;
-    _S.update();
-  }
-};
-
-_S.content = function () {
-  return $('#TaskScheduler_Status_Content');
-};
-
-_S.status = function () {
-  return $('#TaskScheduler_Status_Status');
-};
-
-_S.update_status = function () {
-  _S.status().html(
-    "Updating in " + _S.interval + " seconds..."
-  );
-};
-
-_S.check = function () {
-  if (_S.interval <= 0) {
-    _S.update();
-  } else {
-    _S.interval--;
-    _S.update_status();
-    setTimeout(_S.check, 1000);
-  }
-};
-
-_S.update = function () {
-  $.ajax({
-    url: _S.url,
-    success: function (result) {
-      _S.content().html(result);
-    },
-    complete: function (result) {
-      _S.interval = _S.interval_max + 1;
-      _S.last_update = new Date();
-      _S.check();
-    }
-  });
-};
-
-TasksScheduler.Alert = function () {
-};
-
-_A = TasksScheduler.Alert;
-
-_A.DEFAULT_REFRESH_INTERVAL = 5000;
-_A.DEFAULT_ELEMENT_SELECTOR = '#tasks_scheduler_alert';
-_A.CSS_CLASSES_PREFIX = 'alert_';
-_A.url = Routes.status_tasks_scheduler_daemon_path();
-
-_A.init = function (options) {
-  options = typeof options !== 'undefined' ? options : {};
-  $(document).ready(function () {
-    _A.options = options;
-    if (!_A.options.refresh_interval) {
-      _A.options.refresh_interval = _A.DEFAULT_REFRESH_INTERVAL;
-    }
-    if (!_A.options.element_selector) {
-      _A.options.element_selector = _A.DEFAULT_ELEMENT_SELECTOR;
-    }
-    _A.refresh();
-  });
-};
-
-_A.setNextRefresh = function () {
-  setTimeout(_A.refresh, _A.options.refresh_interval);
-};
-
-_A.refresh = function () {
-  $.ajax({
-    url: _A.url,
-    success: function (result) {
-      var alert = $(_A.options.element_selector);
-      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;
-};
+//= require tasks_scheduler/alert
+//= require tasks_scheduler/status

data/app/assets/javascripts/tasks_scheduler/alert.js

@@ -0,0 +1,62 @@
+if (typeof TasksScheduler == "undefined") {
+  TasksScheduler = function() {};
+}
+
+TasksScheduler.Alert = function () {
+};
+
+_A = TasksScheduler.Alert;
+
+_A.DEFAULT_REFRESH_INTERVAL = 5000;
+_A.DEFAULT_ELEMENT_SELECTOR = '#tasks_scheduler_alert';
+_A.CSS_CLASSES_PREFIX = 'alert_';
+_A.url = Routes.status_tasks_scheduler_daemon_path();
+
+_A.init = function (options) {
+  options = typeof options !== 'undefined' ? options : {};
+  $(document).ready(function () {
+    _A.options = options;
+    if (!_A.options.refresh_interval) {
+      _A.options.refresh_interval = _A.DEFAULT_REFRESH_INTERVAL;
+    }
+    if (!_A.options.element_selector) {
+      _A.options.element_selector = _A.DEFAULT_ELEMENT_SELECTOR;
+    }
+    _A.refresh();
+  });
+};
+
+_A.setNextRefresh = function () {
+  setTimeout(_A.refresh, _A.options.refresh_interval);
+};
+
+_A.refresh = function () {
+  $.ajax(_A.refreshAjaxData());
+};
+
+_A.refreshAjaxData = function () {
+  return {
+    url: _A.url,
+    success: function (result) {
+      var alert = $(_A.options.element_selector);
+      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/javascripts/tasks_scheduler/status.js

@@ -0,0 +1,62 @@
+if (typeof TasksScheduler == "undefined") {
+  TasksScheduler = function() {};
+}
+
+TasksScheduler.Status = function () {
+};
+
+// Shortcut
+var _S = TasksScheduler.Status;
+
+_S.initialized = false;
+
+_S.init = function (url, interval_max) {
+  if (!_S.initialized) {
+    _S.initialized = true;
+    _S.url = url;
+    _S.interval_max = interval_max;
+    _S.update();
+  }
+};
+
+_S.content = function () {
+  return $('#TaskScheduler_Status_Content');
+};
+
+_S.status = function () {
+  return $('#TaskScheduler_Status_Status');
+};
+
+_S.update_status = function () {
+  _S.status().html(
+    "Updating in " + _S.interval + " seconds..."
+  );
+};
+
+_S.check = function () {
+  if (_S.interval <= 0) {
+    _S.update();
+  } else {
+    _S.interval--;
+    _S.update_status();
+    setTimeout(_S.check, 1000);
+  }
+};
+
+_S.update = function () {
+  $.ajax(_S.updateAjaxData());
+};
+
+_S.updateAjaxData = function() {
+  return {
+    url: _S.url,
+    success: function (result) {
+      _S.content().html(result);
+    },
+    complete: function (result) {
+      _S.interval = _S.interval_max + 1;
+      _S.last_update = new Date();
+      _S.check();
+    }
+  };
+};

data/app/assets/stylesheets/tasks_scheduler.scss

@@ -39,6 +39,10 @@
     td.status_disabled {
       color: lightgrey;
     }
+
+    td.status_task_not_found {
+      color: violet;
+    }
   }
 
   .last_run {

data/app/models/scheduled_task.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
 require 'rake'
 
 class ScheduledTask < ActiveRecord::Base
@@ -29,14 +30,11 @@ class ScheduledTask < ActiveRecord::Base
     end
   end
 
-  STATUS_RUNNING = 'running'
-  STATUS_FAILED = 'failed'
-  STATUS_WAITING = 'waiting'
-  STATUS_ABORTED = 'aborted'
-  STATUS_TIMEOUT = 'timeout'
-  STATUS_DISABLED = 'disabled'
+  enable_listable
+  lists.add_string :status, 'aborted', 'disabled', 'failed', 'running', 'task_not_found', 'timeout',
+                   'waiting'
 
-  LAST_FAIL_STATUSES = [STATUS_FAILED, STATUS_ABORTED, STATUS_TIMEOUT].freeze
+  LAST_FAIL_STATUSES = [STATUS_FAILED, STATUS_ABORTED, STATUS_TASK_NOT_FOUND, STATUS_TIMEOUT].freeze
 
   validates :scheduling, presence: true, 'tasks_scheduler/cron_scheduling': true
   validates :task, presence: true

data/app/models/scheduled_task/checker.rb

@@ -45,6 +45,12 @@ class ScheduledTask < ActiveRecord::Base
       end
     end
 
+    def check_on_task_not_exist
+      message = "Task does not exist: #{task}"
+      check_log(message)
+      on_end_running(::StandardError.new(message), STATUS_TASK_NOT_FOUND)
+    end
+
     def check_log(message, method = :info)
       Rails.logger.send(method, "TASK_CHECK(#{id}): #{message}")
     end
@@ -65,7 +71,7 @@ class ScheduledTask < ActiveRecord::Base
 
     def check_task_with_next_run
       if !task_exist?
-        check_log("Task does not exist: #{task}")
+        check_on_task_not_exist
       elsif next_run < Time.zone.now
         check_log('Next run reached. Running...')
         spawn_task

data/config/routes.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  resources(:scheduled_tasks) do
-    as_routes
+  concern :active_scaffold, ActiveScaffold::Routing::Basic.new(association: true)
+  resources(:scheduled_tasks, concerns: :active_scaffold) do
     collection do
       get :status
       get :status_content

data/db/migrate/20161122123828_create_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CreateScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     create_table :scheduled_tasks do |t|

data/db/migrate/20161123130153_add_status_attributes_to_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddStatusAttributesToScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     add_column :scheduled_tasks, :last_run_start, :datetime

data/db/migrate/20161124200712_add_pid_to_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddPidToScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     add_column :scheduled_tasks, :pid, :integer

data/db/migrate/20161128163702_add_args_to_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddArgsToScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     add_column :scheduled_tasks, :args, :string

data/db/migrate/20180223155025_add_last_fail_status_to_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddLastFailStatusToScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     add_column :scheduled_tasks, :last_fail_status, :string

data/db/migrate/20180302170138_add_enabled_to_scheduled_tasks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class AddEnabledToScheduledTasks < (
-    Rails.version < '5.2' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
+    Rails.version < '5' ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   )
   def change
     add_column :scheduled_tasks, :enabled, :boolean, null: false, default: true

data/lib/tasks_scheduler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TasksScheduler
-  VERSION = '0.4.2'
+  VERSION = '0.5.4'
 end

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/test/fixtures/scheduled_tasks.yml

@@ -2,3 +2,5 @@ test_scheduling:
   scheduling: 0 0 * * *
   task: test
   next_run: 2016-11-22 09:38:28
+  created_at: 2016-11-20 00:00:00
+  updated_at: 2016-11-20 00:00:00

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.43'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.43'
 - !ruby/object:Gem::Dependency
   name: js-routes
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +161,8 @@ files:
 - README.rdoc
 - Rakefile
 - app/assets/javascripts/tasks_scheduler.js
+- app/assets/javascripts/tasks_scheduler/alert.js
+- app/assets/javascripts/tasks_scheduler/status.js
 - app/assets/stylesheets/tasks_scheduler.scss
 - app/assets/stylesheets/tasks_scheduler/alert.scss
 - app/controllers/scheduled_tasks_controller.rb
@@ -192,6 +208,7 @@ files:
 - lib/tasks_scheduler/version.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -228,7 +245,7 @@ files:
 - test/fixtures/scheduled_tasks.yml
 - test/models/scheduled_task_test.rb
 - test/test_helper.rb
-homepage: 
+homepage: https://github.com/esquilo-azul/tasks_scheduler
 licenses:
 - MIT
 metadata: {}
@@ -247,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Scheduler for Rake tasks.
@@ -277,6 +294,7 @@ test_files:
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/public/422.html