tasks_scheduler 0.2.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 915771e99fb78f424271bf9798a843dc9b6d50a833e9f2eb365db7153aef49d6
-  data.tar.gz: 10d07c5e94787db667b2b1fef61eac50b38f49231ced05ed74b0d64da48fc365
+  metadata.gz: 9a16067c62acba647e2e5d6b0ba72aefd8e394766242c7aa7222cdc26efa515d
+  data.tar.gz: 15605017849c697fe146a8ac1ad69981846c5ebb1aa4b54fc8d0695d555f498c
 SHA512:
-  metadata.gz: f35278cce11927b9d0037f06299b20622226d83d5152931a23cd5e512007433d62a56075cf74038dd43a76f708f540ff3bbf2ded54e43c4d0a3b802776a1bf62
-  data.tar.gz: ba7764877691f6654b3c3cc66fdaaecb15d6a706b4a0fbc2bbcfd76fad1d3389d613d8383ee7da14a0f9b315fb234d9949cabba1bffd428aaa52121fcd94d113
+  metadata.gz: f850e1b47685482e850d93b61a49339fae6f508f25b042e960d8da8f9fb78f50b3d46f84acf8049db43b0a675de91485335f3f04df3575b9345f6fb58a652be0
+  data.tar.gz: d0d33e8ba43ca019a9f4ec70aeb614cfd53c3693f1f5b86c4cf705ef69a62e98ec9d90e11ec7654fc5573e8c61fbd2e943fc1571ec66d9877133823e7ff97022

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -14,7 +16,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 load 'rails/tasks/statistics.rake'

data/app/controllers/scheduled_tasks_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ScheduledTasksController < ApplicationController
   class << self
     private
@@ -8,7 +10,7 @@ class ScheduledTasksController < ApplicationController
   end
 
   active_scaffold :scheduled_task do |conf|
-    [:create, :update, :list].each do |action|
+    %i[create update list].each do |action|
       conf.send(action).columns.exclude(:next_run, :last_fail_status, :last_run_start,
                                         :last_run_successful_start, :last_run_unsuccessful_start,
                                         :last_run_successful_end, :last_run_unsuccessful_end,
@@ -26,8 +28,7 @@ class ScheduledTasksController < ApplicationController
     @log_file = record.log_file(params[:identifier])
   end
 
-  def status
-  end
+  def status; end
 
   def status_content
     @scheduled_tasks = ::ScheduledTask.order(task: :asc, scheduling: :asc)
@@ -36,7 +37,7 @@ class ScheduledTasksController < ApplicationController
 
   def run_now
     process_action_link_action do |record|
-      record.update_attributes!(next_run: Time.zone.now)
+      record.update!(next_run: Time.zone.now)
       record.reload
       flash[:info] = "Next run adjusted to #{record.next_run}"
     end

data/app/controllers/tasks_scheduler_daemon_controller.rb

@@ -1,6 +1,11 @@
+# frozen_string_literal: true
+
+require 'tasks_scheduler/checker'
+
 class TasksSchedulerDaemonController < ApplicationController
-  def index
-  end
+  require_relative 'tasks_scheduler_daemon_controller/_download_log'
+
+  def index; end
 
   def execute
     @result = ::TasksScheduler::Daemon.execute(params[:tasks_scheduler_execute_action])
@@ -9,26 +14,6 @@ class TasksSchedulerDaemonController < ApplicationController
 
   def status
     render json: { daemon_running: ::TasksScheduler::Daemon.running?,
-                   tasks_all_ok: !::ScheduledTask.all.any?(&:failed?) }
-  end
-
-  def download_log
-    if File.exist?(::TasksScheduler::Checker.instance.log_path)
-      send_log_file
-    else
-      redirect_to(tasks_scheduler_daemon_path,
-                  notice: "Arquivo \"#{::TasksScheduler::Checker.instance.log_path}\" não existe")
-    end
-  end
-
-  private
-
-  def send_log_file
-    send_file(
-      ::TasksScheduler::Checker.instance.log_path,
-      filename: "#{request.base_url.parameterize}_tasks-scheduler_checker-log_" \
-        "#{Time.zone.now.to_s.parameterize}.log",
-      type: 'text/plain'
-    )
+                   tasks_all_ok: ::ScheduledTask.all.none?(&:failed?) }
   end
 end

