thread 0.0.4.1 → 0.0.4.2

data/lib/thread/channel.rb

@@ -19,7 +19,6 @@ class Thread::Channel
 	def initialize (messages = [], &block)
 		@messages = []
 		@mutex    = Mutex.new
-		@cond     = ConditionVariable.new
 		@check    = block
 
 		messages.each {|o|
@@ -38,7 +37,8 @@ class Thread::Channel
 
 		@mutex.synchronize {
 			@messages << what
-			@cond.broadcast
+
+			cond.broadcast if cond?
 		}
 
 		self
@@ -59,14 +59,14 @@ class Thread::Channel
 						message = @messages.delete_at(index)
 						found   = true
 					else
-						@cond.wait @mutex
+						cond.wait @mutex
 					end
 				}
 			end
 		else
 			@mutex.synchronize {
 				if @messages.empty?
-					@cond.wait @mutex
+					cond.wait @mutex
 				end
 
 				message = @messages.shift
@@ -86,4 +86,13 @@ class Thread::Channel
 			@messages.shift
 		end
 	end
+
+private
+	def cond?
+		instance_variable_defined? :@cond
+	end
+
+	def cond
+		@cond ||= ConditionVariable.new
+	end
 end

data/lib/thread/delay.rb

@@ -16,7 +16,6 @@ class Thread::Delay
 		raise ArgumentError, 'no block given' unless block
 
 		@mutex = Mutex.new
-
 		@block = block
 	end
 

data/lib/thread/future.rb

@@ -20,9 +20,7 @@ class Thread::Future
 	def initialize (&block)
 		raise ArgumentError, 'no block given' unless block
 
-		@mutex = Mutex.new
-		@cond  = ConditionVariable.new
-
+		@mutex  = Mutex.new
 		@thread = Thread.new {
 			begin
 				deliver block.call
@@ -77,13 +75,16 @@ class Thread::Future
 	#
 	# In case the block raises an exception, it will be raised, the exception is cached
 	# and will be raised every time you access the value.
+	#
+	# An optional timeout can be passed which will return nil if nothing has been
+	# delivered.
 	def value (timeout = nil)
 		raise @exception if exception?
 
 		return @value if delivered?
 
 		@mutex.synchronize {
-			@cond.wait(@mutex, *timeout)
+			cond.wait(@mutex, *timeout)
 		}
 
 		if exception?
@@ -107,12 +108,21 @@ class Thread::Future
 	alias ! value!
 
 private
+	def cond?
+		instance_variable_defined? :@cond
+	end
+
+	def cond
+		@cond ||= ConditionVariable.new
+	end
+
 	def deliver (value)
 		return if delivered?
 
 		@mutex.synchronize {
 			@value = value
-			@cond.broadcast
+
+			cond.broadcast if cond?
 		}
 
 		self

data/lib/thread/promise.rb

@@ -15,7 +15,6 @@ class Thread::Promise
 	# Create a promise.
 	def initialize
 		@mutex = Mutex.new
-		@cond  = ConditionVariable.new
 	end
 
 	# Check if a value has been delivered.
@@ -33,7 +32,8 @@ class Thread::Promise
 
 		@mutex.synchronize {
 			@value = value
-			@cond.broadcast
+
+			cond.broadcast if cond?
 		}
 
 		self
@@ -43,17 +43,29 @@ class Thread::Promise
 
 	# Get the value that's been delivered, if none has been delivered yet the call
 	# will block until one is delivered.
+	#
+	# An optional timeout can be passed which will return nil if nothing has been
+	# delivered.
 	def value (timeout = nil)
 		return @value if delivered?
 
 		@mutex.synchronize {
-			@cond.wait(@mutex, *timeout)
+			cond.wait(@mutex, *timeout)
 		}
 
 		return @value if delivered?
 	end
 
 	alias ~ value
+
+private
+	def cond?
+		instance_variable_defined? :@cond
+	end
+
+	def cond
+		@cond ||= ConditionVariable.new
+	end
 end
 
 module Kernel

data/thread.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new {|s|
 	s.name         = 'thread'
-	s.version      = '0.0.4.1'
+	s.version      = '0.0.4.2'
 	s.author       = 'meh.'
 	s.email        = 'meh@schizofreni.co'
 	s.homepage     = 'http://github.com/meh/ruby-thread'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thread
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies: []
 description: Includes a thread pool, message passing capabilities, a recursive mutex,
   promise, future and delay.