pg 0.19.1.pre20170115074000 → 0.19.1.pre20170124220800

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b994ea1b438637312d2a06c4d3f2ddec61962c0
-  data.tar.gz: 9df1f107a35a6fc287dc1745ed737402f6029483
+  metadata.gz: c0493fece40de96cf95c5f5e4ef967ca5bd205c3
+  data.tar.gz: ee71730505611b6df1efe869ca17e5d2be535ae0
 SHA512:
-  metadata.gz: 1a4c8ef59573eb59f0b2e6674aa09dcdfe04a25db70e4ca712a2041312e380a8a04dac3036edc0e4913a359553e7a932bd6129187bac29af47dcf9e16032bb87
-  data.tar.gz: 85b80f993e4cf027ba3b7b90b6931901936f90e0e44afe06712252a005f9ddd1691ffb2101a3ff967883e5cccb64a11c2c0f067904a6b6dc72f81f331f1d5cf4
+  metadata.gz: e2255d0cd72c2331f4ac66593d56e4cde4e6d2f65eadd5711399e1a6b8c8c40b8d1957e4208c679e8d294c3b509fc9f22c7010e25cbef32373ec4cbe723ea50b
+  data.tar.gz: dca39f627c0cd9fe8f31da0120a1982acb943407e0f9d04b6aafc3b9e57512e7016afd8ec3c6480eef074ffc33f0401dd8eff42687c4dcb274b398dfd019cdc3

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: ruby
 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