data/app/controllers/tasks_scheduler_daemon_controller/_download_log.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class TasksSchedulerDaemonController < ApplicationController
+  def download_log
+    return unless download_log_validate_log_key
+
+    log = ::TasksScheduler::Checker.instance.send("#{download_log_key}_log")
+    return unless download_log_validate_log_exist(log)
+
+    send_log_file(log)
+  end
+
+  private
+
+  def download_log_key
+    params[:log_key]
+  end
+
+  def download_log_validate_log_key
+    return true if ::TasksScheduler::Checker::LOGS_KEYS.include?(download_log_key)
+
+    redirect_to(tasks_scheduler_daemon_path,
+                notice: "Invalid log key: \"#{download_log_key}\"")
+    false
+  end
+
+  def download_log_validate_log_exist(log)
+    return true if log.exist?
+
+    redirect_to(tasks_scheduler_daemon_path, notice: "Log \"#{log.key}\" does not exist.")
+    false
+  end
+
+  def send_log_file(log)
+    send_file(
+      log.path,
+      filename: "#{request.base_url.parameterize}_tasks-scheduler_checker-log_" \
+        "#{Time.zone.now.to_s.parameterize}.log",
+      type: 'text/plain'
+    )
+  end
+end

data/app/helpers/scheduled_tasks_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ScheduledTasksHelper
   def scheduled_tasks_status_time(time)
     if time.present?

data/app/models/scheduled_task.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake'
 
 class ScheduledTask < ActiveRecord::Base
@@ -6,7 +8,7 @@ class ScheduledTask < ActiveRecord::Base
   include ::ScheduledTask::Runner
   include ::ScheduledTask::Status
 
-  DEFAULT_TIMEOUT_ENVVAR_NAME = 'TASKS_SCHEDULER_TIMEOUT'.freeze
+  DEFAULT_TIMEOUT_ENVVAR_NAME = 'TASKS_SCHEDULER_TIMEOUT'
   DEFAULT_TIMEOUT = 12.hours
 
   class << self
@@ -20,9 +22,9 @@ class ScheduledTask < ActiveRecord::Base
     def timeout
       @timeout ||= begin
         r = Integer(ENV[DEFAULT_TIMEOUT_ENVVAR_NAME])
-        r > 0 ? r.seconds : DEFAULT_TIMEOUT
-      rescue ArgumentError, TypeError
-        DEFAULT_TIMEOUT
+        r.positive? ? r.seconds : DEFAULT_TIMEOUT
+                   rescue ArgumentError, TypeError
+                     DEFAULT_TIMEOUT
       end
     end
   end
@@ -34,12 +36,14 @@ class ScheduledTask < ActiveRecord::Base
   STATUS_TIMEOUT = 'timeout'
   STATUS_DISABLED = 'disabled'
 
-  LAST_FAIL_STATUSES = [STATUS_FAILED, STATUS_ABORTED, STATUS_TIMEOUT]
+  LAST_FAIL_STATUSES = [STATUS_FAILED, STATUS_ABORTED, STATUS_TIMEOUT].freeze
 
   validates :scheduling, presence: true, 'tasks_scheduler/cron_scheduling': true
-  validates :task, presence: true, inclusion: { in: rake_tasks }
+  validates :task, presence: true
   validates :last_fail_status, allow_blank: true, inclusion: { in: LAST_FAIL_STATUSES }
 
+  validate :validate_task
+
   LOG_RUNNING = 'running'
   LOG_SUCCESSFUL = 'successful'
   LOG_UNSUCCESSFUL = 'unsuccessful'
@@ -67,13 +71,26 @@ class ScheduledTask < ActiveRecord::Base
 
   def process_running?
     return false if pid.nil?
+
     Process.kill(0, pid)
-    return true
+    true
   rescue Errno::EPERM
     raise "No permission to query #{pid}!"
   rescue Errno::ESRCH
-    return false
-  rescue
+    false
+  rescue StandardError
     raise "Unable to determine status for #{pid}"
   end
+
+  def task_exist?
+    self.class.rake_tasks.include?(task)
+  end
+
+  def validate_task
+    return if task.blank?
+    return unless task_changed?
+    return if self.class.rake_tasks.include?(task)
+
+    errors.add(:task, "Task \"#{task}\" not found")
+  end
 end

data/app/models/scheduled_task/checker.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'rake'
+require 'eac_ruby_utils/ruby'
 
 class ScheduledTask < ActiveRecord::Base
   module Checker
@@ -34,6 +37,7 @@ class ScheduledTask < ActiveRecord::Base
 
     def check_on_pid_not_present
       return unless enabled?
+
       if next_run.present?
         check_task_with_next_run
       else
@@ -55,12 +59,14 @@ class ScheduledTask < ActiveRecord::Base
 
     def check_task_without_next_run
       check_log('Next run blank')
-      update_attributes!(next_run: calculate_next_run)
+      update!(next_run: calculate_next_run)
       check_log("Next run scheduled: #{next_run.in_time_zone}")
     end
 
     def check_task_with_next_run
-      if next_run < Time.zone.now
+      if !task_exist?
+        check_log("Task does not exist: #{task}")
+      elsif next_run < Time.zone.now
         check_log('Next run reached. Running...')
         spawn_task
       else
@@ -70,13 +76,15 @@ class ScheduledTask < ActiveRecord::Base
 
     def spawn_task
       params = ['bundle', 'exec', 'tasks_scheduler_run_task', id.to_s]
-      check_log("Spawn command: #{params}")
+      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_attributes!(pid: spawn_pid, last_fail_status: nil)
+      update!(pid: spawn_pid, last_fail_status: nil)
     end
 
     def timeout?

data/app/models/scheduled_task/log.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 class ScheduledTask < ActiveRecord::Base
   module Log
     def log_file(identifier)
       unless log_identifiers.include?(identifier)
-        fail "Log identifier unknown: \"#{identifier}\" (Valid: #{log_identifiers})"
+        raise "Log identifier unknown: \"#{identifier}\" (Valid: #{log_identifiers})"
       end
+
       Rails.root.join('log', 'tasks_scheduler', "#{id}_#{identifier}.log")
     end
 
@@ -23,9 +26,12 @@ class ScheduledTask < ActiveRecord::Base
     end
 
     def log_on_end(exception)
+      running_log = log_file(LOG_RUNNING)
+      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)
-      File.rename(log_file(LOG_RUNNING), target_log)
+      File.rename(running_log, target_log)
     end
   end
 end

data/app/models/scheduled_task/runner.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 class ScheduledTask < ActiveRecord::Base
   module Runner
     def run
       log_on_start
       run_banner
       return if process_running? && pid != Process.pid
+
       status_on_start
       exception = invoke_task
       on_end_running(exception, STATUS_FAILED)
@@ -33,7 +36,7 @@ class ScheduledTask < ActiveRecord::Base
 
     def run_banner
       run_log("Task: #{self}")
-      run_log("PID: #{pid ? pid : '-'} (Current: #{Process.pid})")
+      run_log("PID: #{pid || '-'} (Current: #{Process.pid})")
       run_log("Process running? #{process_running? ? 'Yes' : 'No'}")
       run_log("Rails.env: #{Rails.env}")
     end
@@ -44,15 +47,16 @@ class ScheduledTask < ActiveRecord::Base
         Rake::Task.clear
         Rails.application.load_tasks
         Rake::Task[task].invoke(*invoke_args)
-      rescue StandardError => ex
-        run_log(ex, :fatal)
-        exception = ex
+      rescue StandardError => e
+        run_log(e, :fatal)
+        exception = e
       end
       exception
     end
 
     def invoke_args
-      return [] unless args.present?
+      return [] if args.blank?
+
       args.split('|')
     end
   end

data/app/models/scheduled_task/status.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 class ScheduledTask < ActiveRecord::Base
   module Status
     def status
       return STATUS_DISABLED unless enabled?
       return STATUS_RUNNING if running?
       return STATUS_WAITING if waiting?
-      last_fail_status.present? ? last_fail_status : STATUS_FAILED
+
+      last_fail_status.presence || STATUS_FAILED
     end
 
     def failed?
@@ -17,6 +20,7 @@ class ScheduledTask < ActiveRecord::Base
 
     def waiting?
       return true if ended?(last_run_successful_end, last_run_unsuccessful_end)
+
       status_attributes.all? { |a| send(a).blank? }
     end
 
@@ -27,11 +31,11 @@ class ScheduledTask < ActiveRecord::Base
     end
 
     def status_on_start
-      update_attributes!(last_run_start: Time.zone.now)
+      update!(last_run_start: Time.zone.now)
     end
 
     def status_on_end(exception, last_fail_status)
-      update_attributes!(
+      update!(
         next_run: calculate_next_run,
         (exception ? :last_run_unsuccessful_start : :last_run_successful_start) => last_run_start,
         (exception ? :last_run_unsuccessful_end : :last_run_successful_end) => Time.zone.now,
@@ -42,7 +46,7 @@ class ScheduledTask < ActiveRecord::Base
     end
 
     def status_attributes
-      %w(start successful_start successful_end unsuccessful_start unsuccessful_end).map do |a|
+      %w[start successful_start successful_end unsuccessful_start unsuccessful_end].map do |a|
         "last_run_#{a}"
       end
     end

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

@@ -2,6 +2,7 @@
   <strong>Last update: </strong>
   <%= I18n.l(Time.zone.now, format: :short) %>
   <br/>
+  <strong>Daemon status: </strong>
   <%= render partial: '/tasks_scheduler_daemon/running_status' %>
 </p>
 <table>

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

@@ -0,0 +1,11 @@
+<h3>Daemon</h3>
+<p>
+  <strong>Status: </strong>
+  <%= render partial: '/tasks_scheduler_daemon/running_status' %>
+  <br/>
+  <strong>Actions: </strong>
+  <%= safe_join(::TasksScheduler::Daemon::ACTIONS.map do |action|
+      link_to action, execute_tasks_scheduler_daemon_path(action), method: :post
+      end, ' | ') %>
+  <br/>
+</p>

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

@@ -0,0 +1,12 @@
+<h3>Logs</h3>
+<ul>
+  <% ::TasksScheduler::Checker.instance.logs.each do |log| %>
+    <li>
+      <% if log.exist? %>
+        <%= link_to log.key, download_log_tasks_scheduler_daemon_path(log.key) %>
+      <% else %>
+        <span style="color: grey" title='Log "<%= log.key %>" does not exist.'><%= log.key %></span>
+      <% end %>
+    </li>
+  <% end %>
+</ul>

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

@@ -0,0 +1,9 @@
+<% if @result %>
+  <h3>Results</h3>
+  <dl>
+    <% @result.each do |k, v| %>
+      <dt><%= k %></dt>
+      <dd><%= v.present? ? v : '-' %></dd>
+    <% end %>
+  </dl>
+<% end %>

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

@@ -1,4 +1,3 @@
-<strong>Daemon status: </strong>
 <% if TasksScheduler::Daemon.running? %>
   <span class="tasks_scheduler_daemon_status_up">UP</span>
 <% else %>

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

@@ -1,22 +1,5 @@
 <%= render partial: '/tasks_scheduler/navbar' %>
 <h2><%= I18n.t(:tasks_scheduler_daemon) %></h2>
-<p>
-  <%= render partial: '/tasks_scheduler_daemon/running_status' %>
-  <br/>
-  <strong>Actions: </strong>
-  <%= safe_join(::TasksScheduler::Daemon::ACTIONS.map do |action|
-      link_to action, execute_tasks_scheduler_daemon_path(action), method: :post
-    end, ' | ') %>
-  <br/>
-  <strong>Log: </strong>
-  <%= link_to 'download', download_log_tasks_scheduler_daemon_path %>
-</p>
-<% if @result %>
-  <h3>Results</h3>
-  <dl>
-    <% @result.each do |k, v| %>
-      <dt><%= k %></dt>
-      <dd><%= v.present? ? v : '-' %></dd>
-    <% end %>
-  </dl>
-<% end %>
+<%= render partial: 'daemon', locals: {status_label: 'Status:'} %>
+<%= render partial: 'logs' %>
+<%= render partial: 'results' %>

data/config/initializers/assets.rb

@@ -1 +1,3 @@
-Rails.application.config.assets.precompile += %w( active_scaffold/indicator.gif )
+# frozen_string_literal: true
+
+Rails.application.config.assets.precompile += %w[active_scaffold/indicator.gif]

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   resources(:scheduled_tasks) do
     as_routes
@@ -15,6 +17,6 @@ Rails.application.routes.draw do
        to: 'tasks_scheduler_daemon#execute', as: :execute_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
+  get '/tasks_scheduler_daemon/download_log/:log_key', to: 'tasks_scheduler_daemon#download_log',
+                                                       as: :download_log_tasks_scheduler_daemon
 end

data/db/migrate/20161122123828_create_scheduled_tasks.rb

@@ -1,4 +1,8 @@
-class CreateScheduledTasks < ActiveRecord::Migration
+# frozen_string_literal: true
+
+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,4 +1,8 @@
-class AddStatusAttributesToScheduledTasks < ActiveRecord::Migration
+# frozen_string_literal: true
+
+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,4 +1,8 @@
-class AddPidToScheduledTasks < ActiveRecord::Migration
+# frozen_string_literal: true
+
+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,4 +1,8 @@
-class AddArgsToScheduledTasks < ActiveRecord::Migration
+# frozen_string_literal: true
+
+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,4 +1,8 @@
-class AddLastFailStatusToScheduledTasks < ActiveRecord::Migration
+# frozen_string_literal: true
+
+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,4 +1,8 @@
-class AddEnabledToScheduledTasks < ActiveRecord::Migration
+# frozen_string_literal: true
+
+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/exe/tasks_scheduler

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'rubygems'
 require 'daemons'
 require 'fileutils'
 
 def find_rails_root(dir = Dir.pwd)
-  fail 'Rails root not found' if dir == '' || dir == '/' || dir == '.'
+  raise 'Rails root not found' if ['', '/', '.'].include?(dir)
   return dir if File.exist?(File.expand_path('config/environment.rb', dir))
+
   rails_root(File.dirname(dir))
 end
 
@@ -14,6 +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
-  require File.join(rails_root, 'config', 'environment')
-  ::TasksScheduler::Checker.instance.run
+  ::Dir.chdir(rails_root) do
+    require File.join(rails_root, 'config', 'environment')
+    ::TasksScheduler::Checker.instance.run
+  end
 end

data/exe/tasks_scheduler_run_task

@@ -1,11 +1,13 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'rubygems'
 require 'daemons'
 
 def find_rails_root(dir = Dir.pwd)
-  fail 'Rails root not found' if dir == '' || dir == '/' || dir == '.'
+  raise 'Rails root not found' if ['', '/', '.'].include?(dir)
   return dir if File.exist?(File.expand_path('config/environment.rb', dir))
+
   rails_root(File.dirname(dir))
 end
 

data/lib/tasks_scheduler.rb

@@ -1,11 +1,7 @@
-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'
+# frozen_string_literal: true
+
+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/checker.rb

@@ -1,9 +1,14 @@
+# frozen_string_literal: true
+
+require 'tasks_scheduler/checker/log'
+
 module TasksScheduler
   class Checker
     include Singleton
 
     CHECK_INTERVAL = 15
-    LOG_ON_FILE_ENV_KEY = 'TASKS_SCHEDULER_LOG_ON_FILE'.freeze
+    LOG_ON_FILE_ENV_KEY = 'TASKS_SCHEDULER_LOG_ON_FILE'
+    LOGS_KEYS = %w[rails stdout stderr].freeze
 
     def run
       check_log
@@ -18,15 +23,29 @@ module TasksScheduler
     end
 
     def log_path
-      ::Rails.root.join('log', 'tasks_scheduler', 'checker.log')
+      rais_log.path
+    end
+
+    def logs
+      LOGS_KEYS.map { |key| send("#{key}_log") }
+    end
+
+    LOGS_KEYS.each do |log_key|
+      class_eval <<CODE, __FILE__, __LINE__ + 1
+      def #{log_key}_log
+        @#{log_key}_log ||= ::TasksScheduler::Checker::Log.new('#{log_key}')
+      end
+CODE
     end
 
     private
 
     def check_log
       return unless log_on_file?
-      ::FileUtils.mkdir_p(File.dirname(log_path))
-      ::Rails.logger = ::Logger.new(log_path)
+
+      ::Rails.logger = ::Logger.new(rails_log.path)
+      $stdout.reopen(stdout_log.path, 'w')
+      $stderr.reopen(stderr_log.path, 'w')
     end
 
     def log_on_file?

data/lib/tasks_scheduler/checker/log.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module TasksScheduler
+  class Checker
+    class Log
+      class << self
+        def logs_directory
+          @logs_directory ||= ::Rails.root.join('log', 'tasks_scheduler', 'checker')
+        end
+      end
+
+      attr_reader :key
+
+      def initialize(key)
+        @key = key
+        ::FileUtils.mkdir_p(dirname)
+      end
+
+      def dirname
+        ::File.dirname(path)
+      end
+
+      def exist?
+        ::File.exist?(path)
+      end
+
+      def path
+        self.class.logs_directory.join("#{key}.log")
+      end
+    end
+  end
+end

data/lib/tasks_scheduler/cron_parser_patch.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
+require 'parse-cron'
+
 module TasksScheduler
   module CronParserPatch
     class TasksSchedulerTimeSource
       class << self
-        def local(year, month, day, hour, min, second)
+        def local(year, month, day, hour, min, second) # rubocop:disable Metrics/ParameterLists
           Time.utc(year, month, day, hour, min, second)
         end
 

data/lib/tasks_scheduler/cron_scheduling_validator.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module TasksScheduler
   class CronSchedulingValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
       return if value_valid?(value)
+
       record.errors[attribute] << (options[:message] ||
           I18n.translate(:cron_scheduling_validator_error_message))
     end

data/lib/tasks_scheduler/daemon.rb

@@ -1,28 +1,35 @@
-require 'open3'
+# frozen_string_literal: true
+
+require 'tasks_scheduler/app_gem'
 
 module TasksScheduler
   class Daemon
-    ACTIONS = %w(status start stop restart).freeze
+    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,3 +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,3 +1,5 @@
+# frozen_string_literal: true
+
 module TasksScheduler
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.4.2'
 end

data/test/dummy/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 
 Rails.application.load_tasks

data/test/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.

data/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module ApplicationHelper
 end

data/test/dummy/bin/bundle

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+# frozen_string_literal: true
+
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/test/dummy/bin/rails

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+# frozen_string_literal: true
+
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/test/dummy/bin/rake

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/test/dummy/bin/setup

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'pathname'
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = Pathname.new File.expand_path('..', __dir__)
 
 Dir.chdir APP_ROOT do
   # This script is a starting point to setup your application.

data/test/dummy/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment', __FILE__)

data/test/dummy/config/application.rb

@@ -1,4 +1,6 @@
-require File.expand_path('../boot', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('boot', __dir__)
 
 require 'rails/all'
 

data/test/dummy/config/boot.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/test/dummy/config/environment.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/test/dummy/config/environments/development.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/test/dummy/config/environments/production.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/test/dummy/config/environments/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/test/dummy/config/initializers/assets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.

data/test/dummy/config/initializers/backtrace_silencers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your

data/test/dummy/config/initializers/cookies_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.action_dispatch.cookies_serializer = :json

data/test/dummy/config/initializers/filter_parameter_logging.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.

data/test/dummy/config/initializers/inflections.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/test/dummy/config/initializers/mime_types.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

data/test/dummy/config/initializers/session_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, key: '_dummy_session'

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

data/test/dummy/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".

data/test/models/scheduled_task_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class ScheduledTaskTest < ActiveSupport::TestCase
@@ -6,9 +8,9 @@ class ScheduledTaskTest < ActiveSupport::TestCase
     '*/5 * * * *' => Time.utc(2016, 12, 22, 12, 5, 0, 0),
     '* * 1 * *' => Time.utc(2017, 1, 1, 0, 0, 0, 0),
     '* * * * *' => Time.utc(2016, 12, 22, 12, 1, 0, 0)
-  }
+  }.freeze
 
-  SCHEDULING_INVALID_VALUES = ['  ', nil, '1', 'abc123', 456]
+  SCHEDULING_INVALID_VALUES = ['  ', nil, '1', 'abc123', 456].freeze
 
   setup do
     @scheduled_task = scheduled_tasks(:test_scheduling)
@@ -57,7 +59,7 @@ class ScheduledTaskTest < ActiveSupport::TestCase
   end
 
   test 'status 1' do
-    @scheduled_task.update_attributes!(
+    @scheduled_task.update!(
       scheduling: '*/5 * * * *',
       next_run: 'Wed, 28 Feb 2018 15:35:00 UTC +00:00',
       created_at: 'Tue, 06 Dec 2016 20:30:01 UTC +00:00',
@@ -88,7 +90,7 @@ class ScheduledTaskTest < ActiveSupport::TestCase
     assert_equal ['abc'], @scheduled_task.send('invoke_args')
 
     @scheduled_task.args = 'abc|def|ghi'
-    assert_equal %w(abc def ghi), @scheduled_task.send('invoke_args')
+    assert_equal %w[abc def ghi], @scheduled_task.send('invoke_args')
 
     @scheduled_task.args = 'abc||ghi'
     assert_equal ['abc', '', 'ghi'], @scheduled_task.send('invoke_args')

data/test/test_helper.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # Configure Rails Environment
 ENV['RAILS_ENV'] = 'test'
 
-require File.expand_path('../../test/dummy/config/environment.rb', __FILE__)
+require File.expand_path('../test/dummy/config/environment.rb', __dir__)
 ActiveRecord::Migrator.migrations_paths = [
-  File.expand_path('../../test/dummy/db/migrate', __FILE__)
+  File.expand_path('../test/dummy/db/migrate', __dir__)
 ]
 require 'rails/test_help'
 
@@ -12,11 +14,11 @@ require 'rails/test_help'
 Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
 
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path('../fixtures', __FILE__)
+  ActiveSupport::TestCase.fixture_path = File.expand_path('fixtures', __dir__)
   ActiveSupport::TestCase.fixtures :all
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.2
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -38,6 +38,26 @@ 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: js-routes
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +90,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: '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: 4.2.1
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +151,7 @@ files:
 - app/assets/stylesheets/tasks_scheduler/alert.scss
 - 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/models/scheduled_task.rb
 - app/models/scheduled_task/checker.rb
@@ -123,6 +164,9 @@ files:
 - 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/_daemon.html.erb
+- app/views/tasks_scheduler_daemon/_logs.html.erb
+- app/views/tasks_scheduler_daemon/_results.html.erb
 - app/views/tasks_scheduler_daemon/_running_status.html.erb
 - app/views/tasks_scheduler_daemon/index.html.erb
 - config/initializers/assets.rb
@@ -138,7 +182,9 @@ 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
 - lib/tasks_scheduler/cron_scheduling_validator.rb
 - lib/tasks_scheduler/daemon.rb
@@ -201,8 +247,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.6
 signing_key: 
 specification_version: 4
 summary: Scheduler for Rake tasks.