libuv 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 328790a2659803772fb2ca5891889bda349b47fd
-  data.tar.gz: 0b534aaeeb7fd1fbfd11c35090e8f048be6db411
+  metadata.gz: b10a0bc452c1191da75b68559a2938ac09284f85
+  data.tar.gz: 60d8591279de58b4de765a46ecf3e4352f271fd0
 SHA512:
-  metadata.gz: 00f0aed38c13defc6a2e310a67e81f576fad3d90308d00575982794e4bad6d0f95204b20d5f66db130984e22223c616bc02f78b3ffbefcc2d623c8efec9b1516
-  data.tar.gz: da08a1d126e8d25dd0bb8fa8d0deb3a25d05a369725362d2aa5a4fbf5254aa2d5db7f6ec7f10c8b70ad2f24f2f6924018c59259276e83fa4d22eae58554a4599
+  metadata.gz: 9385371508feaf33ba6a28b3566063746383f540f6959a8466cc05188874b29ba69ecfba96ee9cf038ef23bf814e990d51fe6f4e06f9f7282481fc3595f92ec7
+  data.tar.gz: 10d0fc2affa3b408ec867d769dea18fcead4c17f49fa73802e58718785cab5cabff58a9d45f88d6e2c4bb6e2414e4dbcf24770435889770cc6cf941a592c1715

data/lib/libuv/ext/ext.rb

@@ -28,10 +28,12 @@ module Libuv
 
 
         begin
