libuv 2.0.12 → 3.0.0

data/spec/idle_spec.rb

@@ -6,48 +6,34 @@ describe Libuv::Idle do
 		@log = []
 		@general_failure = []
 
-		@loop = Libuv::Loop.default
-		@server = @loop.pipe
-		@client = @loop.pipe
-		@timeout = @loop.timer do
-			@loop.stop
-			@general_failure << "test timed out"
-		end
-		@timeout.start(5000)
-
-		@loop.all(@server, @client, @timeout).catch do |reason|
-			@general_failure << reason.inspect
-			p "Failed with: #{reason.message}\n#{reason.backtrace.join("\n")}\n"
+		@reactor = Libuv::Reactor.default
+		@reactor.notifier do |error, context|
+			begin
+				@general_failure << "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+			rescue Exception => e
+				@general_failure << "error in logger #{e.inspect}"
+			end
 		end
+		@timeout = @reactor.timer {
+			@reactor.stop
+			@general_failure << "test timed out"
+		}.start(5000)
 	end
 	
 	it "should increase the idle count when there is nothing to process" do
-		@loop.run { |logger|
-			logger.progress do |level, errorid, error|
-				begin
-					p "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-				rescue Exception
-					p 'error in logger'
-				end
-			end
-
+		@reactor.run { |reactor|
 			@idle_calls = 0
   
-			idle = @loop.idle do |e|
+			idle = @reactor.idle { |e|
 				@idle_calls += 1
-			end
-			idle.start
+			}.start
 
-			timer = @loop.timer proc {}
-			timer.start(1, 0)
-
-			stopper = @loop.timer do
-				idle.close
-				timer.close
+			stopper = @reactor.timer {
+				idle.stop.close
 				stopper.close
-				@loop.stop
-			end
-			stopper.start(1000, 0)
+				@timeout.close
+				@reactor.stop
+			}.start(1000)
 		}
 
 		expect(@general_failure).to eq([])

data/spec/pipe_spec.rb

@@ -6,22 +6,30 @@ describe Libuv::Pipe do
 		@log = []
 		@general_failure = []
 
-		@loop = Libuv::Loop.new
-		@server = @loop.pipe
-		@client = @loop.pipe
-		@timeout = @loop.timer do
-			@loop.stop
+		@reactor = Libuv::Reactor.new
+		@server = @reactor.pipe
+		@client = @reactor.pipe
+		@timeout = @reactor.timer do
+			@reactor.stop
 			@general_failure << "test timed out"
 		end
 		@timeout.start(5000)
 
 		@pipefile = "/tmp/test-pipes.pipe"
 
-		@loop.all(@server, @client, @timeout).catch do |reason|
+		@reactor.all(@server, @client, @timeout).catch do |reason|
 			@general_failure << reason.inspect
 			@general_failure << "Failed with: #{reason.message}\n#{reason.backtrace}\n"
 		end
 
+		@reactor.notifier do |error, context|
+			begin
+				@general_failure << "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+			rescue Exception => e
+				@general_failure << "error in logger #{e.inspect}"
+			end
+		end
+
 		begin
 			File.unlink(@pipefile)
 		rescue
@@ -38,15 +46,7 @@ describe Libuv::Pipe do
 	describe 'bidirectional inter process communication' do
 
 		it "should send a ping and return a pong" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				@server.bind(@pipefile) do |client|
 					client.progress do |data|
 						@log << data
@@ -58,7 +58,7 @@ describe Libuv::Pipe do
 				# catch server errors
 				@server.catch do |reason|
 					@general_failure << reason.inspect
-					@loop.stop
+					@reactor.stop
 
 					@general_failure << "Failed with: #{reason.message}\n#{reason.backtrace}\n"
 				end
@@ -82,15 +82,15 @@ describe Libuv::Pipe do
 
 				@client.catch do |reason|
 					@general_failure << reason.inspect
-					@loop.stop
+					@reactor.stop
 
 					@general_failure << "Failed with: #{reason.message}\n#{reason.backtrace}\n"
 				end
 
-				# Stop the loop once the client handle is closed
+				# Stop the reactor once the client handle is closed
 				@client.finally do
 					@server.close
-					@loop.stop
+					@reactor.stop
 				end
 			}
 
@@ -106,15 +106,9 @@ describe Libuv::Pipe do
 		end
 
 		it "should send work to a consumer" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-				end
-
-
-				heartbeat = @loop.timer
-				@file1 = @loop.file(@pipefile, File::RDWR|File::NONBLOCK)
-				@file1.progress do
+			@reactor.run { |reactor|
+				heartbeat = @reactor.timer
+				@file1 = @reactor.file(@pipefile, File::RDWR|File::NONBLOCK) do
 					@server.open(@file1.fileno) do |server|
 						heartbeat.progress  do
 							@server.write('workload').catch do |err|
@@ -128,8 +122,7 @@ describe Libuv::Pipe do
 					@general_failure << "Log called: #{e.inspect} - #{e.message}\n"
 				end
 
-				@file2 = @loop.file(@pipefile, File::RDWR|File::NONBLOCK)
-				@file2.progress do
+				@file2 = @reactor.file(@pipefile, File::RDWR|File::NONBLOCK) do
 					# connect client to server
 					@client.open(@file2.fileno) do |consumer|
 						consumer.progress do |data|
@@ -141,12 +134,12 @@ describe Libuv::Pipe do
 				end
 
 
-				timeout = @loop.timer do
+				timeout = @reactor.timer do
 					@server.close
 					@client.close
 					timeout.close
 					heartbeat.close
-					@loop.stop
+					@reactor.stop
 				end
 				timeout.start(1000)
 			}

data/spec/tcp_spec.rb

@@ -7,22 +7,29 @@ describe Libuv::TCP do
 		@log = []
 		@general_failure = []
 
-		@loop = Libuv::Loop.new
-		@server = @loop.tcp
-		@client = @loop.tcp
-		@timeout = @loop.timer do
-			@loop.stop
-			@loop2.stop if @loop2
+		@reactor = Libuv::Reactor.new
+		@server = @reactor.tcp
+		@client = @reactor.tcp
+		@timeout = @reactor.timer do
+			@reactor.stop
+			@reactor2.stop if @reactor2
 			@general_failure << "test timed out"
 		end
 		@timeout.start(5000)
 
-		@loop.all(@server, @client, @timeout).catch do |reason|
+		@reactor.all(@server, @client, @timeout).catch do |reason|
 			@general_failure << reason.inspect
 		end
 
 
 		@pipefile = "/tmp/test-pipe.pipe"
+		@reactor.notifier do |error, context|
+			begin
+				@general_failure << "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+			rescue Exception => e
+				@general_failure << "error in logger #{e.inspect}"
+			end
+		end
 
 		begin
 			File.unlink(@pipefile)
@@ -32,16 +39,7 @@ describe Libuv::TCP do
 	
 	describe 'basic client server' do
 		it "should send a ping and return a pong", :network => true do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
-					rescue Exception => e
-						@general_failure << "error in logger #{e.inspect}"
-					end
-				end
-
-
+			@reactor.run { |reactor|
 				@server.bind('127.0.0.1', 34567) do |client|
 					client.progress do |data|
 						@log << data
@@ -81,28 +79,103 @@ describe Libuv::TCP do
 				# close the handle
 				@client.finally do
 					@server.close
-					@loop.stop
+					@reactor.stop
 				end
 			}
 
 			expect(@general_failure).to eq([])
 			expect(@log).to eq(['ping', 'pong'])
 		end
-	end
 
