tasks_scheduler 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a70b94478839b7ac1a8f9291cb3ac0c5b455663b
-  data.tar.gz: 1a746df6b834d8e98f7d0fd26de5cce4ac1f8e84
+  metadata.gz: 4d55cf267a17b9745518a4c84e1cfc2aef077840
+  data.tar.gz: c76a8903f97bff753eec0794c1d51d2305501843
 SHA512:
-  metadata.gz: 58c6534bfbf6511f0a739b5613f5c46fa188967c2a48320b0aefc9723862beb4b7ad96d1e8f52072e09bd70f971e32759b0b394a50fd783f686da200fb8b6903
-  data.tar.gz: 828f3fb5cec16661ba84d3fb3097407577abb4f89f8d8e82f247ed08498d905b0a554acdb48355762701f0475448ab0278cd6fed742eb664ace55f9fc30a7551
+  metadata.gz: 915274287591f4c7fc5dc286c18e9c9b085d3b15b33d8d9fe3f1571a02028a4f31d6ce3e406de66c2eb79b5cf7a49b90d34ad83e3f59d45a9c049e7e6faae638
+  data.tar.gz: d3495bd1fbe9de29057e14f7f2aae07ddfc116f9e292ff752c60b51235131671f51c361bfd43bb4d840516c3d89826bd1672710593604ff3db6e1fbf170cbb14

data/app/assets/javascripts/tasks_scheduler.js

@@ -57,3 +57,47 @@ _S.update = function () {
     }
   });
 };
+
+TasksScheduler.Alert = function () {
+};
+
+_A = TasksScheduler.Alert;
+
+_A.DEFAULT_REFRESH_INTERVAL = 60000;
+_A.DEFAULT_ELEMENT_SELECTOR = '#tasks_scheduler_alert';
+_A.url = null;
+
+_A.init = function (url, options = {}) {
+  $(document).ready(function () {
+    _A.url = url;
+    _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);
+      if (result === 'true') {
+        alert.hide();
+      } else {
+        alert.show();
+      }
+    },
+    complete: function (result) {
+      _A.setNextRefresh();
+    }
+  });
+};

data/app/assets/stylesheets/tasks_scheduler.scss

@@ -32,3 +32,11 @@
     font-weight: bold;
   }
 }
+
+.tasks_scheduler_daemon_status_down {
+  color: red;
+}
+
+.tasks_scheduler_daemon_status_up {
+  color: blue;
+}

data/app/controllers/scheduled_tasks_controller.rb

@@ -17,7 +17,6 @@ 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 :status, label: I18n.t(:tasks_scheduler_status), position: true
     conf.action_links.add :run_now, label: I18n.t(:run_now), type: :member,
                                     crud_type: :update, method: :put, position: false
   end

data/app/controllers/tasks_scheduler_daemon_controller.rb

@@ -0,0 +1,13 @@
+class TasksSchedulerDaemonController < ApplicationController
+  def index
+  end
+
+  def execute
+    @result = ::TasksScheduler::Daemon.execute(params[:tasks_scheduler_execute_action])
+    render 'index'
+  end
+
+  def running
+    render plain: (::TasksScheduler::Daemon.running? ? 'true' : 'false'), layout: false
+  end
+end

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

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

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

@@ -1,3 +1,5 @@
+<%= render partial: '/tasks_scheduler/navbar' %>
+<h2><%=  I18n.t(:tasks_scheduler_status) %></h2>
 <div id="TaskScheduler_Status_Status">
 </div>
 <div id="TaskScheduler_Status_Content">

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

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

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

@@ -0,0 +1,5 @@
+<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>

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

@@ -0,0 +1,6 @@
+<strong>Daemon status: </strong>
+<% if TasksScheduler::Daemon.running? %>
+  <span class="tasks_scheduler_daemon_status_up">UP</span>
+<% else %>
+  <span class="tasks_scheduler_daemon_status_down">DOWN</span>
+<% end %>

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

