pg 1.2.1-x64-mingw32 → 1.2.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e949ed3aa19f653070f03c7787a21932604a19a329711ccd1d80f736c8ceb848
-  data.tar.gz: 11c9009c3d6015dd3bc0fdf353cfbc1f92a9f0d18cfab6a60778b037d77c0c56
+  metadata.gz: ee4f0a4364a2d1a4aba9fd2b0df81e623258c6aeded90cdf309822de1918fc41
+  data.tar.gz: f00e7705b93387cec9f3a7c5b6fd3bdf6c7d5f6c23834de6106ec38800ddb1ce
 SHA512:
-  metadata.gz: a29e80d2bff55dac683ef68c36e57f9c34a28b1a0fd92c7c8ee2e98c03afe934874c1b74d2c4970978329c9f9adbaa8034fde4b8fda3a4909c8927fb2d058477
-  data.tar.gz: f91f279215bab7bafb38f050ee4a4491394924ee1d6630cf84018922af3575624ff282d7e841f27297a591f227890fa96f9cbe9dea6a9730e262230cdf56af85
+  metadata.gz: 4dfeba9f6b831261c6d90ee2662af9467cec5c2d748300efc125a5303cb62387a6d64bee329cb7a1cb4ee928b3ee44370577864acfcfe2aea6e7a5041b44a2fa
+  data.tar.gz: d057b3fd8ea1b3b070b549039f2d6148c046bd0d465449969af26a7ff118adea0632c962f3c91a9e58aa2fc19d47335d1c634b0ea18aa0691179f395c9bb0910

data/History.rdoc

@@ -1,3 +1,10 @@
+== v1.2.2 [2020-01-06] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Add a binary gem for Ruby 2.7.
+
+
 == v1.2.1 [2020-01-02] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/Rakefile

@@ -35,6 +35,8 @@ TEST_DIRECTORY = BASEDIR + "tmp_test_specs"
 
 CLOBBER.include( TEST_DIRECTORY.to_s )
 CLEAN.include( PKGDIR.to_s, TMPDIR.to_s )
+CLEAN.include "lib/*/libpq.dll"
+CLEAN.include "lib/pg_ext.*"
 
 # Set up Hoe plugins
 Hoe.plugin :mercurial
@@ -61,7 +63,7 @@ $hoespec = Hoe.spec 'pg' do
 	self.developer 'Lars Kanis', 'lars@greiz-reinsdorf.de'
 
 	self.dependency 'rake-compiler', '~> 1.0', :developer
-	self.dependency 'rake-compiler-dock', ['~> 0.7.0'], :developer
+	self.dependency 'rake-compiler-dock', ['~> 1.0'], :developer
 	self.dependency 'hoe-deveiate', '~> 0.9', :developer
 	self.dependency 'hoe-bundler', '~> 1.0', :developer
 	self.dependency 'rspec', '~> 3.5', :developer
@@ -129,7 +131,7 @@ Rake::ExtensionTask.new do |ext|
 
 	# Add libpq.dll to windows binary gemspec
 	ext.cross_compiling do |spec|
-		spec.files << "lib/libpq.dll"
+		spec.files << "lib/#{spec.platform}/libpq.dll"
 	end
 end
 

data/Rakefile.cross

@@ -45,6 +45,8 @@ class CrossLibrary < OpenStruct
 		end
 		self.static_sourcesdir          = compile_home + 'sources'
 		self.static_builddir            = compile_home + 'builds' + for_platform
+		CLOBBER.include( static_sourcesdir )
+		CLEAN.include( static_builddir )
 
 		# Static OpenSSL build vars
 		self.static_openssl_builddir    = static_builddir + "openssl-#{openssl_version}"
@@ -141,9 +143,9 @@ class CrossLibrary < OpenStruct
 		end
 
 		desc "compile static openssl libraries"
