schedulero 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cfd26c98933e9a712a4352b8bae35e58e352389584db91bea451744d2b1ecb2
-  data.tar.gz: 8f3781c8e20b9b054711de0f22531e047807565d21749ad94c69597f7b7df0e3
+  metadata.gz: 6d6f7879580da96f7997b9370e2fbb89eb00953cf95d3a7ad8f780424441270a
+  data.tar.gz: 22b56bd19dacf0bc0555c9168d07e807bac3c44694038e561d701e9e23fc19bb
 SHA512:
-  metadata.gz: dcf894b27957183ccdeb7d2ca2a37902cfbe7a5093e5ecd752adc599e14e46ad13da55f66f0ffcef194d754ed01e43cb9d214f778528f48376830bf840b8584b
-  data.tar.gz: 1e0d99eb6a9cafc56b40a7b88ceb479900f9e1aee3ac29cc487bbc2bf4062dc376d625c4a5a4cd6c9917886748f1945dd70659e4978597ba773d45fee8b8c94f
+  metadata.gz: 8abbd6fe761c7a6e9ea3786286e1cc86eab651dd57accfaa9bf0910c7d17a3a55d748553e841aff1141a83f8d7c6f83b40fc86e4f4c66f5deae46027d5bf97a4
+  data.tar.gz: 92abd0841e476cc83076dd833ab547392f9fe4e109842723451f3e702cf0d2a28e593dcaf0f96b4e820c60e7a8a048e70b58ebab0b1ed37bdddd8fc73045e128

data/.version

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/schedulero.rb

@@ -12,19 +12,21 @@ class Schedulero
 
   attr_reader :tasks, :logger
 
-  def initialize state_file: nil, log_file: true
-    init_log   log_file
-    init_state state_file
-
+  def initialize state_file: nil, log_file: true, silent: false
+    @silent  = silent
     @tasks   = {}
     @running = {}
     @count   = 0
+
+    init_log   log_file
+    init_state state_file
+
   end
 
   def init_state state_file
     # state file
     state_file ||= "./tmp/schedulero.json"
-    puts 'State file: %s' % state_file
+    show 'State file: %s' % state_file
 
     @state_file = Pathname.new state_file
     @state_file.write '{}' unless @state_file.exist?
@@ -32,24 +34,29 @@ class Schedulero
 
   def init_log log_file
     # log file
-    log_file = case log_file
+    @log_file = case log_file
       when String
         log_file
       when false
         nil
       else
-        "./log/schedulero.log'"
+        "./log/schedulero.log"
     end
 
-    puts 'Log file  : %s' % log_file
+    show 'Log file  : %s' % @log_file
 
-    @logger = Logger.new log_file
+    @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 show text
+    return if @silent
+    puts 'Schedulero: %s' % text
+  end
+
   # add task
   def every name, seconds, proc=nil, &block
     proc ||= block
@@ -65,7 +72,7 @@ class Schedulero
   def run_forever interval: 3
     Thread.new do
       loop do
-        puts 'looping ...'
+        show 'looping ...'
         run
         sleep interval
       end
@@ -82,7 +89,7 @@ class Schedulero
 
     # 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
+      show "Another process [#{state['_pid']}] is controlling state before #{diff} sec, skipping. I am (#{Process.pid})".red
       return
     end
 
@@ -108,7 +115,7 @@ class Schedulero
           state[name] = now
           safe_run block
         else
-          puts 'skipping "%s" for %s' % [name, humanize_seconds(diff)]
+          show 'skipping "%s" for %s' % [name, humanize_seconds(diff)]
         end
       end
     end
@@ -123,7 +130,7 @@ class Schedulero
   def safe_run block
     name = block[:name]
 
-    puts 'Running "%s"' % name.green
+    show 'Running "%s"' % name.green
     @logger.info 'Run: %s' % name
 
     if block[:running]
@@ -153,7 +160,7 @@ class Schedulero
       name
     end
 
-    puts msg.red
+    show msg.red
 
     @logger.error(msg)
   end

data/lib/utils.rb

@@ -17,12 +17,14 @@ class Schedulero
       data = ['Tasks:']
 
       for name, task in tasks
-        data.push '- %s, every %s' % [name, humanize_seconds(task[:interval])]
+        at = task[:at] ? "at #{task[:at]}" : "every #{humanize_seconds(task[:interval])}"
+
+        data.push '- %s, %s' % [name, at]
       end
 
       data.push ['','###', '']
 
-      data.push `tail -#{lines} ./log/schedulero.log`.split($/).reverse
+      data.push `tail -#{lines} #{@log_file}`.split($/).reverse if @log_file
 
       data.join($/)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schedulero
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Dino Reic