tasks_scheduler 0.6.13 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c54c9a9dba7d2601023944efb038902f7bd7d9f30a2eb922f10fa6575eb8e18
-  data.tar.gz: 90b2bf8cf961dc20a175fcc064c04583a4eb5288af5779d7246c5c26d94ef986
+  metadata.gz: 8ac4a6905744856629c046c2cbca58290b37c32c1da3f4ef7558927247893ec2
+  data.tar.gz: 1cab19fa0a8be070731efa12f59c2d76cd1a293851b2d132324a60bf1c7d9fa0
 SHA512:
-  metadata.gz: 8c6019296c5122948ae4f3f315e09fbb1da0527f76efc4fe05ffee4b89d1b60343b40c07795dda781ec30b61472215d3617e9f025f89c0a84707f73b547caf76
-  data.tar.gz: 1c81e0019f50de3946129f858b6a146d0eed057bac8f00d67f8aa7835119442e202f79bdb5a7593fbec82797904ca44bc1a1d6b1bd6f119498ca0e483720c492
+  metadata.gz: 5028f905d36a4239fdcd137cc8fde66b2af61da61008871983a4f4bd0923063d904e1ece4f033037bbf29c697a7ce2a1ef44fd83b7f1e78125c590801408377f
+  data.tar.gz: 249dd1417fc904f03c6ae6a81fe17c8a7d6afb941c1ed09924ecfc71e926cc0e679f287d02bf62b7062279059bcc0915f263624320ffdec2deb67a1c01ea3c75

data/app/controllers/scheduled_tasks_controller.rb

@@ -39,7 +39,7 @@ class ScheduledTasksController < ApplicationController
     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
 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,7 +22,7 @@ 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

data/app/views/scheduled_tasks/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/scheduled_tasks/status.html.erb

@@ -1,4 +1,3 @@
-<%= tasks_scheduler_navbar %>
 <h2><%=  I18n.t(:tasks_scheduler_status) %></h2>
 <div id="TaskScheduler_Status_Status">
 </div>

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_rails_utils/patches/application'
+
+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
+end

data/config/locales/en.yml

@@ -4,6 +4,15 @@ en:
       scheduled_task:
         one: Scheduled task
         other: Scheduled tasks
+  eac_rails_utils:
+    menus:
+      root:
+        admin:
+          tasks_scheduler:
+            __self: Tasks scheduler
+            main_app_tasks_scheduler_daemon: Daemon
+            main_app_scheduled_tasks: Tasks
+            main_app_status_scheduled_tasks: Status
   helpers:
       label:
         scheduled_task:

data/config/locales/pt-BR.yml

@@ -4,6 +4,15 @@ pt-BR:
       scheduled_task:
         one: Tarefa agendada
         other: Tarefas agendadas
+  eac_rails_utils:
+    menus:
+      root:
+        admin:
+          tasks_scheduler:
+            __self: 'Agendador de tarefas'
+            main_app_tasks_scheduler_daemon: Daemon
+            main_app_scheduled_tasks: Tarefas
+            main_app_status_scheduled_tasks: Situação
   helpers:
       label:
         scheduled_task:

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/engine.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 require 'eac_active_scaffold'
+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.6.13'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.8.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
@@ -76,14 +76,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -144,20 +144,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.8.0
 description: 
 email:
 - eduardobogoni@gmail.com
@@ -179,13 +173,11 @@ files:
 - 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
@@ -196,6 +188,7 @@ files:
 - app/views/tasks_scheduler_daemon/_running_status.html.erb
 - app/views/tasks_scheduler_daemon/index.html.erb
 - config/initializers/assets.rb
+- config/initializers/menus.rb
 - config/locales/en.yml
 - config/locales/pt-BR.yml
 - config/routes.rb

data/app/helpers/tasks_scheduler_helper.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module TasksSchedulerHelper
-  NAVBAR_ENTRIES = {
-    tasks_scheduler_daemon: 'tasks_scheduler_daemon',
-    scheduled_tasks: 'scheduled_tasks',
-    tasks_scheduler_status: :status_scheduled_tasks
-  }.freeze
-
-  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
-    NAVBAR_ENTRIES
-      .map { |i18n_key, path_name| [::I18n.t(i18n_key), send("#{path_name}_path")] }
-      .to_h
-  end
-end

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

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