+            lib_path = ::File.expand_path('../', path_to_internal_libuv)
+
             # bias the library discovery to a path inside the gem first, then
             # to the usual system paths
             paths = [
-                ::File.expand_path('../', path_to_internal_libuv),
+                lib_path,
                 '/usr/local/lib',
                 '/opt/local/lib',
                 '/usr/lib64'
@@ -42,7 +44,16 @@ module Libuv
                 # Primarily a dev platform so that is OK
                 paths.unshift "#{ENV['HOME']}/lib"
             elsif FFI::Platform.windows?
-                # TODO:: AddDllDirectory function to point to path_to_internal_libuv
+                module Kernel32
+                    extend FFI::Library
+                    ffi_lib 'Kernel32'
+
+                    attach_function :add_dll_dir, :AddDllDirectory, 
+                        [ :buffer_in ], :pointer
+                end
+                # This ensures that externally loaded libraries like the libcouchbase gem
+                # will always use the same binary image and not load a second into memory
+                Kernel32.add_dll_dir "#{lib_path}\0".encode("UTF-16LE")
             else # UNIX
                 # TODO:: ??
             end

data/lib/libuv/reactor.rb

@@ -8,7 +8,6 @@ module Libuv
         extend Accessors
 
 
-        REACTORS = ::Concurrent::Map.new
         CRITICAL = ::Mutex.new
 
 
@@ -47,7 +46,7 @@ module Libuv
             #
             # @return [::Libuv::Reactor | nil]
             def current
-                REACTORS[Thread.current]
+                Thread.current.thread_variable_get(:reactor)
             end
         end
         extend ClassMethods
@@ -89,7 +88,7 @@ module Libuv
 
             # Notify of errors
             @throw_on_exit = nil
-            @reactor_notify = proc { |error|
+            @reactor_notify_default = @reactor_notify = proc { |error|
                 @throw_on_exit = error
             }
         end
@@ -103,8 +102,8 @@ module Libuv
         def noop; end
 
         def stop_cb
-            REACTORS.delete(@reactor_thread)
-            @reactor_thread = nil
+            Thread.current.thread_variable_set(:reactor, nil)
+            @reactor_running = false
 
             ::Libuv::Ext.stop(@pointer)
         end
@@ -157,12 +156,12 @@ module Libuv
         # @yieldparam promise [::Libuv::Q::Promise] Yields a promise that can be used for logging unhandled
         #   exceptions on the reactor.
         def run(run_type = :UV_RUN_DEFAULT)
-            if @reactor_thread.nil?
+            if not @reactor_running
                 begin
-                    @reactor_thread = ::Thread.current
-                    raise 'only one reactor allowed per-thread' if REACTORS[@reactor_thread]
+                    @reactor_running = true
+                    raise 'only one reactor allowed per-thread' if Thread.current.thread_variable_get(:reactor)
 
-                    REACTORS[@reactor_thread] = @reactor
+                    Thread.current.thread_variable_set(:reactor, @reactor)
                     @throw_on_exit = nil
 
                     if block_given?
@@ -178,8 +177,8 @@ module Libuv
                     @run_count += 1
                     ::Libuv::Ext.run(@pointer, run_type)  # This is blocking
                 ensure
-                    REACTORS.delete(@reactor_thread)
-                    @reactor_thread = nil
+                    Thread.current.thread_variable_set(:reactor, nil)
+                    @reactor_running = false
                     @run_queue.clear
                 end
 
@@ -219,7 +218,7 @@ module Libuv
         #
         # @return [::Libuv::Q::Promise]
         def notifier(callback = nil, &blk)
-            @reactor_notify = callback || blk
+            @reactor_notify = callback || blk || @reactor_notify_default
             self
         end
 
@@ -263,7 +262,13 @@ module Libuv
         def finally(*promises)
             Q.finally(@reactor, *promises)
         end
-        
+
+        # Creates a promise that is resolved as rejected with the specified reason. This api should be
+        # used to forward rejection in a chain of promises. If you are dealing with the last promise in
+        # a promise chain, you don't need to worry about it.
+        def reject(reason)
+            Q.reject(@reactor, reason)
+        end
 
         # forces reactor time update, useful for getting more granular times
         # 
@@ -507,19 +512,14 @@ module Libuv
         #
         # @return [Boolean]
         def reactor_thread?
-            @reactor_thread == ::Thread.current
+            self == Thread.current.thread_variable_get(:reactor)
         end
 
-        # Exposed to allow joining on the thread, when run in a multithreaded environment. Performing other actions on the thread has undefined semantics (read: a dangerous endevor).
-        #
-        # @return [Thread]
-        attr_reader :reactor_thread
-
         # Tells you whether the Libuv reactor reactor is currently running.
         #
         # @return [Boolean]
         def reactor_running?
-            !@reactor_thread.nil?
+            @reactor_running
         end
         alias_method :running?, :reactor_running?
     end

data/lib/libuv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Libuv
-    VERSION = '3.0.0'
+    VERSION = '3.0.1'
 end

data/spec/async_spec.rb

@@ -16,19 +16,24 @@ describe Libuv::Async do
 
 		@reactor.all(@server, @client, @timeout).catch do |reason|
 			@general_failure << reason.inspect
-			p "Failed with: #{reason.message}\n#{reason.backtrace.join("\n")}\n"
+			puts "Failed with: #{reason.message}\n#{reason.backtrace.join("\n")}\n"
+		end
+
+		@reactor.notifier do |error, context|
+			begin
+				puts "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
+			rescue Exception
+				puts 'error in logger'
+			end
 		end
 	end
+
+	after :each do
+		@reactor.notifier
+	end
 	
 	it "Should call the async function from the thread pool stopping the counter" do
 		@reactor.run { |reactor|
-			reactor.notifier do |error, context|
-				begin
-					p "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-				rescue Exception
-					p 'error in logger'
-				end
-			end
 
 			@count = 0
 

data/spec/defer_spec.rb

@@ -5,6 +5,7 @@ describe Libuv::Q do
 	
 	before :each do
 		@reactor = Libuv::Reactor.default
+		@reactor.notifier {}
 		@deferred = @reactor.defer
 		@promise = @deferred.promise
 		@log = []
@@ -12,6 +13,10 @@ describe Libuv::Q do
 			@reactor.stop
 		}
 	end
+
+	after :each do
+		@reactor.notifier
+	end
 	
 	
 	describe 'resolve' do

data/spec/dns_spec.rb

@@ -9,9 +9,9 @@ describe Libuv::Dns do
 		@reactor = Libuv::Reactor.default
 		@reactor.notifier do |error, context|
 			begin
-				p "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
+				puts "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
 			rescue Exception
-				p 'error in logger'
+				puts 'error in logger'
 			end
 		end
 		@timeout = @reactor.timer do
@@ -22,9 +22,13 @@ describe Libuv::Dns do
 
 		@reactor.all(@server, @client, @timeout).catch do |reason|
 			@general_failure << reason.inspect
-			p "Failed with: #{reason.message}\n#{reason.backtrace.join("\n")}\n"
+			puts "Failed with: #{reason.message}\n#{reason.backtrace.join("\n")}\n"
 		end
 	end
+
+	after :each do
+		@reactor.notifier
+	end
 	
 	it "should resolve localhost using IP4", :network => true do
 		@reactor.run { |reactor|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libuv
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi