foreverb 0.1.8 → 0.1.9

data/examples/sample

@@ -3,14 +3,7 @@ require 'rubygems' unless defined?(Gem)
 require 'bundler/setup'
 require 'forever'
 
-$stdout_was = STDOUT.dup
-
 Forever.run do
-  def puts(text=nil)
-    text = super(text)
-    $stdout_was.print text
-  end
-
   dir File.expand_path('../', __FILE__) # Default is ../../__FILE__
 
   on_ready do

data/lib/forever.rb

@@ -1,3 +1,5 @@
+require "forever/extensions"
+require "forever/every"
 require "forever/base"
 require "forever/version"
 

data/lib/forever/base.rb

@@ -1,8 +1,6 @@
 require 'fileutils'
-require 'forever/every'
 
 module Forever
-  DATE_FORMAT = "%d/%m %H:%M:%S"
 
   class Base
     include Every
@@ -34,37 +32,17 @@ module Forever
         STDOUT.reopen(stream)
         STDERR.reopen(STDOUT)
 
-        Thread.abort_on_exception = true
-
-        begin
-          threads = []
-          threads << Thread.new { on_ready.call } if on_ready
-          jobs.each do |job|
-            threads << Thread.new do
-              loop { job.call if job.time?(Time.now); sleep 1 }
-            end
+        threads = []
+        threads << Thread.new { 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 }
           end
-          threads.map(&:join)
-        rescue Exception => e
-          on_error[e] if on_error
-          stream.print "\n\n%s\n  %s\n\n" % [e.message, e.backtrace.join("\n  ")]
-          sleep 30
-          retry
         end
+        threads.map(&:join)
       end
     end
 
-    ##
-    # A replacement of puts that has the aim to works correclty with multiple threads
-    # and log date. If you want to personalize date, edit DATE_FORMAT.
-    #
-    def puts(text="")
-      text  = "[%s] %s" % [Time.now.strftime(DATE_FORMAT), text.to_s]
-      text += "\n" unless text[-1] == ?\n
-      print text; $stdout.flush
-      text
-    end
-
     ##
     # Caller file
     #
@@ -154,5 +132,16 @@ module Forever
       def exists?(*values)
         values.all? { |value| value && File.exist?(value) }
       end
+
+      def safe_call(block)
+        begin
+          block.call
+        rescue Exception => e
+          on_error[e] if on_error
+          puts "\n\n%s\n  %s\n\n" % [e.message, e.backtrace.join("\n  ")]
+          sleep 30
+          retry
+        end
+      end
   end # Base
 end # Forever

data/lib/forever/every.rb

@@ -1,5 +1,3 @@
-require 'forever/numeric'
-
 module Forever
   module Every
     class Job

data/lib/forever/extensions.rb

@@ -0,0 +1,25 @@
+LOG_FORMAT  = "[%s] %s"        unless defined?(LOG_FORMAT)
+DATE_FORMAT = "%d/%m %H:%M:%S" unless defined?(DATE_FORMAT)
+
+class Numeric
+  def seconds; self; end
+  alias :second :seconds
+
+  def minutes; self * 60; end
+  alias :minute :minutes
+
+  def hours; self * 3600; end
+  alias :hour :hours
+
+  def days; self * 86400; end
+  alias :day :days
+end
+
+module Kernel
+  def puts(text="")
+    text  = LOG_FORMAT % [Time.now.strftime(DATE_FORMAT), text.to_s]
+    text += "\n" unless text[-1] == ?\n
+    print text; $stdout.flush
+    text
+  end
+end

data/lib/forever/version.rb

@@ -1,3 +1,3 @@
 module Forever
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - DAddYE
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 +02:00
+date: 2011-07-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ files:
 - lib/forever.rb
 - lib/forever/base.rb
 - lib/forever/every.rb
-- lib/forever/numeric.rb
+- lib/forever/extensions.rb
 - lib/forever/version.rb
 has_rdoc: true
 homepage: https://github.com/daddye/forever

data/lib/forever/numeric.rb

@@ -1,13 +0,0 @@
-class Numeric
-  def seconds; self; end
-  alias :second :seconds
-
-  def minutes; self * 60; end
-  alias :minute :minutes
-
-  def hours; self * 3600; end
-  alias :hour :hours
-
-  def days; self * 86400; end
-  alias :day :days
-end