-	it "should handle requests on different threads", :network => true do
-		@sync = Mutex.new
+		it "should work with coroutines", :network => true do
+			@reactor.run { |reactor|
+				@server.bind('127.0.0.1', 34567) do |client|
+					client.progress do |data|
+						@log << data
 
-		@loop.run { |logger|
-			logger.progress do |level, errorid, error|
-				begin
-					@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
-				rescue Exception
-					@general_failure << "error in logger #{e.inspect}"
+						client.write('pong')
+					end
+					client.start_read
+				end
+
+				# catch errors
+				@server.catch do |reason|
+					@general_failure << reason.inspect
+				end
+
+				# start listening
+				@server.listen(1024)
+
+				# connect client to server
+				@client.progress do |data|
+					@log << data
+
+					addrinfo = @reactor.lookup('127.0.0.1')
+					@log << addrinfo[0][0]
+
+					@client.shutdown
+				end
+				# catch errors
+				@client.catch do |reason|
+					@general_failure << reason.inspect
 				end
-			end
 
+				# close the handle
+				@client.finally do
+					@server.close
+					@reactor.stop
+				end
+				@client.connect('127.0.0.1', 34567)
+				@client.start_read
+				@client.write('ping')
+			}
 
+			expect(@general_failure).to eq([])
+			expect(@log).to eq(['ping', 'pong', '127.0.0.1'])
+		end
+
+		it "should quack a bit like an IO object", :network => true do
+			@reactor.run { |reactor|
+				@server.bind('127.0.0.1', 34567) do |client|
+					@log << client.read(4)
+					client.write('pong')
+				end
+
+				# catch errors
+				@server.catch do |reason|
+					@general_failure << reason.inspect
+				end
+
+				# start listening
+				@server.listen(1024)
+
+				# catch errors
+				@client.catch do |reason|
+					@general_failure << reason.inspect
+				end
+
+				# close the handle
+				@client.finally do
+					@server.close
+					@reactor.stop
+				end
+				@client.connect('127.0.0.1', 34567)
+				@client.write('ping')
+				@log << @client.read(4)
+				addrinfo = @reactor.lookup('127.0.0.1')
+				@log << addrinfo[0][0]
+				@client.shutdown
+			}
+
+			expect(@general_failure).to eq([])
+			expect(@log).to eq(['ping', 'pong', '127.0.0.1'])
+		end
+	end
+
+	it "should handle requests on different threads", :network => true do
+		@sync = Mutex.new
+
+		@reactor.run { |reactor|
 			@remote = nil
 			@server.bind('127.0.0.1', 45678) do |client|
 				@remote.write2(client)
@@ -114,7 +187,7 @@ describe Libuv::TCP do
 			end
 
 
-			@pipeserve = @loop.pipe(true)
+			@pipeserve = @reactor.pipe(true)
 			@pipeserve.bind(@pipefile) do |client|
 				@remote = client
 
@@ -156,19 +229,18 @@ describe Libuv::TCP do
 
 
 			Thread.new do
-				@loop2 = Libuv::Loop.new
-				@pipeclient = @loop2.pipe(true)
+				@reactor2 = Libuv::Reactor.new
+				@reactor2.notifier do |error, context|
+					begin
+						@general_failure << "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+					rescue Exception
+						@general_failure << "error in logger #{e.inspect}"
+					end
+				end
+				@pipeclient = @reactor2.pipe(true)
 
 
-				@loop2.run do  |logger|
-					logger.progress do |level, errorid, error|
-						begin
-							@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
-						rescue Exception
-							@general_failure << "error in logger #{e.inspect}"
-						end
-					end
-			
+				@reactor2.run do  |reactor|
 					# connect client to server
 					@pipeclient.connect(@pipefile) do |client|
 						@pipeclient.progress do |data|
@@ -183,8 +255,8 @@ describe Libuv::TCP do
 							connection.start_read
 							connection.finally do
 								@pipeclient.close
-								@loop2.stop
-								@loop.stop
+								@reactor2.stop
+								@reactor.stop
 							end
 						end
 
@@ -200,16 +272,7 @@ describe Libuv::TCP do
 
 	describe 'basic TLS client and server' do
 		it "should send a ping and return a pong", :network => true do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
-					rescue Exception
-						@general_failure << "error in logger #{e.inspect}"
-					end
-				end
-
-
+			@reactor.run { |reactor|
 				@server.bind('127.0.0.1', 56789) do |client|
 					client.start_tls(server: true)
 					client.progress do |data|
@@ -251,7 +314,7 @@ describe Libuv::TCP do
 				# close the handle
 				@client.finally do
 					@server.close
-					@loop.stop
+					@reactor.stop
 				end
 			}
 

data/spec/timer_spec.rb

@@ -3,9 +3,9 @@ require 'libuv'
 describe Libuv::Timer do
 	describe 'setting properties' do
 		it "should allow repeat to be set" do
-      @loop = Libuv::Loop.new
-			@loop.run { |logger|
-        @timer = @loop.timer
+      @reactor = Libuv::Reactor.new
+			@reactor.run { |logger|
+        @timer = @reactor.timer
         @timer.repeat = 5
         expect(@timer.repeat).to eq(5)
       }

data/spec/udp_spec.rb

@@ -7,32 +7,31 @@ describe Libuv::UDP do
 		@log = []
 		@general_failure = []
 
-		@loop = Libuv::Loop.new
-		@server = @loop.udp
-		@client = @loop.udp
-		@timeout = @loop.timer do
-			@loop.stop
+		@reactor = Libuv::Reactor.new
+		@server = @reactor.udp
+		@client = @reactor.udp
+		@timeout = @reactor.timer do
+			@reactor.stop
 			@general_failure << "test timed out"
 		end
 		@timeout.start(5000)
 
-		@loop.all(@server, @client, @timeout).catch do |reason|
+		@reactor.notifier do |error, context|
+			begin
+				@general_failure << "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+			rescue Exception => e
+				@general_failure << "error in logger #{e.inspect}"
+			end
+		end
+
+		@reactor.all(@server, @client, @timeout).catch do |reason|
 			@general_failure << reason.inspect
 		end
 	end
 	
 	describe 'basic client server' do
 		it "should send a ping and return a pong", :network => true do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
-					rescue Exception => e
-						@general_failure << "error in logger #{e.inspect}"
-					end
-				end
-
-
+			@reactor.run { |reactor|
 				@server.bind('127.0.0.1', 34567)
 				@server.progress do |data, ip, port, server|
 					@log << data
@@ -63,7 +62,7 @@ describe Libuv::UDP do
 				# close the handle
 				@client.finally do
 					@server.close
-					@loop.stop
+					@reactor.stop
 				end
 			}