@@ -0,0 +1,19 @@
+<%= 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, ' | ') %>
+</p>
+<% if @result %>
+  <h3>Results</h3>
+  <dl>
+    <% @result.each do |k, v| %>
+      <dt><%= k %></dt>
+      <dd><%= v.present? ? v : '-' %></dd>
+    <% end %>
+  </dl>
+<% end %>

data/config/locales/en.yml

@@ -1,4 +1,4 @@
-en:  
+en:
   activerecord:
     models:
       scheduled_task:
@@ -19,4 +19,6 @@ en:
   log: Log
   run_now: Run now
   start: Start
+  scheduled_tasks: Scheduled tasks - Edit
+  tasks_scheduler_daemon: Scheduled tasks - Daemon
   tasks_scheduler_status: Scheduled tasks - Status

data/config/locales/pt-BR.yml

@@ -1,4 +1,4 @@
-pt-BR:  
+pt-BR:
   activerecord:
     models:
       scheduled_task:
@@ -19,4 +19,6 @@ pt-BR:
   log: Log
   run_now: Executar agora
   start: Início
+  scheduled_tasks: Tarefas agendadas - Edição
+  tasks_scheduler_daemon: Tarefas agendadas - Daemon
   tasks_scheduler_status: Tarefas agendadas - Status

data/config/routes.rb

@@ -10,4 +10,9 @@ Rails.application.routes.draw do
       put :run_now
     end
   end
+  get '/tasks_scheduler_daemon', to: 'tasks_scheduler_daemon#index', as: :tasks_scheduler_daemon
+  post '/tasks_scheduler_daemon/:tasks_scheduler_execute_action',
+       to: 'tasks_scheduler_daemon#execute', as: :execute_tasks_scheduler_daemon
+  get '/tasks_scheduler_daemon/running', to: 'tasks_scheduler_daemon#running',
+                                         as: :running_tasks_scheduler_daemon
 end

data/lib/tasks_scheduler.rb

@@ -4,6 +4,7 @@ require 'parse-cron'
 require 'tasks_scheduler/cron_scheduling_validator'
 require 'tasks_scheduler/cron_parser_patch'
 require 'tasks_scheduler/checker'
+require 'tasks_scheduler/daemon'
 
 module TasksScheduler
 end

data/lib/tasks_scheduler/daemon.rb

@@ -0,0 +1,33 @@
+require 'open3'
+
+module TasksScheduler
+  class Daemon
+    ACTIONS = %w(status start stop restart).freeze
+
+    class << self
+      def run(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
+        end
+      end
+
+      def execute(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(*command) do |_stdin, stdout, stderr, wait_thr|
+            { action: action, command: command.join(' '), status: wait_thr.value.to_i,
+              stdout: stdout.read, stderr: stderr.read }
+          end
+        end
+      end
+
+      def running?
+        execute('status')[:status].zero?
+      end
+    end
+  end
+end

data/lib/tasks_scheduler/version.rb

@@ -1,3 +1,3 @@
 module TasksScheduler
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'.freeze
 end

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,14 +1,12 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
+  <head>
+    <title>Dummy</title>
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
 </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -95,15 +95,20 @@ files:
 - app/assets/javascripts/tasks_scheduler.js
 - app/assets/stylesheets/tasks_scheduler.scss
 - app/controllers/scheduled_tasks_controller.rb
+- app/controllers/tasks_scheduler_daemon_controller.rb
 - app/helpers/scheduled_tasks_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/tasks_scheduler/_navbar.html.erb
+- app/views/tasks_scheduler_daemon/_running_status.html.erb
+- app/views/tasks_scheduler_daemon/index.html.erb
 - config/initializers/assets.rb
 - config/locales/en.yml
 - config/locales/pt-BR.yml
@@ -118,6 +123,7 @@ files:
 - lib/tasks_scheduler/checker.rb
 - lib/tasks_scheduler/cron_parser_patch.rb
 - lib/tasks_scheduler/cron_scheduling_validator.rb
+- lib/tasks_scheduler/daemon.rb
 - lib/tasks_scheduler/engine.rb
 - lib/tasks_scheduler/version.rb
 - test/dummy/README.rdoc