pg 1.5.9 → 1.7.0

data/lib/pg/text_decoder/date.rb

@@ -11,7 +11,7 @@ module PG
 		class Date < SimpleDecoder
 			def decode(string, tuple=nil, field=nil)
 				if string =~ /\A(\d{4})-(\d\d)-(\d\d)\z/
-					::Date.new $1.to_i, $2.to_i, $3.to_i
+					::Date.new $1.to_i, $2.to_i, $3.to_i, ::Date::GREGORIAN
 				else
 					string
 				end

data/lib/pg/text_decoder/json.rb

@@ -10,7 +10,7 @@ module PG
 		# As soon as this class is used, it requires the ruby standard library 'json'.
 		class JSON < SimpleDecoder
 			def decode(string, tuple=nil, field=nil)
-				::JSON.parse(string, quirks_mode: true)
+				::JSON.parse(string)
 			end
 		end
 	end

data/lib/pg/text_encoder/date.rb

@@ -6,7 +6,13 @@ module PG
 		# This is a encoder class for conversion of Ruby Date values to PostgreSQL date type.
 		class Date < SimpleEncoder
 			def encode(value)
-				value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d") : value
+				if value.respond_to?(:gregorian?)
+					# Only create a new gregorian Date object if necessary
+					value = value.gregorian unless value.gregorian?
+					value.strftime("%Y-%m-%d")
+				else
+					value
+				end
 			end
 		end
 	end

data/lib/pg/text_encoder/json.rb

@@ -10,7 +10,7 @@ module PG
 		# As soon as this class is used, it requires the ruby standard library 'json'.
 		class JSON < SimpleEncoder
 			def encode(value)
-				::JSON.generate(value, quirks_mode: true)
+				::JSON.generate(value)
 			end
 		end
 	end

data/lib/pg/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 module PG
 	# Library version
-	VERSION = '1.5.9'
+	VERSION = '1.7.0'
 end

data/lib/pg.rb

@@ -5,135 +5,161 @@
 # The top-level PG namespace.
 module PG
 
