tasks_scheduler 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6573b654529a255fe7a822f33662837da3915a7b9a98cdc6e071c19d3143c955
-  data.tar.gz: 3409022b969859d61f236ed5ddbf1678105ef35bd2cd971d5a172c56c43822b5
+  metadata.gz: ca18aa2d0f8df454ae40c0d0c16f2fdc1e9d5694c79f099ceaf03c4192a7f7d1
+  data.tar.gz: fbb04491343b8c7c93520502241775fb6887420851a91b81b6870caaa1d43b6c
 SHA512:
-  metadata.gz: e93580d187fd4e4ff62faf5ee5b5b0b5ea70b13b11f86f38779327f2bb06f329e46089b3add379cc734a06fd666c7a9edc40156939abc8ffadeb655bd43c6f22
-  data.tar.gz: cf55f3658eb3df0c1527a219b67a03ce401af2ce22dde55e49b90184b4c4019c21bd2ab0fc3e3a7741cf6a70e4f2ca8c8a8ec6578b3d304bf6efb62ee5c4c079
+  metadata.gz: cee3492bc93d12703e4836a065426618b7dcbc6cd94d61dd0572577e72f7a7e3825088f6a5c091057c21b5c603d2c98017d1b6fce05bd51214c3d029f159da1e
+  data.tar.gz: f7cd9ac0378b729a54430b814aae529561678471875e3a2d2965a9d3d4aee7d3371940f966b2931cae4fecb33d3f27824ac9172ef7360896758ef1b325a26e1c

data/app/models/scheduled_task/checker.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rake'
+require 'eac_ruby_utils/ruby'
 
 class ScheduledTask < ActiveRecord::Base
   module Checker
@@ -77,8 +78,10 @@ class ScheduledTask < ActiveRecord::Base
       params = ['bundle', 'exec', 'tasks_scheduler_run_task', id.to_s]
       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!(pid: spawn_pid, last_fail_status: nil)

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'parse-cron'
+
 module TasksScheduler
   module CronParserPatch
     class TasksSchedulerTimeSource

data/lib/tasks_scheduler/daemon.rb

@@ -1,31 +1,35 @@
 # frozen_string_literal: true
 
-require 'open3'
+require 'tasks_scheduler/app_gem'
 
 module TasksScheduler
   class Daemon
     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,5 +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,5 +1,5 @@
 # frozen_string_literal: true
 
 module TasksScheduler
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/tasks_scheduler.rb

@@ -1,13 +1,7 @@
 # frozen_string_literal: true
 
-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'
+require 'eac_ruby_utils/require_sub'
 
 module TasksScheduler
+  ::EacRubyUtils.require_sub __FILE__
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasks_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-05-23 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
@@ -80,6 +100,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.1
+- !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: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +182,7 @@ 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