servolux 0.9.5 → 0.9.6

data/History.txt

@@ -1,3 +1,9 @@
+== 0.9.6 / 2011-01-02
+
+* Minor Enhancements
+  * Threaded objects run immediately (sleep after running)
+  * Added a "timed_out?" method in the Prefork::Worker class
+
 == 0.9.5 / 2010-07-15
 
 * Minor Enhancements

data/Rakefile

@@ -5,7 +5,7 @@ rescue LoadError
   abort '### please install the "bones" gem ###'
 end
 
-task :default => 'spec:specdoc'
+task :default => 'spec:run'
 task 'gem:release' => 'spec:run'
 
 Bones {
@@ -19,8 +19,7 @@ Bones {
 
   use_gmail
 
-  depend_on  'bones-extras', :development => true
+  depend_on  'bones-rspec',  :development => true
   depend_on  'bones-git',    :development => true
   depend_on  'logging',      :development => true
-  depend_on  'rspec',        :development => true
 }

data/lib/servolux/prefork.rb

@@ -239,7 +239,7 @@ class Servolux::Prefork
   # call-seq:
   #    errors { |worker| block }
   #
-  # Iterates over all the works and yields the worker to the given _block_
+  # Iterates over all the workers and yields the worker to the given _block_
   # only if the worker has an error condition.
   #
   def errors
@@ -248,7 +248,7 @@ class Servolux::Prefork
   end
 
 
-  private
+private
 
   # Pause script execution for a random time interval between 0.1 and 0.4
   # seconds. This method is used to slow down the starting and stopping of
@@ -306,7 +306,7 @@ class Servolux::Prefork
       @thread.wakeup if @thread.status
       close_parent
       signal 'TERM'
-      @thread.join(0.5) rescue nil
+      @thread.join(0.5)
       @thread = nil
       self
     end
@@ -347,8 +347,19 @@ class Servolux::Prefork
       @piper.alive?
     end
 
+    # Returns +true+ if communication with the child process timed out.
+    # Returns +nil+ if the child process has not been started.
+    #
+    # Always returns +nil+ when called from the child process.
+    #
+    # @return [Boolean, nil]
+    #
+    def timed_out?
+      return if @piper.nil? or @piper.child?
+      Timeout === @error
+    end
 
-    private
+  private
 
     def close_parent
       @piper.timeout = 0.5
@@ -364,7 +375,8 @@ class Servolux::Prefork
           @piper.puts START
           Thread.current[:stop] = false
           response = parent_loop
-        # TODO: put a logger here to catch and log all exceptions
+        rescue StandardError => err
+          @error = err
         ensure
           @harvest << @piper.pid
           close_parent

data/lib/servolux/threaded.rb

@@ -219,11 +219,11 @@ module Servolux::Threaded
     def run( threaded )
       loop {
         begin
-          sleep interval if running?
           break unless running?
           threaded.run
           self.iterations += 1
           break if finished_iterations?
+          sleep interval if running?
         rescue SystemExit; raise
         rescue Exception => err
           if continue_on_error

data/version.txt

@@ -1 +1 @@
-0.9.5
+0.9.6

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: servolux
 version: !ruby/object:Gem::Version 
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Tim Pease
@@ -14,44 +15,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 -06:00
+date: 2011-01-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bones-extras
+  name: bones-rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
-        - 2
-        - 4
-        version: 1.2.4
+        - 1
+        - 0
+        version: 1.1.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bones-git
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 2
-        - 0
-        version: 1.2.0
+        - 2
+        version: 1.2.2
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: logging
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 4
@@ -59,34 +66,22 @@ dependencies:
         version: 1.4.3
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bones
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 3
+        - 5
         - 4
-        - 7
-        version: 3.4.7
+        version: 3.5.4
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 description: |-
   Serv-O-Lux is a collection of Ruby classes that are useful for daemon and
   process management, and for writing your own Ruby services. The code is well
@@ -135,25 +130,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: servolux
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Serv-O-Lux is a collection of Ruby classes that are useful for daemon and process management, and for writing your own Ruby services
+summary: Serv-O-Lux is a collection of Ruby classes that are useful for daemon and process management, and for writing your own Ruby services.
 test_files: []