foreverb 0.2.0 → 0.2.1

data/README.md

@@ -98,32 +98,58 @@ $ bin/foo stop
 
 ## Scheduling
 
-You can use ```every``` method to schedule repetitive tasks.
+You can use `every` method to schedule repetitive tasks.
+
+Every allow the option `:at` to specify hour or minute and the option `:last` to specify when the `every` must start to loop.
+
+`:last`: can be nil or a Time class. Default is 0.<br />
+`:at`: can be nil, a string or an array of formatted strings. Default is nil.
+
+``` rb
+every 1.second,   :at => '19:30'            # => every second since 19:30
+every 1.minute,   :at => ':30'              # => every minute but first call wait xx:30
+every 5.minutes,  :at => '18:'              # => every five minutes but first call was at 18:xx
+every 1.day,      :at => ['18:30', '20:30'] # => every day only at 18:30 and 20:30
+every 60.seconds, :last => Time.now         # => will be fired 60 seconds after you launch the app
+```
+
+Remember that `:at`:
+
+* accept only 24h format
+* you must always provide the colon `:`
+
+So looking our [example](https://github.com/DAddYE/foreverb/blob/master/examples/sample):
 
 ``` rb
-# Taken from, examples/sample
 Forever.run do
   dir File.expand_path('../', __FILE__) # Default is ../../__FILE__
 
   on_ready do
-    puts inspect
+    puts "All jobs will will wait me for 1 second"; sleep 1
   end
 
-  every 1.seconds do
-    puts "Every one seconds"
+  every 10.seconds, :at => "#{Time.now.hour}:00" do
+    puts "Every 10 seconds but first call at #{Time.now.hour}:00"
   end
 
-  every 2.seconds do
-    puts "Every two seconds"
+  every 1.seconds, :at => "#{Time.now.hour}:#{Time.now.min+1}" do
+    puts "Every one second but first call at #{Time.now.hour}:#{Time.now.min}"
   end
 
-  every 3.seconds do
-    puts "Every three seconds, long task"
-    sleep 10
+  every 10.seconds do
+    puts "Every 10 second"
   end
 
-  every 1.day, :at => "18:28" do
-    puts "Every day at 18:28"
+  every 20.seconds do
+    puts "Every 20 second"
+  end
+
+  every 15.seconds do
+    puts "Every 15 seconds, but my task require 10 seconds"; sleep 10
+  end
+
+  every 10.seconds, :at => [":#{Time.now.min+1}", ":#{Time.now.min+2}"] do
+    puts "Every 10 seconds but first call at xx:#{Time.now.min}"
   end
 
   on_error do |e|
@@ -136,32 +162,49 @@ Forever.run do
 end
 ```
 
-You should see in logs this:
+Running the example with the following code:
+
+``` sh
+$ examples/sample; tail -f -n 150 examples/log/sample.log; examples/sample stop
+```
+
+you should see:
 
 ```
-$ examples/sample
 => Pid not found, process seems don't exist!
-=> Process demonized with pid 1252 with Forever v.0.1.7
-[11/07 18:27:08] #<Forever dir:/Developer/src/extras/foreverb/examples, file:/Developer/src/extras/foreverb/examples/sample, log:/Developer/src/extras/foreverb/examples/log/sample.log, pid:/Developer/src/extras/foreverb/examples/tmp/sample.pid jobs:4>
-[11/07 18:27:08] Every one seconds
-[11/07 18:27:08] Every two seconds
-[11/07 18:27:08] Every three seconds, long task
-[11/07 18:27:09] Every one seconds
-[11/07 18:27:10] Every two seconds
-...
-[11/07 18:27:17] Every one seconds
-[11/07 18:27:18] Every one seconds
-[11/07 18:27:18] Every two seconds
-[11/07 18:27:19] Every three seconds, long task
+=> Process demonized with pid 11509 with Forever v.0.2.0
+[14/07 15:46:56] All jobs will will wait me for 1 second
+[14/07 15:46:57] Every 10 second
+[14/07 15:46:57] Every 20 second
+[14/07 15:46:57] Every 15 seconds, but my task require 10 seconds
+[14/07 15:47:00] Every one second but first call at 15:47
+[14/07 15:47:00] Every 10 seconds but first call at xx:47
+[14/07 15:47:01] Every one second but first call at 15:47
+[14/07 15:47:02] Every one second but first call at 15:47
+[14/07 15:47:03] Every one second but first call at 15:47
+[14/07 15:47:04] Every one second but first call at 15:47
+[14/07 15:47:05] Every one second but first call at 15:47
+[14/07 15:47:06] Every one second but first call at 15:47
+[14/07 15:47:07] Every 10 second
+[14/07 15:47:07] Every one second but first call at 15:47
+[14/07 15:47:08] Every one second but first call at 15:47
+[14/07 15:47:09] Every one second but first call at 15:47
+[14/07 15:47:10] Every 10 seconds but first call at xx:47
+[14/07 15:47:10] Every one second but first call at 15:47
+[14/07 15:47:11] Every one second but first call at 15:47
+[14/07 15:47:12] Every 15 seconds, but my task require 10 seconds
 ...
-[11/07 18:27:58] Every one seconds
-[11/07 18:27:59] Every one seconds
-[11/07 18:28:00] Every two seconds
-[11/07 18:28:00] Every one seconds
-[11/07 18:28:00] Every day at 18:28
-=> Found pid 1252...
-=> Killing process 1252...
-[11/07 18:28:18] Bye bye
+[14/07 15:47:42] Every 15 seconds, but my task require 10 seconds
+[14/07 15:47:42] Every one second but first call at 15:47
+[14/07 15:47:43] Every one second but first call at 15:47
+[14/07 15:47:44] Every one second but first call at 15:47
+[14/07 15:47:45] Every one second but first call at 15:47
+[14/07 15:47:46] Every one second but first call at 15:47
+[14/07 15:47:47] Every 10 second
+^C
+=> Found pid 11509...
+=> Killing process 11509...
+[14/07 15:48:40] Bye bye
 ```
 
 ## Monitor your daemon(s):
@@ -194,4 +237,4 @@ To see a most comprensive app running _foreverb_ + _growl_ see [githubwatcher ge
 
 ## Author
 
-DAddYE, you can follow me on twitter [@daddye](http://twitter.com/daddye)
+DAddYE, you can follow me on twitter [@daddye](http://twitter.com/daddye) or take a look at my site [daddye.it](http://www.daddye.it)

data/examples/sample

@@ -7,24 +7,40 @@ Forever.run do
   dir File.expand_path('../', __FILE__) # Default is ../../__FILE__
 
   on_ready do
-    puts inspect
+    puts "All jobs will will wait me for 1 second"; sleep 1
   end
 
-  every 1.seconds do
-    puts "Every one seconds"
+  every 5.seconds, :last => Time.now do
+    puts "Every 5 seconds from start"
   end
 
-  every 2.seconds do
-    puts "Every two seconds"
+  every 30.seconds, :last => Time.now do
+    puts "Every 30 seconds from start with boom"
+    raise "woooooa"
   end
 
-  every 3.seconds do
-    puts "Every three seconds, long task"
-    sleep 10
+  every 10.seconds, :at => "#{Time.now.hour}:00" do
+    puts "Every 10 seconds but first call at #{Time.now.hour}:00"
   end
 
-  every 1.minutes, :at => "%d:%d" % [Time.now.hour, Time.now.min+1] do
-    puts "Every minutes at #{"%d:%d" % [Time.now.hour, Time.now.min]}"
+  every 1.seconds, :at => "#{Time.now.hour}:#{Time.now.min+1}" do
+    puts "Every one second but first call at #{Time.now.hour}:#{Time.now.min}"
+  end
+
+  every 10.seconds do
+    puts "Every 10 second"
+  end
+
+  every 20.seconds do
+    puts "Every 20 second"
+  end
+
+  every 15.seconds do
+    puts "Every 15 seconds, but my task require 10 seconds"; sleep 10
+  end
+
+  every 10.seconds, :at => [":#{Time.now.min+1}", ":#{Time.now.min+2}"] do
+    puts "Every 10 seconds but first call at xx:#{Time.now.min}"
   end
 
   on_error do |e|

data/lib/forever/base.rb

@@ -36,7 +36,7 @@ module Forever
         safe_call(on_ready) if on_ready
         jobs.each do |job|
           threads << Thread.new do
-            loop { safe_call(job) if job.time?(Time.now); sleep 1 }
+            loop { job.time?(Time.now) ? safe_call(job) : sleep(1) }
           end
         end
         threads.map(&:join)
@@ -139,8 +139,6 @@ module Forever
         rescue Exception => e
           puts "\n\n%s\n  %s\n\n" % [e.message, e.backtrace.join("\n  ")]
           on_error[e] if on_error
-          sleep 30
-          retry
         end
       end
   end # Base

data/lib/forever/every.rb

@@ -4,8 +4,9 @@ module Forever
       attr_accessor :period, :option, :last, :running
 
       def initialize(period, options, block)
-        @period, @options, @last, @running = period, options, 0, false
-        @at = parse_at(@options[:at])
+        @period, @options, @running = period, options, false
+        @at    = options[:at] ? parse_at(*@options[:at]) : []
+        @last  = options[:last].to_i
         @block = block
       end
 
@@ -18,18 +19,19 @@ module Forever
 
       def time?(t)
         ellapsed_ready = (t - @last).to_i >= @period
-        time_ready     = @at.nil? || (t.hour == @at[0] && t.min == @at[1])
+        time_ready = @at.empty? || @at.any? { |at| (at[0].empty? || t.hour == at[0].to_i) && (at[1].empty? || t.min == at[1].to_i) }
         !running && ellapsed_ready && time_ready
       end
 
       private
-        def parse_at(at)
-          return unless at.is_a?(String)
-          m = at.match(/^(\d{1,2}):(\d{1,2})$/)
-          raise "Failed to parse #{at}" unless m
-          hour, min = m[1].to_i, m[2].to_i
-          raise "Failed to parse #{at}" if hour >= 24 || min >= 60
-          [hour, min]
+        def parse_at(*args)
+          args.map do |at|
+            raise "#{at} must be a string" unless at.is_a?(String)
+            raise "#{at} has not a colon separator" unless at =~ /:/
+            hour, min = at.split(":")
+            raise "Failed to parse #{at}" if hour.to_i >= 24 || min.to_i >= 60
+            [hour, min]
+          end
         end
     end # Job
 

data/lib/forever/version.rb

@@ -1,3 +1,3 @@
 module Forever
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foreverb
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - DAddYE
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 +02:00
+date: 2011-07-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency