servolux 0.7.0 → 0.7.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.7.1 / 2009-11-06
+
+* 1 Bug Fix
+  * Server shutdown would hang in Ruby 1.9.1
+
 == 0.7.0 / 2009-11-06
 
 * 1 Minor Enhancement

data/Rakefile

@@ -22,6 +22,7 @@ Bones {
   spec.opts << '--color'
 
   use_gmail
+  enable_sudo
 
   depend_on  'bones-extras', :development => true
   depend_on  'logging',      :development => true

data/lib/servolux/threaded.rb

@@ -61,20 +61,19 @@ module Servolux::Threaded
   end
 
   # Stop the activity thread. If already stopped this method will return
-  # without taking any action. Otherwise, this method does not return until
-  # the activity thread has died or until _limit_ seconds have passed.
+  # without taking any action.
   #
   # If the including class defines a 'before_stopping' method, it will be
   # called before the thread is stopped. Likewise, if the including class
   # defines an 'after_stopping' method, it will be called after the thread
   # has stopped.
   #
-  def stop( limit = nil )
+  def stop
     return self unless _activity_thread.running?
     logger.debug "Stopping"
 
     before_stopping if self.respond_to?(:before_stopping)
-    @_activity_thread.stop limit
+    @_activity_thread.stop
     after_stopping if self.respond_to?(:after_stopping)
     self
   end
@@ -201,10 +200,10 @@ module Servolux::Threaded
   # :stopdoc:
 
   def _activity_thread
-    @_activity_thread ||= ::Servolux::Threaded::ThreadContainer.new(nil, false, 60, 0, nil, false);
+    @_activity_thread ||= ::Servolux::Threaded::ThreadContainer.new(60, 0, nil, false);
   end
 
-  ThreadContainer = Struct.new( :thread, :running, :interval, :iterations, :maximum_iterations, :continue_on_error ) {
+  ThreadContainer = Struct.new( :interval, :iterations, :maximum_iterations, :continue_on_error, :thread, :running ) {
     def start( threaded )
       self.running = true
       self.iterations = 0
@@ -212,11 +211,9 @@ module Servolux::Threaded
       Thread.pass
     end
 
-    def stop( limit )
+    def stop
       self.running = false
       thread.wakeup
-      join limit
-      self.thread = nil
     end
 
     def run( threaded )

data/lib/servolux.rb

@@ -2,7 +2,7 @@
 module Servolux
 
   # :stopdoc:
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/spec/threaded_spec.rb

@@ -20,13 +20,13 @@ describe Servolux::Threaded do
 
     obj = klass.new
     obj.interval = 0
-    obj.running?.should be_false
+    obj.running?.should be_nil
 
     obj.start
     obj.running?.should be_true
     obj.pass
 
-    obj.stop(2)
+    obj.stop.join(2)
     obj.running?.should be_false
   end
 
@@ -46,7 +46,7 @@ describe Servolux::Threaded do
     obj.stopped.should be_false
     obj.pass
 
-    obj.stop(2)
+    obj.stop.join(2)
     obj.stopped.should be_true
   end
 
@@ -68,7 +68,7 @@ describe Servolux::Threaded do
     obj.ary.should == [1,2]
     obj.pass
 
-    obj.stop(2)
+    obj.stop.join(2)
     obj.ary.should == [1,2,3,4]
   end
 
@@ -111,7 +111,7 @@ describe Servolux::Threaded do
     @log_output.readline
     @log_output.readline.chomp.should == "ERROR  Object : <RuntimeError> ni"
 
-    obj.stop(2)
+    obj.stop.join(2)
     obj.running?.should be_false
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: servolux
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Tim Pease
@@ -66,7 +66,6 @@ extra_rdoc_files:
 - History.txt
 - README.rdoc
 files: 
-- .gitignore
 - History.txt
 - README.rdoc
 - Rakefile

data/.gitignore

@@ -1,17 +0,0 @@
-# The list of files that should be ignored by Mr Bones.
-# Lines that start with '#' are comments.
-#
-# A .gitignore file can be used instead by setting it as the ignore
-# file in your Rakefile:
-#
-#   PROJ.ignore_file = '.gitignore'
-#
-# For a project with a C extension, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-*~
-*.sw[op]
-announcement.txt
-coverage
-doc
-pkg