-	# Is this file part of a fat binary gem with bundled libpq?
-	bundled_libpq_path = File.join(__dir__, RUBY_PLATFORM.gsub(/^i386-/, "x86-"))
-	if File.exist?(bundled_libpq_path)
-		POSTGRESQL_LIB_PATH = bundled_libpq_path
-	else
-		bundled_libpq_path = nil
-		# Try to load libpq path as found by extconf.rb
-		begin
-			require "pg/postgresql_lib_path"
-		rescue LoadError
-			# rake-compiler doesn't use regular "make install", but uses it's own install tasks.
-			# It therefore doesn't copy pg/postgresql_lib_path.rb in case of "rake compile".
-			POSTGRESQL_LIB_PATH = false
-		end
-	end
-
-	add_dll_path = proc do |path, &block|
-		if RUBY_PLATFORM =~/(mswin|mingw)/i && path && File.exist?(path)
-			begin
-				require 'ruby_installer/runtime'
-				RubyInstaller::Runtime.add_dll_directory(path, &block)
-			rescue LoadError
-				old_path = ENV['PATH']
-				ENV['PATH'] = "#{path};#{old_path}"
-				block.call
-				ENV['PATH'] = old_path
-			end
-		else
-			# No need to set a load path manually - it's set as library rpath.
-			block.call
-		end
-	end
-
-	# Add a load path to the one retrieved from pg_config
-	add_dll_path.call(POSTGRESQL_LIB_PATH) do
-		if bundled_libpq_path
-			# It's a Windows binary gem, try the <major>.<minor> subdirectory
-			major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
-				raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
-			require "#{major_minor}/pg_ext"
-		else
-			require 'pg_ext'
-		end
-	end
-
-	# Get the PG library version.
-	#
-	# +include_buildnum+ is no longer used and any value passed will be ignored.
-	def self.version_string( include_buildnum=nil )
-		"%s %s" % [ self.name, VERSION ]
-	end
-
-
-	### Convenience alias for PG::Connection.new.
-	def self.connect( *args, &block )
-		Connection.new( *args, &block )
-	end
-
-	if defined?(Ractor.make_shareable)
-		def self.make_shareable(obj)
-			Ractor.make_shareable(obj)
-		end
-	else
-		def self.make_shareable(obj)
-			obj.freeze
-		end
-	end
-
-	module BinaryDecoder
-		%i[ TimestampUtc TimestampUtcToLocal TimestampLocal ].each do |klass|
-			autoload klass, 'pg/binary_decoder/timestamp'
-		end
-		autoload :Date, 'pg/binary_decoder/date'
-	end
-	module BinaryEncoder
-		%i[ TimestampUtc TimestampLocal ].each do |klass|
-			autoload klass, 'pg/binary_encoder/timestamp'
-		end
-	end
-	module TextDecoder
-		%i[ TimestampUtc TimestampUtcToLocal TimestampLocal TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
-			autoload klass, 'pg/text_decoder/timestamp'
-		end
-		autoload :Date, 'pg/text_decoder/date'
-		autoload :Inet, 'pg/text_decoder/inet'
-		autoload :JSON, 'pg/text_decoder/json'
-		autoload :Numeric, 'pg/text_decoder/numeric'
-	end
-	module TextEncoder
-		%i[ TimestampUtc TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
-			autoload klass, 'pg/text_encoder/timestamp'
-		end
-		autoload :Date, 'pg/text_encoder/date'
-		autoload :Inet, 'pg/text_encoder/inet'
-		autoload :JSON, 'pg/text_encoder/json'
-		autoload :Numeric, 'pg/text_encoder/numeric'
-	end
-
-	autoload :BasicTypeMapBasedOnResult, 'pg/basic_type_map_based_on_result'
-	autoload :BasicTypeMapForQueries, 'pg/basic_type_map_for_queries'
-	autoload :BasicTypeMapForResults, 'pg/basic_type_map_for_results'
-	autoload :BasicTypeRegistry, 'pg/basic_type_registry'
-	require 'pg/exceptions'
-	require 'pg/coder'
-	require 'pg/type_map_by_column'
-	require 'pg/connection'
-	require 'pg/result'
-	require 'pg/tuple'
-	autoload :VERSION, 'pg/version'
-
-
-	# Avoid "uninitialized constant Truffle::WarningOperations" on Truffleruby up to 22.3.1
-	if RUBY_ENGINE=="truffleruby" && !defined?(Truffle::WarningOperations)
-		module TruffleFixWarn
-			def warn(str, category=nil)
-				super(str)
-			end
-		end
-		Warning.extend(TruffleFixWarn)
-	end
-
-	# Ruby-3.4+ prints a warning, if bigdecimal is required but not in the Gemfile.
-	# But it's a false positive, since we enable bigdecimal depending features only if it's available.
-	# And most people don't need these features.
-	def self.require_bigdecimal_without_warning
-		oldverb, $VERBOSE = $VERBOSE, nil
-		require "bigdecimal"
-	ensure
-		$VERBOSE = oldverb
-	end
+  # Is this file part of a fat binary gem with bundled libpq?
+  # This path must be enabled by add_dll_directory on Windows.
+  gplat = Gem::Platform.local
+  bundled_libpq_path = Dir[File.expand_path("../ports/#{gplat.cpu}-#{gplat.os}*/lib", __dir__)].first
+  if bundled_libpq_path
+    POSTGRESQL_LIB_PATH = bundled_libpq_path
+  else
+    # Try to load libpq path as found by extconf.rb
+    begin
+      require "pg/postgresql_lib_path"
+    rescue LoadError
+      # rake-compiler doesn't use regular "make install", but uses it's own install tasks.
+      # It therefore doesn't copy pg/postgresql_lib_path.rb in case of "rake compile".
+      POSTGRESQL_LIB_PATH = false
+    end
+  end
+  POSTGRESQL_LIB_PATH.freeze
+
+  add_dll_path = proc do |path, &block|
+    if RUBY_PLATFORM =~/(mswin|mingw)/i && path
+      BUNDLED_LIBPQ_WITH_UNIXSOCKET = false
+      begin
+        require 'ruby_installer/runtime'
+        RubyInstaller::Runtime.add_dll_directory(path, &block)
+      rescue LoadError
+        old_path = ENV['PATH']
+        ENV['PATH'] = "#{path};#{old_path}"
+        block.call
+        ENV['PATH'] = old_path
+      end
+    else
+      # libpq is found by a relative rpath in the cross compiled extension dll
+      # or by the system library loader
+      block.call
+      BUNDLED_LIBPQ_WITH_UNIXSOCKET = RUBY_PLATFORM=~/linux/i && PG::IS_BINARY_GEM
+    end
+  end
+
+  # Add a load path to the one retrieved from pg_config
+  add_dll_path.call(POSTGRESQL_LIB_PATH) do
+    begin
+      # Try the <major>.<minor> subdirectory for fat binary gems
+      major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
+        raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
+      require "#{major_minor}/pg_ext"
+    rescue LoadError => error1
+      begin
+        require 'pg_ext'
+      rescue LoadError => error2
+        msg = <<~EOT
+          pg's C extension failed to load:
+            #{error1}
+            #{error2}
+        EOT
+        if msg =~ /GLIBC/
+          msg += <<~EOT
+
+            The GLIBC version of this system seems too old. Please use the source version of pg:
+                gem uninstall pg --all
+                gem install pg --platform ruby
+            or in your Gemfile:
+                gem "pg", force_ruby_platform: true
+            See also: https://deveiate.org/code/pg/README_md.html#label-Source+gem
+          EOT
+        end
+        raise error2, msg
+      end
+    end
+  end
+
+  # Get the PG library version.
+  #
+  # +include_buildnum+ is no longer used and any value passed will be ignored.
+  def self.version_string( include_buildnum=nil )
+    "%s %s" % [ self.name, VERSION ]
+  end
+
+
+  ### Convenience alias for PG::Connection.new.
+  def self.connect( *args, &block )
+    Connection.new( *args, &block )
+  end
+
+  if defined?(Ractor.make_shareable)
+    def self.make_shareable(obj)
+      Ractor.make_shareable(obj)
+    end
+  else
+    def self.make_shareable(obj)
+      obj.freeze
+    end
+  end
+
+  module BinaryDecoder
+    %i[ TimestampUtc TimestampUtcToLocal TimestampLocal ].each do |klass|
+      autoload klass, 'pg/binary_decoder/timestamp'
+    end
+    autoload :Date, 'pg/binary_decoder/date'
+  end
+  module BinaryEncoder
+    %i[ TimestampUtc TimestampLocal ].each do |klass|
+      autoload klass, 'pg/binary_encoder/timestamp'
+    end
+  end
+  module TextDecoder
+    %i[ TimestampUtc TimestampUtcToLocal TimestampLocal TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
+      autoload klass, 'pg/text_decoder/timestamp'
+    end
+    autoload :Date, 'pg/text_decoder/date'
+    autoload :Inet, 'pg/text_decoder/inet'
+    autoload :JSON, 'pg/text_decoder/json'
+    autoload :Numeric, 'pg/text_decoder/numeric'
+  end
+  module TextEncoder
+    %i[ TimestampUtc TimestampWithoutTimeZone TimestampWithTimeZone ].each do |klass|
+      autoload klass, 'pg/text_encoder/timestamp'
+    end
+    autoload :Date, 'pg/text_encoder/date'
+    autoload :Inet, 'pg/text_encoder/inet'
+    autoload :JSON, 'pg/text_encoder/json'
+    autoload :Numeric, 'pg/text_encoder/numeric'
+  end
+
+  autoload :BasicTypeMapBasedOnResult, 'pg/basic_type_map_based_on_result'
+  autoload :BasicTypeMapForQueries, 'pg/basic_type_map_for_queries'
+  autoload :BasicTypeMapForResults, 'pg/basic_type_map_for_results'
+  autoload :BasicTypeRegistry, 'pg/basic_type_registry'
+  require 'pg/exceptions'
+  require 'pg/coder'
+  require 'pg/type_map_by_column'
+  require 'pg/connection'
+  require 'pg/cancel_connection'
+  require 'pg/result'
+  require 'pg/tuple'
+  autoload :VERSION, 'pg/version'
+
+
+  # Avoid "uninitialized constant Truffle::WarningOperations" on Truffleruby up to 22.3.1
+  if RUBY_ENGINE=="truffleruby" && !defined?(Truffle::WarningOperations)
+    module TruffleFixWarn
+      def warn(str, category=nil)
+        super(str)
+      end
+    end
+    Warning.extend(TruffleFixWarn)
+  end
+
+  # Ruby-3.4+ prints a warning, if bigdecimal is required but not in the Gemfile.
+  # But it's a false positive, since we enable bigdecimal depending features only if it's available.
+  # And most people don't need these features.
+  def self.require_bigdecimal_without_warning
+    oldverb, $VERBOSE = $VERBOSE, nil
+    require "bigdecimal"
+  ensure
+    $VERBOSE = oldverb
+  end
 
 end # module PG

data/misc/glibc/Dockerfile

@@ -0,0 +1,20 @@
+FROM debian:10.13
+
+WORKDIR /pg
+
+# Debian 10.13 is EOL now:
+RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list
+
+RUN apt-get update && apt-get install ruby git wget gcc make libz-dev libffi-dev libreadline-dev libyaml-dev libssl-dev -y
+
+ENV RBENV_ROOT=/usr/local/rbenv
+
+RUN git clone https://github.com/rbenv/rbenv.git      ${RBENV_ROOT} && \
+    git clone https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
+    $RBENV_ROOT/bin/rbenv init
+
+RUN $RBENV_ROOT/bin/rbenv install 3.3.9 -- --disable-install-doc
+RUN /usr/local/rbenv/versions/3.3.9/bin/gem inst rspec
+
+CMD /usr/local/rbenv/versions/3.3.9/bin/gem inst --local pg-*.gem && \
+    /usr/local/rbenv/versions/3.3.9/bin/rspec glibc_spec.rb

data/misc/glibc/docker-compose.yml

@@ -0,0 +1,9 @@
+services:
+  pg:
+    build:
+      context: .
+      args:
+        - http_proxy
+        - https_proxy
+    volumes:
+      - .:/pg

data/misc/glibc/glibc_spec.rb

@@ -0,0 +1,5 @@
+RSpec.describe "require 'pg'" do
+  it "gives a descriptive error message when GLIBC is too old" do
+    expect { require "pg" }.to raise_error(/GLIBC.*gem install pg --platform ruby/m)
+  end
+end

data/misc/yugabyte/Dockerfile

@@ -0,0 +1,9 @@
+FROM yugabytedb/yugabyte:2024.1.0.0-b129
+
+WORKDIR /app
+
+RUN yugabyted cert generate_server_certs --hostnames=127.0.0.1 --base_dir=.
+
+ENTRYPOINT ["yugabyted"]
+CMD ["start", "--background", "false", "--ui", "false", "--tserver_flags", "use_client_to_server_encryption=true,cert_node_filename=127.0.0.1,certs_dir=/app/generated_certs/127.0.0.1"]
+VOLUME /app

data/misc/yugabyte/docker-compose.yml

@@ -0,0 +1,28 @@
+services:
+  yb:
+    build: .
+    container_name: yb
+    ports:
+      - "127.0.0.1:5433:5433"
+    volumes:
+      - certs:/app/generated_certs
+    healthcheck:
+      test: 'ysqlsh -h $$(hostname) -c \\conninfo || exit 1;'
+      interval: 2s
+      timeout: 30s
+      retries: 20
+      start_period: 10s
+
+  pg:
+    image: ruby:4.0
+    working_dir: /app
+    volumes:
+      - .:/app
+      - certs:/generated_certs
+    command: bash -c "gem inst pg-*.gem && ruby pg-test.rb"
+    depends_on:
+      yb:
+        condition: service_healthy
+
+volumes:
+  certs:

data/misc/yugabyte/pg-test.rb

@@ -0,0 +1,45 @@
+require 'pg'
+
+conn = PG.connect(
+  host: 'yb',
+  port: 5433,
+  user: 'yugabyte',
+  dbname: 'yugabyte',
+  sslmode: 'require',
+  sslrootcert: 'app/generated_certs/127.0.0.1/ca.crt',
+  sslcert: 'app/generated_certs/127.0.0.1/node.127.0.0.1.crt',
+  sslkey: 'app/generated_certs/127.0.0.1/node.127.0.0.1.key'
+)
+
+$stdout.sync = true
+# fd = File.open("pg_trace.log", "a+")
+# conn.trace(fd)
+
+begin
+  # Validate connection is working
+  res = conn.exec("SELECT version();")
+  res.each_row do |row|
+    puts "You are connected to: #{row[0]}"
+  end
+# 53*511
+# 53*767
+# 53*1023
+# 53*1279
+# 7*1817
+# 11*1487
+# 13*1363
+# 16*1211
+# 18*1128
+# 22*1984
+# 27*1723
+
+  (22..53).each do |m|
+    (1..2048).each do |l|
+      hanging_query = "SELECT lpad(''::text, #{m}, '0') FROM generate_series(1, #{l});"
+      puts "Executing hanging query: #{hanging_query}"
+      conn.exec(hanging_query)
+    end
+  end
+ensure
+  conn.close if conn
+end

data/pg.gemspec

@@ -10,15 +10,17 @@ Gem::Specification.new do |spec|
   spec.email         = ["ged@FaerieMUD.org", "lars@greiz-reinsdorf.de"]
 
   spec.summary       = "Pg is the Ruby interface to the PostgreSQL RDBMS"
-  spec.description   = "Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL 9.3 and later."
+  spec.description   = "Pg is the Ruby interface to the PostgreSQL RDBMS. It works with PostgreSQL 10 and later."
   spec.homepage      = "https://github.com/ged/ruby-pg"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = ">= 2.5"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/ged/ruby-pg"
-  spec.metadata["changelog_uri"] = "https://github.com/ged/ruby-pg/blob/master/History.md"
+  spec.metadata["changelog_uri"] = "https://github.com/ged/ruby-pg/blob/master/CHANGELOG.md"
   spec.metadata["documentation_uri"] = "http://deveiate.org/code/pg"
+  # https://github.com/oneclick/rubyinstaller2/wiki/For-gem-developers#msys2-library-dependency
+  spec.metadata["msys2_mingw_dependencies"] = "postgresql"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/ports/patches/krb5/1.22.2/0001-Allow-static-linking-krb5-library.patch

@@ -0,0 +1,30 @@
+From e82c1b395162ea71279ea2170259383082e41ab0 Mon Sep 17 00:00:00 2001
+From: Lars Kanis <lars@greiz-reinsdorf.de>
+Date: Sat, 12 Jul 2025 10:55:17 +0200
+Subject: [PATCH] Allow static linking krb5 library
+
+Otherwise it fails with:
+  Undefined symbols for architecture arm64:
+    "_krb5int_c_mit_des_zeroblock", referenced from:
+      _krb5int_des3_cbc_encrypt in libk5crypto.a(d3_aead.o)
+      _krb5int_des3_cbc_decrypt in libk5crypto.a(d3_aead.o)
+---
+ src/lib/crypto/builtin/des/des_int.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/crypto/builtin/des/des_int.h b/src/lib/crypto/builtin/des/des_int.h
+index 46fed7dbd..114e48ebd 100644
+--- a/lib/crypto/builtin/des/des_int.h
++++ b/lib/crypto/builtin/des/des_int.h
+@@ -159,7 +159,7 @@ mit_des_cbc_encrypt(const mit_des_cblock *in, mit_des_cblock *out,
+                     const mit_des_cblock ivec, int enc);
+ 
+ #define mit_des_zeroblock krb5int_c_mit_des_zeroblock
+-extern const mit_des_cblock mit_des_zeroblock;
++const mit_des_cblock mit_des_zeroblock;
+ 
+ /* fin_rndkey.c */
+ krb5_error_code mit_des_finish_random_key(const krb5_encrypt_block *,
+-- 
+2.43.0
+

data/ports/patches/krb5/1.22.2/0002-unknown-command-line-option-on-clang.patch

@@ -0,0 +1,12 @@
+diff --git a/src/lib/krb5/krb/deltat.c b/src/lib/krb5/krb/deltat.c
+index 03145c854..34cdf969e 100644
+--- a/lib/krb5/krb/deltat.c
++++ b/lib/krb5/krb/deltat.c
+@@ -44,7 +44,6 @@
+ #ifdef __GNUC__
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wuninitialized"
+-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+ #endif
+
+ #include "k5-int.h"

data/ports/patches/postgresql/18.6/0001-Use-workaround-of-__builtin_setjmp-only-on-MINGW-on-.patch

@@ -0,0 +1,42 @@
+From 746e8e250b265c40d9706f26560e02e8623f123f Mon Sep 17 00:00:00 2001
+From: Lars Kanis <lars@greiz-reinsdorf.de>
+Date: Fri, 31 Jan 2025 21:58:00 +0100
+Subject: [PATCH] Use workaround of __builtin_setjmp only on MINGW on MSVCRT
+
+Because it is not present on ARM64 on Windows and not necessary on any UCRT based toolchain.
+---
+ src/include/c.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/include/c.h b/src/include/c.h
+index a14c631516..33792c860c 100644
+--- a/src/include/c.h
++++ b/src/include/c.h
+@@ -1312,19 +1312,19 @@ extern int	fdatasync(int fildes);
+ /*
+  * When there is no sigsetjmp, its functionality is provided by plain
+  * setjmp.  We now support the case only on Windows.  However, it seems
+- * that MinGW-64 has some longstanding issues in its setjmp support,
+- * so on that toolchain we cheat and use gcc's builtins.
++ * that MinGW-64 on x86_64 has some longstanding issues in its setjmp
++ * support, so on that toolchain we cheat and use gcc's builtins.
+  */
+ #ifdef WIN32
+-#ifdef __MINGW64__
++#if defined(__MINGW64__) && !defined(_UCRT)
+ typedef intptr_t sigjmp_buf[5];
+ #define sigsetjmp(x,y) __builtin_setjmp(x)
+ #define siglongjmp __builtin_longjmp
+-#else							/* !__MINGW64__ */
++#else							/* !defined(__MINGW64__) || defined(_UCRT) */
+ #define sigjmp_buf jmp_buf
+ #define sigsetjmp(x,y) setjmp(x)
+ #define siglongjmp longjmp
+-#endif							/* __MINGW64__ */
++#endif							/* defined(__MINGW64__) && !defined(_UCRT) */
+ #endif							/* WIN32 */
+ 
+ /* /port compatibility functions */
+-- 
+2.43.0
+

data/rakelib/pg_gem_helper.rb

@@ -0,0 +1,64 @@
+require 'bundler'
+require 'bundler/gem_helper'
+
+class PgGemHelper < Bundler::GemHelper
+  attr_accessor :cross_platforms
+
+  def install
+    super
+
+    task "release:guard_clean" => ["release:update_history"]
+
+    task "release:update_history" do
+      update_history
+    end
+
+    task "release:rubygem_push" => ["gem:native"]
+  end
+
+  def hfile
+    "CHANGELOG.md"
+  end
+
+  def headline
+    '^([^\n]*)(\d+\.\d+\.\d+(?:\.\w+)?)([^\w]+)([2Y][0Y][0-9Y][0-9Y]-[0-1M][0-9M]-[0-3D][0-9D])([^\w]*|$)'
+  end
+
+  def reldate
+    Time.now.strftime("%Y-%m-%d")
+  end
+
+  def update_history
+    hin = File.read(hfile)
+    hout = hin.sub(/#{headline}/) do
+      raise "#{hfile} isn't up-to-date for version #{version} (!= #{$2})" unless $2==version.to_s
+      $1 + $2 + $3 + reldate + $5
+    end
+    if hout != hin
+      Bundler.ui.confirm "Updating #{hfile} for release."
+      File.write(hfile, hout)
+      Rake::FileUtilsExt.sh "git", "commit", hfile, "-m", "Update release date in #{hfile}"
+    end
+  end
+
+  def tag_version
+    Bundler.ui.confirm "Tag release with annotation:"
+    m = File.read(hfile).match(/(?<annotation>#{headline}.*?)#{headline}/m) || raise("Unable to find release notes in #{hfile}")
+    Bundler.ui.info(m[:annotation].gsub(/^/, "    "))
+    IO.popen(["git", "tag", "--file=-", version_tag], "w") do |fd|
+      fd.write m[:annotation]
+    end
+    yield if block_given?
+  rescue
+    Bundler.ui.error "Untagging #{version_tag} due to error."
+    Rake::FileUtilsExt.sh "git", "tag", "-d", version_tag
+    raise
+  end
+
+  def rubygem_push(path)
+    cross_platforms.each do |ruby_platform|
+      super(path.gsub(/\.gem\z/, "-#{ruby_platform}.gem"))
+    end
+    super(path)
+  end
+end

data/sample/async_mixed.rb

@@ -5,7 +5,7 @@ require 'pg'
 $stdout.sync = true
 
 # This is a example of how to mix and match synchronous and async APIs. In this case,
-# the connection to the server is made syncrhonously, and then queries are
+# the connection to the server is made synchronously, and then queries are
 # asynchronous.
 
 TIMEOUT = 5.0 # seconds to wait for an async operation to complete