tasks_scheduler 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b913be2e2291cc27208e02af8b31c07d85070b73037c1eea24c1f91f45e63a9
-  data.tar.gz: 2fe374924c6751c1ef33c6c727dea2dfe83dccfd521de2e5a24783691db5d7a4
+  metadata.gz: 711a4559c53944035eb7fcf896395defe0932d2e78c2419b40af569fb4682a2e
+  data.tar.gz: af431d6229b13c27b84196044d0adcc83afd525d7730df25ab934d327db87e73
 SHA512:
-  metadata.gz: 57ddcdd38e84cabcc98419ce1bf8904a0854c43c6d03f3b0edf1c4542dacb52ac0d3367ebd4c714025900a01184d05215cdc23c7cb02683085cfb5dd7a0cce4b
-  data.tar.gz: 9d151d67c6a38040bde4a78f4021adc646890260f56c8f4172a88397b9fa566c624386eb499df80f4e65489d4beffd19666381fae6549124d0601b549359b065
+  metadata.gz: 75ac60b1ca9e6ff19e0826bcb6d8e8a4ae85cbc602fc87be4c0fc674448976d889a82daea6d431ccfbe693467c8091809bb9e8125c32c5b5abfbe1769de654b2
+  data.tar.gz: bf183bd19dde6e0b04fe6df6b43fe0a6cdd084f6ec684ed15d98915b4ad397356e65682bb326ee3e67a5049212854868f2b545aeeccf1dcd55cb2de3648ff0c9

data/app/controllers/scheduled_task_statuses_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ScheduledTaskStatusesController < ApplicationController
+  def log
+    record = find_if_allowed(params[:id], :read)
+    @log_file = record.log_file(params[:identifier])
+  end
+
+  def index; end
+
+  def status_content
+    @scheduled_tasks = ::ScheduledTask.order(task: :asc, scheduling: :asc)
+    render layout: false
+  end
+end

data/app/controllers/scheduled_tasks_controller.rb

@@ -9,6 +9,8 @@ class ScheduledTasksController < ApplicationController
     end
   end
 
