schedulero 0.1.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68ae0fbd4f3eb868a50f64ca330706a1acf29a71d42aa2eb89d6232abbf36c60
-  data.tar.gz: 223117c9bec29af59fda35bb8d64b9286216192d153da5a598d4283b945e22a2
+  metadata.gz: 2cfd26c98933e9a712a4352b8bae35e58e352389584db91bea451744d2b1ecb2
+  data.tar.gz: 8f3781c8e20b9b054711de0f22531e047807565d21749ad94c69597f7b7df0e3
 SHA512:
-  metadata.gz: 91dd146dd80f9d06f77395cb23f67925b671cec1f3df7eb1519bfaf6bcf45ac0865fb3013d289ee749b3485a5a1e724d5f693c970b6f03a62989b6e9af2d8ce6
-  data.tar.gz: 30762af755ba57d8d3c8b2362f743b9c283ebccba80514cfd77da1ecad69aad1511003039d61bb7c62081c4e94606e6130bceff75c556073dcd77cc461cfad62
+  metadata.gz: dcf894b27957183ccdeb7d2ca2a37902cfbe7a5093e5ecd752adc599e14e46ad13da55f66f0ffcef194d754ed01e43cb9d214f778528f48376830bf840b8584b
+  data.tar.gz: 1e0d99eb6a9cafc56b40a7b88ceb479900f9e1aee3ac29cc487bbc2bf4062dc376d625c4a5a4cd6c9917886748f1945dd70659e4978597ba773d45fee8b8c94f

data/.version

@@ -1 +1 @@
-0.1.1
+0.2.3

data/lib/schedulero.rb

@@ -3,110 +3,159 @@ require 'json'
 require 'logger'
 require 'colorize'
 require 'as-duration'
+require 'pp'
+
+require_relative './utils'
 
 class Schedulero
+  include Schedulero::Utils
+
+  attr_reader :tasks, :logger
+
   def initialize state_file: nil, log_file: true
+    init_log   log_file
+    init_state state_file
 
+    @tasks   = {}
+    @running = {}
+    @count   = 0
+  end
+
+  def init_state state_file
+    # state file
+    state_file ||= "./tmp/schedulero.json"
+    puts 'State file: %s' % state_file
+
+    @state_file = Pathname.new state_file
+    @state_file.write '{}' unless @state_file.exist?
+  end
+
+  def init_log log_file
     # log file
     log_file = case log_file
       when String
         log_file
-      when true
-        './log/schedulero.log'
       when false
         nil
+      else
+        "./log/schedulero.log'"
     end
 
-    @logger = Logger.new log_file
-    @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+    puts 'Log file  : %s' % log_file
 
-    # state file
-    unless state_file
-      state_file = 'schedulero.json'
-      state_file = Dir.exists?('./tmp') ? "./tmp/#{state_file}" : state_file
-    end
-
-    @state_file = Pathname.new state_file
-
-    if @state_file.exist?
-      @state = JSON.load @state_file.read
-    else
-      @state = {}
+    @logger = Logger.new log_file
+    @logger.formatter = proc do |severity, datetime, progname, msg|
+      severity = severity == 'INFO' ? '' : "(#{severity}) "
+      "[#{datetime.strftime('%Y-%m-%d %H:%M:%S')}]: #{severity}#{msg}\n"
     end
   end
 
-  def run &block
-    @logger.info 'running...'
-
-    instance_exec &block
+  # add task
+  def every name, seconds, proc=nil, &block
+    proc ||= block
+    @tasks[name] = { interval: seconds , func: proc, name: name }
+  end
 
-    @state_file.write @state.to_json
+  # run task at specific hours
+  def at name, hours, proc=nil, &block
+    proc ||= block
+    @tasks[name] = { at: hours , func: proc, name: name }
   end
 
-  def every name, seconds, &block
-    @state[name] ||= 0
+  def run_forever interval: 3
+    Thread.new do
+      loop do
+        puts 'looping ...'
+        run
+        sleep interval
+      end
+    end
+  end
 
-    now   = Time.now.to_i
-    diff  = (@state[name] + seconds.to_i) - now
+  # run all tasks once, safe
+  def run
+    state = JSON.load @state_file.read
 
-    if diff < 0
-      puts 'running "%s"' % name.green
+    state['_pid']      ||= Process.pid
+    state['_last_run'] ||= Time.now.to_i
+    diff = Time.now.to_i - state['_last_run']
 
-      @state[name] = now
+    # if another process is controlling state, exit
+    if state['_pid'] != Process.pid && diff < 10
+      puts "Another process [#{state['_pid']}] is controlling state before #{diff} sec, skipping. I am (#{Process.pid})".red
+      return
+    end
 
-      begin
-        @logger.info 'Run: %s' % name
-        yield
-      rescue
-        log_errror name
+    for name, block in @tasks
+      state[name] ||= 0
+      now           = Time.now.to_i
+
+      if block[:at]
+        # run at specific times
+        hour_now = Time.now.hour
+        hours    = block[:at].class == Array ? block[:at] : [block[:at]]
+
+        if hours.include?(hour_now) && (Time.now.to_i - state[name] > 3700)
+          state[name] = now
+          safe_run block
+        end
+      else
+        # run in intervals
+        seconds = block[:interval]
+        diff    = (state[name].to_i + seconds.to_i) - now
+
+        if diff < 0
+          state[name] = now
+          safe_run block
+        else
+          puts 'skipping "%s" for %s' % [name, humanize_seconds(diff)]
+        end
       end
-    else
-      puts 'skipping "%s" for %s' % [name, humanize_seconds(diff)]
     end
+
+    state['_last_run'] = Time.now.to_i
+    state['_pid']      = Process.pid
+
+    @state_file.write state.to_json
   end
 
-  def at name, hours, &block
-    @state[name] ||= 0
+  # run in rescue mode, kill if still running
+  def safe_run block
+    name = block[:name]
 
-    hour_now = Time.now.hour
-    hours    = [hours] unless hours.class == Array
+    puts 'Running "%s"' % name.green
+    @logger.info 'Run: %s' % name
 
-    if hours.include?(hour_now) && (Time.now.to_i - @state[name] > 3700)
-      puts 'running "%s"' % name.green
+    if block[:running]
+      log_errror "Task [#{block[:name]}] is still running, killing..."
+      Thread.kill(block[:running])
+    end
 
-      @state[name] = Time.now.to_i
+    thread = Thread.start(block) do |b|
+      block[:running] = thread
 
       begin
-        @logger.info 'Run: %s' % name
-        yield
+        @count += 1
+        b[:func].call @count
       rescue
-        log_errror name
+        log_errror b[:name]
       end
-    else
-      puts 'skipping "%s" at %d, running in %s' % [name, hour_now, hours]
+
+      b[:running] = false
     end
   end
 
+  # show and log error
   def log_errror name
-    msg  = '%s: %s (%s)' % [name, $!.message, $!.class]
-    puts msg.red
+    msg  = if $!
+      '%s: %s (%s)' % [name, $!.message, $!.class]
+    else
+      name
+    end
 
-    Dir.mkdir('./log') unless Dir.exist?('./log')
+    puts msg.red
 
     @logger.error(msg)
   end
-
-  def humanize_seconds secs
-    return '-' unless secs
-
-    secs = secs.to_i
-
-    [[60, :sec], [60, :min], [24, :h], [356, :days], [1000, :years]].map{ |count, name|
-      if secs > 0
-        secs, n = secs.divmod(count)
-        "#{n.to_i} #{name}"
-      end
-    }.compact.reverse.slice(0,2).join(' ')
-  end
 end
 

data/lib/utils.rb

@@ -0,0 +1,30 @@
+class Schedulero
+  module Utils
+    def humanize_seconds secs
+      return '-' unless secs
+
+      secs = secs.to_i
+
+      [[60, :sec], [60, :min], [24, :h], [356, :days], [1000, :years]].map{ |count, name|
+        if secs > 0
+          secs, n = secs.divmod(count)
+          "#{n.to_i} #{name}"
+        end
+      }.compact.reverse.slice(0,2).join(' ')
+    end
+
+    def quick_overview lines: 100
+      data = ['Tasks:']
+
+      for name, task in tasks
+        data.push '- %s, every %s' % [name, humanize_seconds(task[:interval])]
+      end
+
+      data.push ['','###', '']
+
+      data.push `tail -#{lines} ./log/schedulero.log`.split($/).reverse
+
+      data.join($/)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schedulero
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: as-duration
@@ -46,6 +46,7 @@ extra_rdoc_files: []
 files:
 - "./.version"
 - "./lib/schedulero.rb"
+- "./lib/utils.rb"
 homepage: https://github.com/dux/schedulero
 licenses:
 - MIT