-		task :openssl_libs => [ libssl, libcrypto ]
+		task "openssl_libs:#{for_platform}" => [ libssl, libcrypto ]
 
-		task :compile_static_openssl => openssl_makefile do |t|
+		task "compile_static_openssl:#{for_platform}" => openssl_makefile do |t|
 			chdir( static_openssl_builddir ) do
 				cmd = cmd_prelude.dup
 				cmd << 'make' << "-j#{NUM_CPUS}" << 'build_libs'
@@ -153,12 +155,12 @@ class CrossLibrary < OpenStruct
 		end
 
 		desc "compile static #{libssl}"
-		file libssl => :compile_static_openssl do |t|
+		file libssl => "compile_static_openssl:#{for_platform}" do |t|
 			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
 		desc "compile static #{libcrypto}"
-		file libcrypto => :compile_static_openssl do |t|
+		file libcrypto => "compile_static_openssl:#{for_platform}" do |t|
 			rm t.name.gsub(/\.a$/, ".dll.a")
 		end
 
@@ -189,7 +191,7 @@ class CrossLibrary < OpenStruct
 		end
 
 		# generate the makefile in a clean build location
-		file postgresql_global_makefile => [ static_postgresql_builddir, :openssl_libs ] do |t|
+		file postgresql_global_makefile => [ static_postgresql_builddir, "openssl_libs:#{for_platform}" ] do |t|
 			options = [
 				"--target=#{host_platform}",
 				"--host=#{host_platform}",
@@ -231,10 +233,10 @@ class CrossLibrary < OpenStruct
 
 
 		#desc 'compile libpg.a'
-		task :libpq => postgresql_lib
+		task "native:#{for_platform}" => postgresql_lib
 
 		# copy libpq.dll to lib dir
-		dest_libpq = "lib/#{postgresql_lib.basename}"
+		dest_libpq = "lib/#{for_platform}/#{postgresql_lib.basename}"
 		directory File.dirname(dest_libpq)
 		file dest_libpq => [postgresql_lib, File.dirname(dest_libpq)] do
 			cp postgresql_lib, dest_libpq
@@ -248,20 +250,15 @@ class CrossLibrary < OpenStruct
 	end
 end
 
-if File.exist?(File.expand_path("~/.rake-compiler/config.yml"))
-	CrossLibraries = [
-		['i386-mingw32', 'mingw', 'i686-w64-mingw32'],
-		['x64-mingw32', 'mingw64', 'x86_64-w64-mingw32'],
-	].map do |platform, openssl_config, toolchain|
-		CrossLibrary.new platform, openssl_config, toolchain
-	end
-else
-	$stderr.puts "Cross-compilation disabled -- rake-compiler not properly installed"
-	CrossLibraries = []
+CrossLibraries = [
+	['x86-mingw32', 'mingw', 'i686-w64-mingw32'],
+	['x64-mingw32', 'mingw64', 'x86_64-w64-mingw32'],
+].map do |platform, openssl_config, toolchain|
+	CrossLibrary.new platform, openssl_config, toolchain
 end
 
 desc 'cross compile pg for win32'
-task :cross => [ :mingw32, :libpq ]
+task :cross => [ :mingw32 ]
 
 task :mingw32 do
 	# Use Rake::ExtensionCompiler helpers to find the proper host
@@ -272,30 +269,32 @@ task :mingw32 do
 	end
 end
 
-# To reduce the gem file size strip mingw32 dlls before packaging
-ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
-  task "tmp/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so" do |t|
-    sh "i686-w64-mingw32-strip -S tmp/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so"
-  end
-
-  task "tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so" do |t|
-    sh "x86_64-w64-mingw32-strip -S tmp/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/pg_ext.so"
-  end
+task 'gem:windows:prepare' do
+	require 'io/console'
+	require 'rake_compiler_dock'
+
+	# Copy gem signing key and certs to be accessable from the docker container
+	mkdir_p 'build/gem'
+	sh "cp ~/.gem/gem-*.pem build/gem/ || true"
+	sh "bundle package"
+	begin
+		OpenSSL::PKey.read(File.read(File.expand_path("~/.gem/gem-private_key.pem")), ENV["GEM_PRIVATE_KEY_PASSPHRASE"] || "")
+	rescue OpenSSL::PKey::PKeyError
+		ENV["GEM_PRIVATE_KEY_PASSPHRASE"] = STDIN.getpass("Enter passphrase of gem signature key: ")
+		retry
+	end
 end
 
-desc "Build the windows binary gems"
-task 'gem:windows' => ['ChangeLog'] do
-  require 'rake_compiler_dock'
-
-  # Copy gem signing key and certs to be accessable from the docker container
-  mkdir_p 'build/gem'
-  sh "cp ~/.gem/gem-*.pem build/gem/ || true"
-  sh "bundle package"
-
-  RakeCompilerDock.sh <<-EOT
-    mkdir ~/.gem &&
-    (cp build/gem/gem-*.pem ~/.gem/ || true) &&
-    bundle install --local &&
-    rake cross native gem MAKE="make -j`nproc`"
-  EOT
+CrossLibraries.each do |xlib|
+	platform = xlib.for_platform
+	desc "Build fat binary gem for platform #{platform}"
+	task "gem:windows:#{platform}" => ['ChangeLog', 'gem:windows:prepare', xlib.openssl_tarball, xlib.postgresql_tarball] do
+		RakeCompilerDock.sh <<-EOT, platform: platform
+			(cp build/gem/gem-*.pem ~/.gem/ || true) &&
+			bundle install --local &&
+			rake native:#{platform} pkg/#{$hoespec.spec.full_name}-#{platform}.gem MAKE="make -j`nproc`"
+		EOT
+	end
+	desc "Build the windows binary gems"
+	multitask 'gem:windows' => "gem:windows:#{platform}"
 end

data/lib/pg.rb

@@ -22,7 +22,8 @@ rescue LoadError
 		end
 
 		# Temporary add this directory for DLL search, so that libpq.dll can be found.
-		add_dll_path.call(__dir__) do
+		# mingw32-platform strings differ (RUBY_PLATFORM=i386-mingw32 vs. x86-mingw32 for rubygems)
+		add_dll_path.call(File.join(__dir__, RUBY_PLATFORM.gsub(/^i386-/, "x86-"))) do
 			require "#{major_minor}/pg_ext"
 		end
 	else
@@ -36,7 +37,7 @@ end
 module PG
 
 	# Library version
-	VERSION = '1.2.1'
+	VERSION = '1.2.2'
 
 	# VCS revision
 	REVISION = %q$Revision: 6f611e78845a $

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: x64-mingw32
 authors:
 - Michael Granger
@@ -34,7 +34,7 @@ cert_chain:
   83uuAYSy65yXDGXXPVBeKPVnYrqp91pqpS5Nh7wfuiCrE8lgU8PATh7K4BV1UhAT
   0MHbAT42wTYkfUj3
   -----END CERTIFICATE-----
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -270,7 +270,7 @@ files:
 - lib/2.4/pg_ext.so
 - lib/2.5/pg_ext.so
 - lib/2.6/pg_ext.so
-- lib/libpq.dll
+- lib/2.7/pg_ext.so
 - lib/pg.rb
 - lib/pg/basic_type_mapping.rb
 - lib/pg/binary_decoder.rb
@@ -283,6 +283,7 @@ files:
 - lib/pg/text_encoder.rb
 - lib/pg/tuple.rb
 - lib/pg/type_map_by_column.rb
+- lib/x64-mingw32/libpq.dll
 - spec/data/expected_trace.out
 - spec/data/random_binary_data
 - spec/helpers.rb
@@ -317,15 +318,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.2'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 2.7.dev
+      version: 2.8.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/]