+  before_action :localize_active_scaffold
+
   active_scaffold :scheduled_task do |conf|
     %i[create update list].each do |action|
       conf.send(action).columns.exclude(:next_run, :last_fail_status, :last_run_start,
@@ -19,27 +21,21 @@ class ScheduledTasksController < ApplicationController
     conf.columns[:task].form_ui = :select
     conf.columns[:task].options ||= {}
     conf.columns[:task].options[:options] = task_column_options
-    conf.action_links.add :run_now, label: I18n.t(:run_now), type: :member,
+    conf.action_links.add :run_now, label: :run_now, type: :member,
                                     crud_type: :update, method: :put, position: false
   end
 
-  def log
-    record = find_if_allowed(params[:id], :read)
-    @log_file = record.log_file(params[:identifier])
-  end
-
-  def status; end
-
-  def status_content
-    @scheduled_tasks = ::ScheduledTask.order(task: :asc, scheduling: :asc)
-    render layout: false
-  end
-
   def run_now
     process_action_link_action do |record|
       record.update!(next_run: Time.zone.now)
       record.reload
-      flash[:info] = "Next run adjusted to #{record.next_run}"
+      flash.now[:info] = "Next run adjusted to #{record.next_run}"
     end
   end
+
+  private
+
+  def localize_active_scaffold
+    active_scaffold_config.action_links[:run_now].label = ::I18n.t(:run_now)
+  end
 end

data/app/controllers/tasks_scheduler_daemon_controller/_download_log.rb

@@ -35,7 +35,7 @@ class TasksSchedulerDaemonController < ApplicationController
     send_file(
       log.path,
       filename: "#{request.base_url.parameterize}_tasks-scheduler_checker-log_" \
-        "#{Time.zone.now.to_s.parameterize}.log",
+                "#{Time.zone.now.to_s.parameterize}.log",
       type: 'text/plain'
     )
   end

data/app/models/scheduled_task/log.rb

@@ -19,10 +19,10 @@ class ScheduledTask < ActiveRecord::Base
     def log_on_start
       log_file = log_file(LOG_RUNNING)
       FileUtils.mkdir_p(File.dirname(log_file))
-      File.unlink(log_file) if File.exist?(log_file)
-      STDOUT.reopen(log_file, 'w')
-      STDERR.reopen(log_file, 'w')
-      Rails.logger = ActiveSupport::Logger.new(STDOUT)
+      FileUtils.rm_f(log_file)
+      $stdout.reopen(log_file, 'w')
+      $stderr.reopen(log_file, 'w')
+      Rails.logger = ActiveSupport::Logger.new($stdout)
     end
 
     def log_on_end(exception)
@@ -30,7 +30,7 @@ class ScheduledTask < ActiveRecord::Base
       return unless ::File.exist?(running_log)
 
       target_log = exception ? log_file(LOG_UNSUCCESSFUL) : log_file(LOG_SUCCESSFUL)
-      File.unlink(target_log) if File.exist?(target_log)
+      FileUtils.rm_f(target_log)
       File.rename(running_log, target_log)
     end
   end

data/app/models/scheduled_task.rb

@@ -22,10 +22,10 @@ class ScheduledTask < ActiveRecord::Base
 
     def timeout
       @timeout ||= begin
-        r = Integer(ENV[DEFAULT_TIMEOUT_ENVVAR_NAME])
+        r = Integer(ENV.fetch(DEFAULT_TIMEOUT_ENVVAR_NAME, nil))
         r.positive? ? r.seconds : DEFAULT_TIMEOUT
-                   rescue ArgumentError, TypeError
-                     DEFAULT_TIMEOUT
+      rescue ArgumentError, TypeError
+        DEFAULT_TIMEOUT
       end
     end
   end

data/app/views/{scheduled_tasks/status.html.erb → scheduled_task_statuses/index.html.erb}

@@ -1,9 +1,8 @@
-<%= tasks_scheduler_navbar %>
 <h2><%=  I18n.t(:tasks_scheduler_status) %></h2>
 <div id="TaskScheduler_Status_Status">
 </div>
 <div id="TaskScheduler_Status_Content">
 </div>
 <script>
-  TasksScheduler.Status.init('<%= status_content_scheduled_tasks_path %>', 5);
+  TasksScheduler.Status.init('<%= status_content_scheduled_task_statuses_path %>', 5);
 </script>

data/app/views/{scheduled_tasks → scheduled_task_statuses}/log.html.erb

@@ -1,4 +1,3 @@
-<%= tasks_scheduler_navbar %>
 <p>Log file: <%= @log_file %></p>
 <% if File.exist?(@log_file) %>
   <p>Content: </p>

data/app/views/tasks_scheduler_daemon/index.html.erb

@@ -1,4 +1,3 @@
-<%= tasks_scheduler_navbar %>
 <h2><%= I18n.t(:tasks_scheduler_daemon) %></h2>
 <%= render partial: 'daemon', locals: {status_label: 'Status:'} %>
 <%= render partial: 'logs' %>

data/config/initializers/menus.rb

@@ -2,8 +2,8 @@
 
 require 'eac_rails_utils/patches/application'
 
-::Rails.application.root_menu.group(:admin).group(:tasks_scheduler).within do |g|
+Rails.application.root_menu.group(:admin).group(:tasks_scheduler).within do |g|
   g.action :tasks_scheduler_daemon
   g.action :scheduled_tasks
-  g.action :status_scheduled_tasks
+  g.action :scheduled_task_statuses
 end

data/config/locales/en.yml

@@ -12,7 +12,7 @@ en:
             __self: Tasks scheduler
             main_app_tasks_scheduler_daemon: Daemon
             main_app_scheduled_tasks: Tasks
-            main_app_status_scheduled_tasks: Status
+            main_app_scheduled_task_statuses: Status
   helpers:
       label:
         scheduled_task:

data/config/locales/pt-BR.yml

@@ -12,7 +12,7 @@ pt-BR:
             __self: 'Agendador de tarefas'
             main_app_tasks_scheduler_daemon: Daemon
             main_app_scheduled_tasks: Tarefas
-            main_app_status_scheduled_tasks: Situação
+            main_app_scheduled_task_statuses: Situação
   helpers:
       label:
         scheduled_task:

data/config/routes.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  resources(:scheduled_tasks, concerns: active_scaffold) do
+  resources(:scheduled_task_statuses, only: [:index]) do
     collection do
-      get :status
       get :status_content
     end
     member do
       get :log
+    end
+  end
+  resources(:scheduled_tasks, concerns: active_scaffold) do
+    member do
       put :run_now
     end
   end

data/exe/tasks_scheduler

@@ -16,8 +16,8 @@ rails_root = find_rails_root
 dir = File.expand_path('tmp/pids', rails_root)
 FileUtils.mkdir_p(dir)
 Daemons.run_proc 'tasks_scheduler', dir_mode: :normal, dir: dir do
-  ::Dir.chdir(rails_root) do
+  Dir.chdir(rails_root) do
     require File.join(rails_root, 'config', 'environment')
-    ::TasksScheduler::Checker.instance.run
+    TasksScheduler::Checker.instance.run
   end
 end

data/exe/tasks_scheduler_run_task

@@ -13,4 +13,4 @@ end
 
 rails_root = find_rails_root
 require File.join(rails_root, 'config', 'environment')
-::ScheduledTask.find(ARGV[0].to_i).run
+ScheduledTask.find(ARGV[0].to_i).run

data/lib/tasks_scheduler/checker/log.rb

@@ -7,7 +7,7 @@ module TasksScheduler
     class Log
       class << self
         def logs_directory
-          @logs_directory ||= ::Rails.root.join('log', 'tasks_scheduler', 'checker')
+          @logs_directory ||= ::Rails.root.join('log/tasks_scheduler/checker')
         end
       end
 

data/lib/tasks_scheduler/checker.rb

@@ -16,7 +16,7 @@ module TasksScheduler
       Signal.trap('TERM') { running = false }
       while running
         Rails.logger.info('Checking all tasks...')
-        ::ScheduledTask.all.order(next_run: :asc).each(&:check)
+        ::ScheduledTask.order(next_run: :asc).each(&:check)
         Rails.logger.info("All tasks checked. Sleeping for #{CHECK_INTERVAL} second(s)...")
         sleep(CHECK_INTERVAL)
       end
@@ -31,7 +31,7 @@ module TasksScheduler
     end
 
     LOGS_KEYS.each do |log_key|
-      class_eval <<CODE, __FILE__, __LINE__ + 1
+      class_eval <<CODE, __FILE__, __LINE__ + 1 # rubocop:disable Style/DocumentDynamicEvalDefinition
       def #{log_key}_log
         @#{log_key}_log ||= ::TasksScheduler::Checker::Log.new('#{log_key}')
       end

data/lib/tasks_scheduler/cron_parser_patch.rb

@@ -26,6 +26,6 @@ module TasksScheduler
   end
 end
 
-unless ::CronParser.included_modules.include?(::TasksScheduler::CronParserPatch)
-  ::CronParser.include(::TasksScheduler::CronParserPatch)
+unless CronParser.included_modules.include?(TasksScheduler::CronParserPatch)
+  CronParser.include(TasksScheduler::CronParserPatch)
 end

data/lib/tasks_scheduler/cron_scheduling_validator.rb

@@ -5,8 +5,8 @@ module TasksScheduler
     def validate_each(record, attribute, value)
       return if value_valid?(value)
 
-      record.errors[attribute] << (options[:message] ||
-          I18n.t(:cron_scheduling_validator_error_message))
+      record.errors.add(attribute, (options[:message] ||
+          I18n.t(:cron_scheduling_validator_error_message)))
     end
 
     private

data/lib/tasks_scheduler/daemon.rb

@@ -11,7 +11,7 @@ module TasksScheduler
         raise "Action not allowed: #{action} (Allowed: #{ACTIONS})" unless ACTIONS.include?(action)
 
         ::TasksScheduler::AppGem.instance.bundle('exec', 'tasks_scheduler', action)
-                                .envvar(::TasksScheduler::Checker::LOG_ON_FILE_ENV_KEY, '1')
+          .envvar(::TasksScheduler::Checker::LOG_ON_FILE_ENV_KEY, '1')
       end
 
       def execute(action)

data/lib/tasks_scheduler/engine.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require 'eac_active_scaffold'
+require 'eac_active_scaffold/engine'
+require 'eac_rails_utils/engine'
+require 'eac_rails_utils/engine_helper'
 
 module TasksScheduler
   class Engine < ::Rails::Engine
-    initializer :append_migrations do |app|
-      config.paths['db/migrate'].expanded.each do |expanded_path|
-        app.config.paths['db/migrate'] << expanded_path
-      end
-    end
+    include ::EacRailsUtils::EngineHelper
   end
 end

data/lib/tasks_scheduler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2024-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '0.33'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.31.2
+        version: 0.33.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '0.33'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.31.2
+        version: 0.33.1
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
@@ -56,54 +56,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.23.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.23.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.121'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.119'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.119.2
+        version: '0.121'
 - !ruby/object:Gem::Dependency
   name: parse-cron
   requirement: !ruby/object:Gem::Requirement
@@ -124,34 +118,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.4
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.11
 - !ruby/object:Gem::Dependency
   name: eac_rails_gem_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 description: 
 email:
 - eduardobogoni@gmail.com
@@ -169,20 +155,19 @@ files:
 - app/assets/javascripts/tasks_scheduler/status.js
 - app/assets/stylesheets/tasks_scheduler.scss
 - app/assets/stylesheets/tasks_scheduler/alert.scss
+- app/controllers/scheduled_task_statuses_controller.rb
 - app/controllers/scheduled_tasks_controller.rb
 - app/controllers/tasks_scheduler_daemon_controller.rb
 - app/controllers/tasks_scheduler_daemon_controller/_download_log.rb
 - app/helpers/scheduled_tasks_helper.rb
-- app/helpers/tasks_scheduler_helper.rb
 - app/models/scheduled_task.rb
 - app/models/scheduled_task/checker.rb
 - app/models/scheduled_task/log.rb
 - app/models/scheduled_task/runner.rb
 - app/models/scheduled_task/status.rb
-- app/views/scheduled_tasks/list.html.erb
-- app/views/scheduled_tasks/log.html.erb
-- app/views/scheduled_tasks/status.html.erb
-- app/views/scheduled_tasks/status_content.html.erb
+- app/views/scheduled_task_statuses/index.html.erb
+- app/views/scheduled_task_statuses/log.html.erb
+- app/views/scheduled_task_statuses/status_content.html.erb
 - app/views/tasks_scheduler/_alert.html.erb
 - app/views/tasks_scheduler_daemon/_daemon.html.erb
 - app/views/tasks_scheduler_daemon/_logs.html.erb

data/app/helpers/tasks_scheduler_helper.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module TasksSchedulerHelper
-  def tasks_scheduler_navbar
-    tag.navbar do
-      safe_join(tasks_scheduler_navbar_entries.map { |label, path| link_to label, path }, ' | ')
-    end
-  end
-
-  def tasks_scheduler_navbar_entries
-    ::Rails.application.root_menu.sub(:admin).sub(:tasks_scheduler).children
-           .map { |child| [child.label, child.view_path(self)] }
-           .to_h
-  end
-end

data/app/views/scheduled_tasks/list.html.erb

@@ -1,2 +0,0 @@
-<%= tasks_scheduler_navbar %>
-<%=  render :super %>