tasks_scheduler 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6573b654529a255fe7a822f33662837da3915a7b9a98cdc6e071c19d3143c955
-  data.tar.gz: 3409022b969859d61f236ed5ddbf1678105ef35bd2cd971d5a172c56c43822b5
+  metadata.gz: 1990d0ec938668f01704d530a1797027f84ae24771f22ec716051176032039d9
+  data.tar.gz: 66bab115b2e5fa8f0aeb837ff9549b5a3779fbd9637733521f5f4800239d9fcb
 SHA512:
-  metadata.gz: e93580d187fd4e4ff62faf5ee5b5b0b5ea70b13b11f86f38779327f2bb06f329e46089b3add379cc734a06fd666c7a9edc40156939abc8ffadeb655bd43c6f22
-  data.tar.gz: cf55f3658eb3df0c1527a219b67a03ce401af2ce22dde55e49b90184b4c4019c21bd2ab0fc3e3a7741cf6a70e4f2ca8c8a8ec6578b3d304bf6efb62ee5c4c079
+  metadata.gz: bc08c8c498e0179d205f23bf6b7107e4f9db245857bcce37a0956ad73d14ef45d7ff0300a9140dc25e9976c7636c4f442a7a8af374bf84a4cb7d8c89fe988b1d
+  data.tar.gz: af0434d46a4ef3fecc00d177132f0cd2a7b1717853113ec0327c3d798fc1a24f1b7e55f3daa1e511aa31e1754deae4fc7af37393826d624834bf90d30eb3b242

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rake'
+require 'eac_ruby_utils/ruby'
 
 class ScheduledTask < ActiveRecord::Base
   module Checker
@@ -44,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
@@ -64,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
@@ -77,8 +84,10 @@ class ScheduledTask < ActiveRecord::Base
       params = ['bundle', 'exec', 'tasks_scheduler_run_task', id.to_s]
       check_log("Spawn command: #{params} (Task: #{task})")
       spawn_pid = nil
-      Dir.chdir(Rails.root) do
-        spawn_pid = Process.spawn(*params)
+      ::EacRubyUtils::Ruby.on_clean_environment do
+        Dir.chdir(Rails.root) do
+          spawn_pid = ::Process.spawn(*params)
+        end
       end
       Process.detach(spawn_pid)
       update!(pid: spawn_pid, last_fail_status: nil)

data/db/migrate/20161122123828_create_scheduled_tasks.rb

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

data/db/migrate/20161123130153_add_status_attributes_to_scheduled_tasks.rb

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

data/db/migrate/20161124200712_add_pid_to_scheduled_tasks.rb

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

data/db/migrate/20161128163702_add_args_to_scheduled_tasks.rb

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

data/db/migrate/20180223155025_add_last_fail_status_to_scheduled_tasks.rb

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

data/db/migrate/20180302170138_add_enabled_to_scheduled_tasks.rb

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

data/lib/tasks_scheduler.rb

@@ -1,13 +1,7 @@
 # frozen_string_literal: true
 
-require 'tasks_scheduler/engine'
-require 'active_scaffold'
-require 'js-routes'
-require 'parse-cron'
-require 'tasks_scheduler/cron_scheduling_validator'
-require 'tasks_scheduler/cron_parser_patch'
-require 'tasks_scheduler/checker'
-require 'tasks_scheduler/daemon'
+require 'eac_ruby_utils/require_sub'
 
 module TasksScheduler
+  ::EacRubyUtils.require_sub __FILE__
 end

data/lib/tasks_scheduler/app_gem.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_gems_utils/gem'
+require 'singleton'
+
+module TasksScheduler
+  class AppGem < ::SimpleDelegator
+    include ::Singleton
+
+    def initialize
+      super(::EacRubyGemsUtils::Gem.new(::Rails.root))
+    end
+
+    def bundle(*args)
+      super(*args).chdir_root.envvar('RAILS_ENV', ::Rails.env)
+    end
+  end
+end

data/lib/tasks_scheduler/cron_parser_patch.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'parse-cron'
+
 module TasksScheduler
   module CronParserPatch
     class TasksSchedulerTimeSource

data/lib/tasks_scheduler/daemon.rb

@@ -1,31 +1,35 @@
 # frozen_string_literal: true
 
-require 'open3'
+require 'tasks_scheduler/app_gem'
 
 module TasksScheduler
   class Daemon
     ACTIONS = %w[status start stop restart].freeze
 
     class << self
-      def execute(action)
+      def daemon_command(action)
         raise "Action not allowed: #{action} (Allowed: #{ACTIONS})" unless ACTIONS.include?(action)
 
-        command = ['bundle', 'exec', 'tasks_scheduler', action]
-        Dir.chdir(Rails.root) do
-          Open3.popen3(env_args, *command) do |_stdin, stdout, stderr, wait_thr|
-            { action: action, env_args: env_args.map { |k, v| "#{k}=#{v}" }.join(' | '),
-              command: command.join(' '), status: wait_thr.value.to_i, stdout: stdout.read,
-              stderr: stderr.read }
-          end
-        end
+        ::TasksScheduler::AppGem.instance.bundle('exec', 'tasks_scheduler', action)
+                                .envvar(::TasksScheduler::Checker::LOG_ON_FILE_ENV_KEY, '1')
+      end
+
+      def execute(action)
+        command = daemon_command(action)
+        result = command.execute
+        {
+          action: action, env_args: env_args_to_s(command), command: command.to_s,
+          status: result.fetch(:exit_code), stdout: result.fetch(:stdout),
+          stderr: result.fetch(:stderr)
+        }
       end
 
       def running?
         execute('status')[:status].zero?
       end
 
-      def env_args
-        { 'RAILS_ENV' => Rails.env, ::TasksScheduler::Checker::LOG_ON_FILE_ENV_KEY => '1' }
+      def env_args_to_s(command)
+        command.send(:extra_options).fetch(:envvars).map { |k, v| "#{k}=#{v}" }.join(' | ')
       end
     end
   end

data/lib/tasks_scheduler/engine.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'active_scaffold'
+require 'js-routes'
+
 module TasksScheduler
   class Engine < ::Rails::Engine
     initializer :append_migrations do |app|

data/lib/tasks_scheduler/version.rb

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

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.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -38,6 +38,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_gems_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !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
@@ -70,16 +104,36 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.11.3
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_gem_support
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -107,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
@@ -142,6 +198,7 @@ files:
 - exe/tasks_scheduler
 - exe/tasks_scheduler_run_task
 - lib/tasks_scheduler.rb
+- lib/tasks_scheduler/app_gem.rb
 - lib/tasks_scheduler/checker.rb
 - lib/tasks_scheduler/checker/log.rb
 - lib/tasks_scheduler/cron_parser_patch.rb
@@ -187,7 +244,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: {}
@@ -206,8 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Scheduler for Rake tasks.