pg 0.19.1.pre20170115074000-x64-mingw32 → 0.19.1.pre20170124220800-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76ebb4bd3a84cb4254a91b0211244f552a8a60f2
-  data.tar.gz: 6d1b5912fdbb3ef84c4a80a3a9edb5d712fa5252
+  metadata.gz: 00ad3e00f6108c7b52a87149179cf9d3ae0075d7
+  data.tar.gz: c988fc73776423138645d922e585018aa4933b97
 SHA512:
-  metadata.gz: 6d4a516f0e2f9a7cfb67e9dabebdf4fe324014f268ea6245ab56d29c0a2b52f998ae7d7fc415c16a9ef30421dd3b26e7b0aa08790f614fed7445849d99e8d8f5
-  data.tar.gz: 4a37cc1386fd511503c7903e88f2e36798a9ac68321bf482f1c66048d2dad2c00f18f0e1de6525734b9aa2144b595931a97650e5efd70f62c5e40292911cbe01
+  metadata.gz: 7c0520a2524a1db813736f08b299b2f38b2fffff9c0e5345f3b4578680bfbef9a8b8b1eeef3705f9712736e6777edf761a603e4c600b5fb64d046034e8ad4c53
+  data.tar.gz: 6564fa853a77d8f51df65c7a8d19a231d3cdc9f0c679517de202502dac2b896840060708d25c928a6af5c33c528a8a02ff8c7439883e74967e30a07298ee0159

data/ChangeLog

@@ -1,8 +1,20 @@
+2017-01-24  Lars Kanis  <lars@greiz-reinsdorf.de>
+
+	* History.rdoc:
+	Update History file regarding RI2 support.
+	[d52339653fe3] [tip]
+
+	* lib/pg.rb:
+	Add support for RubyInstaller2 to Windows binary gem.
+
+	RI2 ignores PATH setting for DLL search, but provides it's own API.
+	[87fe14131d78]
+
 2017-01-14  Lars Kanis  <lars@greiz-reinsdorf.de>
 
 	* History.rdoc:
 	Update History file. [ci-skip]
-	[0d1921b825d7] [tip]
+	[0d1921b825d7]
 
 	* Rakefile.cross:
 	Update Windows binary rubies to support 2.0 to 2.4

data/History.rdoc

@@ -4,6 +4,7 @@ Enhancements:
 - Update error codes to PostgreSQL-9.6
 - Update Windows binary gems to Ruby-2.4, PostgreSQL 9.6.1 and
   OpenSSL 1.0.2j.
+- Add support for RubyInstaller2 to Windows binary gems.
 
 Bugfixes:
 - Use secure JSON methods for JSON (de)serialisation. #248

data/lib/pg.rb

@@ -8,11 +8,22 @@ rescue LoadError
 		major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
 			raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
 
-		# Set the PATH environment variable, so that libpq.dll can be found.
-		old_path = ENV['PATH']
-		ENV['PATH'] = "#{File.expand_path("..", __FILE__)};#{old_path}"
-		require "#{major_minor}/pg_ext"
-		ENV['PATH'] = old_path
+		add_dll_path = proc do |path, &block|
+			begin
+				require 'ruby_installer'
+				RubyInstaller.add_dll_directory(path, &block)
+			rescue LoadError
+				old_path = ENV['PATH']
+				ENV['PATH'] = "#{path};#{old_path}"
+				yield
+				ENV['PATH'] = old_path
+			end
+		end
+
+		# Temporary add this directory for DLL search, so that libpq.dll can be found.
+		add_dll_path.call(__dir__) do
+			require "#{major_minor}/pg_ext"
+		end
 	else
 		raise
 	end
@@ -24,7 +35,7 @@ end
 module PG
 
 	# Library version
-	VERSION = '0.19.1.pre20170115074000'
+	VERSION = '0.19.1.pre20170124220800'
 
 	# VCS revision
 	REVISION = %q$Revision$
@@ -61,4 +72,3 @@ end # module PG
 
 # Backward-compatible aliase
 PGError = PG::Error
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 0.19.1.pre20170115074000
+  version: 0.19.1.pre20170124220800
 platform: x64-mingw32
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   PizTJCem24R2bzZN5VGvA5tpqgwytgcFq1PZofgFxK2uKPCS+tmsA8wIjjGzFsnR
   WfgqWGyHn5K4wejsMic/uA==
   -----END CERTIFICATE-----
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial