tasks_scheduler 0.5.2 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1990d0ec938668f01704d530a1797027f84ae24771f22ec716051176032039d9
-  data.tar.gz: 66bab115b2e5fa8f0aeb837ff9549b5a3779fbd9637733521f5f4800239d9fcb
+  metadata.gz: 7c175f5d68102231223e0d0b132c1d8ee5e36e73d39c9fa8750ca6b68aff0d57
+  data.tar.gz: b83338a7c27496daff792fa9ae20f2c1388315c976751aa99ee87d39353ae096
 SHA512:
-  metadata.gz: bc08c8c498e0179d205f23bf6b7107e4f9db245857bcce37a0956ad73d14ef45d7ff0300a9140dc25e9976c7636c4f442a7a8af374bf84a4cb7d8c89fe988b1d
-  data.tar.gz: af0434d46a4ef3fecc00d177132f0cd2a7b1717853113ec0327c3d798fc1a24f1b7e55f3daa1e511aa31e1754deae4fc7af37393826d624834bf90d30eb3b242
+  metadata.gz: b979e6bf097cfdb701ff8655f628fa69001a5fcf4523b4ebd8b8ae975447a400fa1c504b449b9aa73ff61d0009e2d9c5efc800579c9a10676ff8d0f12eef2fb5
+  data.tar.gz: 0046c58bf789375875cfa22810ca1bf6262c68c492b374f04688e674191aaea30f68cd7d5da3b14b764c9c2c3fd534188447dd9c8f64fbb6c4fb2448e96d6fa4

data/app/helpers/tasks_scheduler_helper.rb

@@ -0,0 +1,21 @@
+# 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
+    content_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/models/scheduled_task/checker.rb

@@ -61,6 +61,8 @@ class ScheduledTask < ActiveRecord::Base
       check_log("Running? #{process_running?}")
       check_log("Last fail status: #{last_fail_status}")
       check_log("Enabled: #{enabled?}")
+      check_log("Tasks running: #{::TasksScheduler::Info.tasks_running_current}/" +
+        ::TasksScheduler::Info.tasks_running_limit.to_s)
     end
 
     def check_task_without_next_run
@@ -72,11 +74,13 @@ class ScheduledTask < ActiveRecord::Base
     def check_task_with_next_run
       if !task_exist?
         check_on_task_not_exist
-      elsif next_run < Time.zone.now
+      elsif next_run >= Time.zone.now
+        check_log('Next run not reached')
+      elsif !::TasksScheduler::Info.can_run_new_task?
+        check_log('Running tasks limit reached. Waiting...')
+      else
         check_log('Next run reached. Running...')
         spawn_task
-      else
-        check_log('Next run not reached')
       end
     end
 

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

@@ -1,2 +1,2 @@
-<%= render partial: '/tasks_scheduler/navbar' %>
+<%= tasks_scheduler_navbar %>
 <%=  render :super %>

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

@@ -1,3 +1,4 @@
+<%= 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,4 @@
-<%= render partial: '/tasks_scheduler/navbar' %>
+<%= tasks_scheduler_navbar %>
 <h2><%=  I18n.t(:tasks_scheduler_status) %></h2>
 <div id="TaskScheduler_Status_Status">
 </div>

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

@@ -4,6 +4,10 @@
   <br/>
   <strong>Daemon status: </strong>
   <%= render partial: '/tasks_scheduler_daemon/running_status' %>
+  <br/>
+  <strong>Tasks running/limit: </strong>
+  <%= ::TasksScheduler::Info.tasks_running_current %> /
+  <%= ::TasksScheduler::Info.tasks_running_limit %>
 </p>
 <table>
   <thead>

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

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

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

@@ -16,7 +16,7 @@ module TasksScheduler
       Signal.trap('TERM') { running = false }
       while running
         Rails.logger.info('Checking all tasks...')
-        ::ScheduledTask.all.each(&:check)
+        ::ScheduledTask.all.order(next_run: :asc).each(&:check)
         Rails.logger.info("All tasks checked. Sleeping for #{CHECK_INTERVAL} second(s)...")
         sleep(CHECK_INTERVAL)
       end

data/lib/tasks_scheduler/info.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module TasksScheduler
+  class Info
+    TASKS_LIMIT_KEY = 'TASKS_SCHEDULER_TASKS_LIMIT'
+    TASKS_LIMIT_DEFAULT_VALUE = '-1'
+
+    class << self
+      def can_run_new_task?
+        return true if tasks_running_limit.negative?
+
+        tasks_running_current < tasks_running_limit
+      end
+
+      def tasks_running_current
+        ::ScheduledTask.all.select(&:process_running?).count
+      end
+
+      def tasks_running_limit
+        ENV[TASKS_LIMIT_KEY].if_present(TASKS_LIMIT_DEFAULT_VALUE, &:to_i)
+      end
+    end
+  end
+end

data/lib/tasks_scheduler/version.rb

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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.2
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -64,28 +64,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.56'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.56.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.56'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.56.1
 - !ruby/object:Gem::Dependency
   name: js-routes
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.14
 - !ruby/object:Gem::Dependency
   name: parse-cron
   requirement: !ruby/object:Gem::Requirement
@@ -106,34 +118,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 4.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.11.3
+        version: 4.2.11
 - !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
+        version: '0.2'
   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
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +175,7 @@ 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
@@ -179,7 +186,6 @@ files:
 - app/views/scheduled_tasks/status.html.erb
 - 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
@@ -205,9 +211,11 @@ files:
 - lib/tasks_scheduler/cron_scheduling_validator.rb
 - lib/tasks_scheduler/daemon.rb
 - lib/tasks_scheduler/engine.rb
+- lib/tasks_scheduler/info.rb
 - 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
@@ -263,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Scheduler for Rake tasks.
@@ -293,6 +301,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

data/app/views/tasks_scheduler/_navbar.html.erb

@@ -1,5 +0,0 @@
-<navbar>
-  <%= link_to I18n.t(:tasks_scheduler_daemon), tasks_scheduler_daemon_path  %> |
-  <%= link_to I18n.t(:scheduled_tasks), scheduled_tasks_path  %> |
-  <%= link_to I18n.t(:tasks_scheduler_status), status_scheduled_tasks_path  %>
-</navbar>