re2 1.6.0 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2151621115d04b197403c0f67276347c205928136405c05aac1fc70bf3a00dec
-  data.tar.gz: 8ba805a95c535ab7d30296a830448dea51da4f5f699a6aa3f858296b2590d188
+  metadata.gz: e6e122dcf14c604d1cea516e7c6839bddc2144ff2a9ea96f90d4dc874e8f9056
+  data.tar.gz: 1a8e2b6444b9b3702c6e995a59069a681a615242fce804e824c9cd009d515745
 SHA512:
-  metadata.gz: 010e20dae629df302c35c6d5cc412c5a0add1cc3f0b6357114ce64c5d77e6c3bbca7401e57c0b86be5fe87acae17162cd7c860c079dc2c57898761f9fd8d4ce4
-  data.tar.gz: 6bfa2db432e91b87ab5d6fa21babd07a675df3b22904e20f1491322b1d34c8fe1c5814783049c33f84ab8f22e0b3c2ef9c2308161f8694dd6bcbd8ec4da278a4
+  metadata.gz: 9f8f4ffca57e02a52830c67a2177d509575d435ad1006e2fd5d3b435efecb7412d5507872fde660fb602d1c5cc8416a436719fac31b8d985a263f36e53626955
+  data.tar.gz: 6bc970e290326fb83473e3954e74d4de47a6d23a8200be6eae3a90e6df4a6b671d33cba1be74c456288274a178fa9deebb1aa6de205866bacf4a9ee5436ba5bb

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/Gemfile

@@ -0,0 +1,13 @@
+source "https://rubygems.org"
+
+gemspec
+
+rake_constraint = if RUBY_VERSION < "1.9.3"
+                    "< 11.0.0"
+                  elsif RUBY_VERSION < "2.0.0"
+                    "< 12.0.0"
+                  else
+                    "> 12.3.2"
+                  end
+
+gem "rake", rake_constraint

data/README.md

@@ -4,9 +4,9 @@ re2 [![Build Status](https://github.com/mudge/re2/actions/workflows/tests.yml/ba
 A Ruby binding to [re2][], an "efficient, principled regular expression
 library".
 
-**Current version:** 1.6.0  
-**Supported Ruby versions:** 1.8.7, 1.9.3, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1  
-**Supported re2 versions:** libre2.0 (< 2020-03-02), libre2.1 (2020-03-02), libre2.6 (2020-03-03), libre2.7 (2020-05-01), libre2.8 (2020-07-06), libre2.9 (2020-11-01)
+**Current version:** 1.7.0  
+**Supported Ruby versions:** 1.8.7, 1.9.3, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2  
+**Supported re2 versions:** libre2.0 (< 2020-03-02), libre2.1 (2020-03-02), libre2.6 (2020-03-03), libre2.7 (2020-05-01), libre2.8 (2020-07-06), libre2.9 (2020-11-01), libre2.10 (2022-12-01), libre2.11 (2023-07-01)
 
 Installation
 ------------
@@ -22,7 +22,7 @@ If you are using Debian, you can install the [libre2-dev][] package like so:
 
     $ sudo apt-get install libre2-dev
 
-Recent versions of re2 require a compiler with C++11 support such as [clang](http://clang.llvm.org/) 3.4 or [gcc](https://gcc.gnu.org/) 4.8.
+Recent versions of re2 require a compiler with C++14 support such as [clang](http://clang.llvm.org/) 3.4 or [gcc](https://gcc.gnu.org/) 5.
 
 If you are using a packaged Ruby distribution, make sure you also have the
 Ruby header files installed such as those provided by the [ruby-dev][] package
@@ -214,7 +214,7 @@ Contributions
 * Thanks to [Jason Woods](https://github.com/driskell) who contributed the
   original implementations of `RE2::MatchData#begin` and `RE2::MatchData#end`;
 * Thanks to [Stefano Rivera](https://github.com/stefanor) who first contributed C++11 support;
-* Thanks to [Stan Hu](https://github.com/stanhu) for reporting a bug with empty patterns and `RE2::Regexp#scan`;
+* Thanks to [Stan Hu](https://github.com/stanhu) for reporting a bug with empty patterns and `RE2::Regexp#scan` and for contributing support for libre2.11 (2023-07-01);
 * Thanks to [Sebastian Reitenbach](https://github.com/buzzdeee) for reporting
   the deprecation and removal of the `utf8` encoding option in re2;
 * Thanks to [Sergio Medina](https://github.com/serch) for reporting a bug when

data/Rakefile

@@ -1,10 +1,155 @@
+# frozen_string_literal: true
+
 require 'rake/extensiontask'
 require 'rspec/core/rake_task'
+require 'rake_compiler_dock'
+require 'yaml'
+
+require_relative 'ext/re2/recipes'
+
+CLEAN.include FileList['**/*{.o,.so,.dylib,.bundle}'],
+              FileList['**/extconf.h'],
+              FileList['**/Makefile'],
+              FileList['pkg/']
+
+CLOBBER.include FileList['**/tmp'],
+                FileList['**/*.log'],
+                FileList['doc/**'],
+                FileList['tmp/']
+CLOBBER.add("ports/*").exclude(%r{ports/archives$})
+
+RE2_GEM_SPEC = Gem::Specification.load('re2.gemspec')
+
+task :prepare do
+  puts "Preparing project for gem building..."
+  recipes = load_recipes
+  recipes.each { |recipe| recipe.download }
+end
+
+task gem: :prepare
 
-Rake::ExtensionTask.new('re2')
+Gem::PackageTask.new(RE2_GEM_SPEC) do |p|
+  p.need_zip = false
+  p.need_tar = false
+end
+
+CROSS_RUBY_VERSIONS = %w[3.2.0 3.1.0 3.0.0 2.7.0].join(':')
+CROSS_RUBY_PLATFORMS = %w[
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x64-mingw-ucrt
+  x64-mingw32
+  x86-linux
+  x86-mingw32
+  x86_64-darwin
+  x86_64-linux
+].freeze
+
+ENV['RUBY_CC_VERSION'] = CROSS_RUBY_VERSIONS
+
+Rake::ExtensionTask.new('re2', RE2_GEM_SPEC) do |e|
+  e.cross_compile = true
+  e.cross_config_options << '--enable-cross-build'
+  e.config_options << '--disable-system-libraries'
+  e.cross_platform = CROSS_RUBY_PLATFORMS
+  e.cross_compiling do |spec|
+    spec.files.reject! { |path| File.fnmatch?('ports/*', path) }
+    spec.dependencies.reject! { |dep| dep.name == 'mini_portile2' }
+  end
+end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :spec    => :compile
-task :default => :spec
+namespace 'gem' do
+  def gem_builder(platform)
+    # use Task#invoke because the pkg/*gem task is defined at runtime
+    Rake::Task["native:#{platform}"].invoke
+    Rake::Task["pkg/#{RE2_GEM_SPEC.full_name}-#{Gem::Platform.new(platform)}.gem"].invoke
+  end
+
+  CROSS_RUBY_PLATFORMS.each do |platform|
+    # The Linux x86 image (ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x86_64-linux)
+    # is based on CentOS 7 and has two versions of cmake installed:
+    # a 2.8 version in /usr/bin and a 3.25 in /usr/local/bin. The latter is needed by abseil.
+    cmake =
+      case platform
+      when 'x86_64-linux', 'x86-linux'
+        '/usr/local/bin/cmake'
+      else
+        'cmake'
+      end
+
+    desc "build native gem for #{platform} platform"
+    task platform do
+      RakeCompilerDock.sh <<~SCRIPT, platform: platform, verbose: true
+        gem install bundler --no-document &&
+        bundle &&
+        bundle exec rake gem:#{platform}:builder CMAKE=#{cmake}
+      SCRIPT
+    end
+
+    namespace platform do
+      desc "build native gem for #{platform} platform (guest container)"
+      task 'builder' do
+        gem_builder(platform)
+      end
+    end
+  end
+
+  desc 'build all native gems'
+  multitask 'native' => CROSS_RUBY_PLATFORMS
+end
+
+def add_file_to_gem(relative_source_path)
+  dest_path = File.join(gem_build_path, relative_source_path)
+  dest_dir = File.dirname(dest_path)
+
+  mkdir_p dest_dir unless Dir.exist?(dest_dir)
+  rm_f dest_path if File.exist?(dest_path)
+  safe_ln relative_source_path, dest_path
+
+  RE2_GEM_SPEC.files << relative_source_path
+end
+
+def gem_build_path
+  File.join 'pkg', RE2_GEM_SPEC.full_name
+end
+
+def add_vendored_libraries
+  dependencies = YAML.load_file(File.join(File.dirname(__FILE__), 'dependencies.yml'))
+  abseil_archive = File.join('ports', 'archives', "#{dependencies['abseil']['version']}.tar.gz")
+  libre2_archive = File.join('ports', 'archives', "re2-#{dependencies['libre2']['version']}.tar.gz")
+
+  add_file_to_gem(abseil_archive)
+  add_file_to_gem(libre2_archive)
+end
+
+task gem_build_path do
+  add_vendored_libraries
+end
+
+desc "Temporarily set VERSION to a unique timestamp"
+task "set-version-to-timestamp" do
+  # this task is used by bin/test-gem-build
+  # to test building, packaging, and installing a precompiled gem
+  version_constant_re = /^\s*VERSION\s*=\s*["'](.*)["']$/
+
+  version_file_path = File.join(__dir__, "lib/re2/version.rb")
+  version_file_contents = File.read(version_file_path)
+
+  current_version_string = version_constant_re.match(version_file_contents)[1]
+  current_version = Gem::Version.new(current_version_string)
+
+  fake_version = Gem::Version.new(format("%s.test.%s", current_version.bump, Time.now.strftime("%Y.%m%d.%H%M")))
+
+  unless version_file_contents.gsub!(version_constant_re, "    VERSION = \"#{fake_version}\"")
+    raise("Could not hack the VERSION constant")
+  end
+
+  File.open(version_file_path, "w") { |f| f.write(version_file_contents) }
+
+  puts "NOTE: wrote version as \"#{fake_version}\""
+end
 
+task default: [:compile, :spec]

data/dependencies.yml

@@ -0,0 +1,9 @@
+libre2:
+  version: "2023-07-01"
+  sha256: "18cf85922e27fad3ed9c96a27733037da445f35eb1a2744c306a37c6d11e95c4"
+  # sha-256 hash provided in https://github.com/google/re2/releases/download/2023-07-01/re2-2023-07-01.tar.gz
+
+abseil:
+  version: "20230125.3"
+  sha256: 5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36
+  # sha-256 hash provided in https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz

data/ext/re2/extconf.rb

@@ -5,6 +5,107 @@
 # Released under the BSD Licence, please see LICENSE.txt
 
 require 'mkmf'
+require_relative 'recipes'
+
+RE2_HELP_MESSAGE = <<~HELP
+  USAGE: ruby #{$0} [options]
+
+    Flags that are always valid:
+
+      --enable-system-libraries
+          Use system libraries instead of building and using the packaged libraries.
+
+      --disable-system-libraries
+          Use the packaged libraries, and ignore the system libraries. This is the default.
+
+
+    Flags only used when using system libraries:
+
+      Related to re2 library:
+
+        --with-re2-dir=DIRECTORY
+            Look for re2 headers and library in DIRECTORY.
+
+
+    Flags only used when building and using the packaged libraries:
+
+      --enable-cross-build
+          Enable cross-build mode. (You probably do not want to set this manually.)
+
+
+    Environment variables used:
+
+      CC
+          Use this path to invoke the compiler instead of `RbConfig::CONFIG['CC']`
+
+      CPPFLAGS
+          If this string is accepted by the C preprocessor, add it to the flags passed to the C preprocessor
+
+      CFLAGS
+          If this string is accepted by the compiler, add it to the flags passed to the compiler
+
+      LDFLAGS
+          If this string is accepted by the linker, add it to the flags passed to the linker
+
+      LIBS
+          Add this string to the flags passed to the linker
+HELP
+
+#
+#  utility functions
+#
+def config_system_libraries?
+  enable_config("system-libraries", ENV.key?('RE2_USE_SYSTEM_LIBRARIES'))
+end
+
+def config_cross_build?
+  enable_config("cross-build")
+end
+
+def concat_flags(*args)
+  args.compact.join(" ")
+end
+
+def do_help
+  print(RE2_HELP_MESSAGE)
+  exit!(0)
+end
+
+def darwin?
+  RbConfig::CONFIG["target_os"].include?("darwin")
+end
+
+def windows?
+  RbConfig::CONFIG["target_os"].match?(/mingw|mswin/)
+end
+
+def freebsd?
+  RbConfig::CONFIG["target_os"].include?("freebsd")
+end
+
+def target_host
+  # We use 'host' to set compiler prefix for cross-compiling. Prefer host_alias over host. And
+  # prefer i686 (what external dev tools use) to i386 (what ruby's configure.ac emits).
+  host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
+  host.gsub(/i386/, "i686")
+end
+
+def target_arch
+  RbConfig::CONFIG['arch']
+end
+
+def with_temp_dir
+  Dir.mktmpdir do |temp_dir|
+    Dir.chdir(temp_dir) do
+      yield
+    end
+  end
+end
+
+#
+#  main
+#
+do_help if arg_config('--help')
 
 if ENV["CC"]
   RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"]
@@ -16,62 +117,57 @@ if ENV["CXX"]
   RbConfig::CONFIG["CXX"] = ENV["CXX"]
 end
 
-header_dirs = [
-  "/usr/local/include",
-  "/opt/homebrew/include",
-  "/usr/include"
-]
-
-lib_dirs = [
-  "/usr/local/lib",
-  "/opt/homebrew/lib",
-  "/usr/lib"
-]
-
-dir_config("re2", header_dirs, lib_dirs)
+def build_extension
+  $CFLAGS << " -Wall -Wextra -funroll-loops"
 
-$CFLAGS << " -Wall -Wextra -funroll-loops"
+  # Pass -x c++ to force gcc to compile the test program
+  # as C++ (as it will end in .c by default).
+  compile_options = "-x c++"
 
-# Pass -x c++ to force gcc to compile the test program
-# as C++ (as it will end in .c by default).
-compile_options = "-x c++"
+  have_library("stdc++")
+  have_header("stdint.h")
+  have_func("rb_str_sublen")
 
-have_library("stdc++")
-have_header("stdint.h")
-have_func("rb_str_sublen")
-
-unless have_library("re2")
-  abort "You must have re2 installed and specified with --with-re2-dir, please see https://github.com/google/re2/wiki/Install"
-end
+  unless have_library("re2")
+    abort "You must have re2 installed and specified with --with-re2-dir, please see https://github.com/google/re2/wiki/Install"
+  end
 
-# Recent versions of re2 now require a compiler with C++11 support
-checking_for("re2 requires C++11 compiler") do
   minimal_program = <<SRC
 #include <re2/re2.h>
 int main() { return 0; }
 SRC
 
-  unless try_compile(minimal_program, compile_options)
-    if try_compile(minimal_program, compile_options + " -std=c++11")
-      compile_options << " -std=c++11"
-      $CPPFLAGS << " -std=c++11"
-    elsif try_compile(minimal_program, compile_options + " -std=c++0x")
-      compile_options << " -std=c++0x"
-      $CPPFLAGS << " -std=c++0x"
-    else
-      abort "Cannot compile re2 with your compiler: recent versions require C++11 support."
+  re2_requires_version_flag = checking_for("re2 that requires explicit C++ version flag") do
+    !try_compile(minimal_program, compile_options)
+  end
+
+  if re2_requires_version_flag
+    # Recent versions of re2 depend directly on abseil, which requires a
+    # compiler with C++14 support (see
+    # https://github.com/abseil/abseil-cpp/issues/1127 and
+    # https://github.com/abseil/abseil-cpp/issues/1431). However, the
+    # `std=c++14` flag doesn't appear to suffice; we need at least
+    # `std=c++17`.
+    abort "Cannot compile re2 with your compiler: recent versions require C++14 support." unless %w[c++20 c++17 c++11 c++0x].any? do |std|
+      checking_for("re2 that compiles with #{std} standard") do
+        if try_compile(minimal_program, compile_options + " -std=#{std}")
+          compile_options << " -std=#{std}"
+          $CPPFLAGS << " -std=#{std}"
+
+          true
+        end
+      end
     end
   end
-end
 
-# Determine which version of re2 the user has installed.
-# Revision d9f8806c004d added an `endpos` argument to the
-# generic Match() function.
-#
-# To test for this, try to compile a simple program that uses
-# the newer form of Match() and set a flag if it is successful.
-checking_for("RE2::Match() with endpos argument") do
-  test_re2_match_signature = <<SRC
+  # Determine which version of re2 the user has installed.
+  # Revision d9f8806c004d added an `endpos` argument to the
+  # generic Match() function.
+  #
+  # To test for this, try to compile a simple program that uses
+  # the newer form of Match() and set a flag if it is successful.
+  checking_for("RE2::Match() with endpos argument") do
+    test_re2_match_signature = <<SRC
 #include <re2/re2.h>
 
 int main() {
@@ -83,13 +179,13 @@ int main() {
 }
 SRC
 
-  if try_compile(test_re2_match_signature, compile_options)
-    $defs.push("-DHAVE_ENDPOS_ARGUMENT")
+    if try_compile(test_re2_match_signature, compile_options)
+      $defs.push("-DHAVE_ENDPOS_ARGUMENT")
+    end
   end
-end
 
-checking_for("RE2::Set::Match() with error information") do
-  test_re2_set_match_signature = <<SRC
+  checking_for("RE2::Set::Match() with error information") do
+    test_re2_set_match_signature = <<SRC
 #include <vector>
 #include <re2/re2.h>
 #include <re2/set.h>
@@ -107,9 +203,182 @@ int main() {
 }
 SRC
 
-  if try_compile(test_re2_set_match_signature, compile_options)
-    $defs.push("-DHAVE_ERROR_INFO_ARGUMENT")
+    if try_compile(test_re2_set_match_signature, compile_options)
+      $defs.push("-DHAVE_ERROR_INFO_ARGUMENT")
+    end
   end
 end
 
+def process_recipe(recipe)
+  cross_build_p = config_cross_build?
+  message "Cross build is #{cross_build_p ? "enabled" : "disabled"}.\n"
+
+  recipe.host = target_host
+  # Ensure x64-mingw-ucrt and x64-mingw32 use different library paths since the host
+  # is the same (x86_64-w64-mingw32).
+  recipe.target = File.join(recipe.target, target_arch) if cross_build_p
+
+  yield recipe
+
+  checkpoint = "#{recipe.target}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
+  name = recipe.name
+  version = recipe.version
+
+  if File.exist?(checkpoint)
+    message("Building re2 with a packaged version of #{name}-#{version}.\n")
+  else
+    message(<<~EOM)
+        ---------- IMPORTANT NOTICE ----------
+        Building re2 with a packaged version of #{name}-#{version}.
+        Configuration options: #{recipe.configure_options.shelljoin}
+      EOM
+
+    unless recipe.patch_files.empty?
+      message("The following patches are being applied:\n")
+
+      recipe.patch_files.each do |patch|
+        message("  - %s\n" % File.basename(patch))
+      end
+    end
+
+    # Use a temporary base directory to reduce filename lengths since
+    # Windows can hit a limit of 250 characters (CMAKE_OBJECT_PATH_MAX).
+    with_temp_dir { recipe.cook }
+
+    FileUtils.touch(checkpoint)
+  end
+
+  recipe.activate
+end
+
+def build_with_system_libraries
+  header_dirs = [
+    "/usr/local/include",
+    "/opt/homebrew/include",
+    "/usr/include"
+  ]
+
+  lib_dirs = [
+    "/usr/local/lib",
+    "/opt/homebrew/lib",
+    "/usr/lib"
+  ]
+
+  dir_config("re2", header_dirs, lib_dirs)
+
+  build_extension
+end
+
+# pkgconf v1.9.3 on Windows incorrectly sorts the output of `pkg-config
+# --libs --static`, resulting in build failures: https://github.com/pkgconf/pkgconf/issues/268.
+# To work around the issue, store the correct order of abseil flags here and add them manually
+# for Windows.
+#
+# Note that `-ldbghelp` is incorrectly added before `-labsl_symbolize` in abseil:
+# https://github.com/abseil/abseil-cpp/issues/1497
+ABSL_LDFLAGS = %w[
+  -labsl_flags
+  -labsl_flags_internal
+  -labsl_flags_marshalling
+  -labsl_flags_reflection
+  -labsl_flags_private_handle_accessor
+  -labsl_flags_commandlineflag
+  -labsl_flags_commandlineflag_internal
+  -labsl_flags_config
+  -labsl_flags_program_name
+  -labsl_cord
+  -labsl_cordz_info
+  -labsl_cord_internal
+  -labsl_cordz_functions
+  -labsl_cordz_handle
+  -labsl_crc_cord_state
+  -labsl_crc32c
+  -labsl_crc_internal
+  -labsl_crc_cpu_detect
+  -labsl_hash
+  -labsl_city
+  -labsl_bad_variant_access
+  -labsl_low_level_hash
+  -labsl_raw_hash_set
+  -labsl_hashtablez_sampler
+  -labsl_exponential_biased
+  -labsl_bad_optional_access
+  -labsl_str_format_internal
+  -labsl_synchronization
+  -labsl_graphcycles_internal
+  -labsl_stacktrace
+  -labsl_symbolize
+  -ldbghelp
+  -labsl_debugging_internal
+  -labsl_demangle_internal
+  -labsl_malloc_internal
+  -labsl_time
+  -labsl_civil_time
+  -labsl_strings
+  -labsl_strings_internal
+  -ladvapi32
+  -labsl_base
+  -labsl_spinlock_wait
+  -labsl_int128
+  -labsl_throw_delegate
+  -labsl_raw_logging_internal
+  -labsl_log_severity
+  -labsl_time_zone
+].freeze
+
+def add_static_ldflags(flags)
+  static_flags = flags.split
+
+  if MiniPortile.windows?
+    static_flags.each { |flag| append_ldflags(flag) unless ABSL_LDFLAGS.include?(flag) }
+    ABSL_LDFLAGS.each { |flag| append_ldflags(flag) }
+  else
+    static_flags.each { |flag| append_ldflags(flag) }
+  end
+end
+
+def build_with_vendored_libraries
+  message "Building re2 using packaged libraries.\n"
+
+  abseil_recipe, re2_recipe = load_recipes
+
+  process_recipe(abseil_recipe) do |recipe|
+    recipe.configure_options += ['-DABSL_PROPAGATE_CXX_STD=ON', '-DCMAKE_CXX_VISIBILITY_PRESET=hidden']
+  end
+
+  process_recipe(re2_recipe) do |recipe|
+    recipe.configure_options += ["-DCMAKE_PREFIX_PATH=#{abseil_recipe.path}", '-DCMAKE_CXX_FLAGS=-DNDEBUG',
+                                 '-DCMAKE_CXX_VISIBILITY_PRESET=hidden']
+  end
+
+  dir_config("re2", File.join(re2_recipe.path, 'include'), File.join(re2_recipe.path, 'lib'))
+  dir_config("abseil", File.join(abseil_recipe.path, 'include'), File.join(abseil_recipe.path, 'lib'))
+
+  pkg_config_paths = [
+    "#{abseil_recipe.path}/lib/pkgconfig",
+    "#{re2_recipe.path}/lib/pkgconfig"
+  ].join(File::PATH_SEPARATOR)
+
+  pkg_config_paths = "#{ENV['PKG_CONFIG_PATH']}#{File::PATH_SEPARATOR}#{pkg_config_paths}" if ENV['PKG_CONFIG_PATH']
+
+  ENV['PKG_CONFIG_PATH'] = pkg_config_paths
+  pc_file = File.join(re2_recipe.path, 'lib', 'pkgconfig', 're2.pc')
+
+  raise 'Please install the `pkg-config` utility!' unless find_executable('pkg-config')
+
+  # See https://bugs.ruby-lang.org/issues/18490, broken in Ruby 3.1 but fixed in Ruby 3.2.
+  flags = xpopen(['pkg-config', '--libs', '--static', pc_file], err: %i[child out], &:read)
+
+  raise 'Unable to run pkg-config --libs --static' unless $?.success?
+
+  add_static_ldflags(flags)
+  build_extension
+end
+
+if config_system_libraries?
+  build_with_system_libraries
+else
+  build_with_vendored_libraries
+end
+
 create_makefile("re2")

data/ext/re2/re2.cc

@@ -393,7 +393,7 @@ re2::StringPiece *re2_matchdata_find_match(VALUE idx, VALUE self) {
 /*
  * Returns the number of elements in the match array (including nils).
  *
- * @return [Fixnum] the number of elements
+ * @return [Integer] the number of elements
  * @example
  *   m = RE2::Regexp.new('(\d+)').match("bob 123")
  *   m.size      #=> 2
@@ -409,8 +409,8 @@ static VALUE re2_matchdata_size(VALUE self) {
 /*
  * Returns the offset of the start of the nth element of the matchdata.
  *
- * @param [Fixnum, String, Symbol] n the name or number of the match
- * @return [Fixnum] the offset of the start of the match
+ * @param [Integer, String, Symbol] n the name or number of the match
+ * @return [Integer] the offset of the start of the match
  * @example
  *   m = RE2::Regexp.new('ob (\d+)').match("bob 123")
  *   m.begin(0)  #=> 1
@@ -439,8 +439,8 @@ static VALUE re2_matchdata_begin(VALUE self, VALUE n) {
 /*
  * Returns the offset of the character following the end of the nth element of the matchdata.
  *
- * @param [Fixnum, String, Symbol] n the name or number of the match
- * @return [Fixnum] the offset of the character following the end of the match
+ * @param [Integer, String, Symbol] n the name or number of the match
+ * @return [Integer] the offset of the character following the end of the match
  * @example
  *   m = RE2::Regexp.new('ob (\d+) b').match("bob 123 bob")
  *   m.end(0)  #=> 9
@@ -584,7 +584,7 @@ static VALUE re2_matchdata_named_match(const char* name, VALUE self) {
  * @overload [](index)
  *   Access a particular match by index.
  *
- *   @param [Fixnum] index the index of the match to fetch
+ *   @param [Integer] index the index of the match to fetch
  *   @return [String, nil] the specified match
  *   @example
  *     m = RE2::Regexp.new('(\d+)').match("bob 123")
@@ -593,8 +593,8 @@ static VALUE re2_matchdata_named_match(const char* name, VALUE self) {
  * @overload [](start, length)
  *   Access a range of matches by starting index and length.
  *
- *   @param [Fixnum] start the index from which to start
- *   @param [Fixnum] length the number of elements to fetch
+ *   @param [Integer] start the index from which to start
+ *   @param [Integer] length the number of elements to fetch
  *   @return [Array<String, nil>] the specified matches
  *   @example
  *     m = RE2::Regexp.new('(\d+)').match("bob 123")
@@ -795,12 +795,9 @@ static VALUE re2_matchdata_deconstruct_keys(VALUE self, VALUE keys) {
 
 /*
  * Returns a new RE2 object with a compiled version of
- * +pattern+ stored inside. Equivalent to +RE2.new+.
+ * +pattern+ stored inside. Equivalent to +RE2::Regexp.new+.
  *
- * @return [RE2::Regexp] an RE2::Regexp with the specified pattern and options
- * @param [String] pattern the pattern to compile
- * @param [Hash] options the options to compile a regexp with
- * @see RE2::Regexp.new
+ * @see RE2::Regexp#initialize
  *
  */
 static VALUE re2_re2(int argc, VALUE *argv, VALUE self) {
@@ -833,7 +830,7 @@ static VALUE re2_re2(int argc, VALUE *argv, VALUE self) {
  *   @option options [Boolean] :posix_syntax (false) restrict regexps to POSIX egrep syntax
  *   @option options [Boolean] :longest_match (false) search for longest match, not first match
  *   @option options [Boolean] :log_errors (true) log syntax and execution errors to ERROR
- *   @option options [Fixnum] :max_mem approx. max memory footprint of RE2
+ *   @option options [Integer] :max_mem approx. max memory footprint of RE2
  *   @option options [Boolean] :literal (false) interpret string as literal, not regexp
  *   @option options [Boolean] :never_nl (false) never match \n, even if it is in regexp
  *   @option options [Boolean] :case_sensitive (true) match is case-sensitive (regexp can override with (?i) unless in posix_syntax mode)
@@ -984,7 +981,7 @@ static VALUE re2_regexp_log_errors(VALUE self) {
  * Returns the max_mem setting for the regular expression
  * +re2+.
  *
- * @return [Fixnum] the max_mem option
+ * @return [Integer] the max_mem option
  * @example
  *   re2 = RE2::Regexp.new("woo?", :max_mem => 1024)
  *   re2.max_mem    #=> 1024
@@ -1138,7 +1135,7 @@ static VALUE re2_regexp_error_arg(VALUE self) {
  * of a regexp's "cost". Larger numbers are more expensive
  * than smaller numbers.
  *
- * @return [Fixnum] the regexp "cost"
+ * @return [Integer] the regexp "cost"
  */
 static VALUE re2_regexp_program_size(VALUE self) {
   re2_pattern *p;
@@ -1203,7 +1200,7 @@ static VALUE re2_regexp_options(VALUE self) {
  * wasn't valid on construction. The overall match ($0) does not
  * count: if the regexp is "(a)(b)", returns 2.
  *
- * @return [Fixnum] the number of capturing subpatterns
+ * @return [Integer] the number of capturing subpatterns
  */
 static VALUE re2_regexp_number_of_capturing_groups(VALUE self) {
   re2_pattern *p;
@@ -1273,7 +1270,7 @@ static VALUE re2_regexp_named_capturing_groups(VALUE self) {
  *   matches returned (padded with nils if necessary).
  *
  *   @param [String] text the text to search
- *   @param [Fixnum] number_of_matches the number of matches to return
+ *   @param [Integer] number_of_matches the number of matches to return
  *   @return [RE2::MatchData] the matches
  *   @raise [ArgumentError] if given a negative number of matches
  *   @raise [NoMemoryError] if there was not enough memory to allocate the matches
@@ -1399,7 +1396,7 @@ static VALUE re2_regexp_scan(VALUE self, VALUE text) {
  * @return [String] the resulting string
  * @example
  *   RE2.Replace("hello there", "hello", "howdy") #=> "howdy there"
- *   re2 = RE2.new("hel+o")
+ *   re2 = RE2::Regexp.new("hel+o")
  *   RE2.Replace("hello there", re2, "yo")        #=> "yo there"
  */
 static VALUE re2_Replace(VALUE self, VALUE str, VALUE pattern,
@@ -1435,7 +1432,7 @@ static VALUE re2_Replace(VALUE self, VALUE str, VALUE pattern,
  * @param [String] rewrite the string to replace with
  * @return [String] the resulting string
  * @example
- *   re2 = RE2.new("oo?")
+ *   re2 = RE2::Regexp.new("oo?")
  *   RE2.GlobalReplace("whoops-doops", re2, "e")  #=> "wheps-deps"
  *   RE2.GlobalReplace("hello there", "e", "i")   #=> "hillo thiri"
  */
@@ -1522,7 +1519,7 @@ static VALUE re2_set_allocate(VALUE klass) {
  *   @option options [Boolean] :posix_syntax (false) restrict regexps to POSIX egrep syntax
  *   @option options [Boolean] :longest_match (false) search for longest match, not first match
  *   @option options [Boolean] :log_errors (true) log syntax and execution errors to ERROR
- *   @option options [Fixnum] :max_mem approx. max memory footprint of RE2
+ *   @option options [Integer] :max_mem approx. max memory footprint of RE2
  *   @option options [Boolean] :literal (false) interpret string as literal, not regexp
  *   @option options [Boolean] :never_nl (false) never match \n, even if it is in regexp
  *   @option options [Boolean] :case_sensitive (true) match is case-sensitive (regexp can override with (?i) unless in posix_syntax mode)
@@ -1889,9 +1886,4 @@ void Init_re2(void) {
   id_anchor_start = rb_intern("anchor_start");
   id_anchor_both = rb_intern("anchor_both");
   id_exception = rb_intern("exception");
-
-  #if 0
-    /* Fake so YARD generates the file. */
-    rb_mKernel = rb_define_module("Kernel");
-  #endif
 }

data/ext/re2/recipes.rb

@@ -0,0 +1,43 @@
+PACKAGE_ROOT_DIR = File.expand_path('../..', __dir__)
+REQUIRED_MINI_PORTILE_VERSION = '~> 2.8.4' # keep this version in sync with the one in the gemspec
+
+def build_recipe(name, version)
+  require 'rubygems'
+  gem('mini_portile2', REQUIRED_MINI_PORTILE_VERSION) # gemspec is not respected at install time
+  require 'mini_portile2'
+
+  MiniPortileCMake.new(name, version).tap do |recipe|
+    recipe.target = File.join(PACKAGE_ROOT_DIR, 'ports')
+    recipe.configure_options += [
+      # abseil needs a C++14 compiler
+      '-DCMAKE_CXX_STANDARD=17',
+      # needed for building the C extension shared library with -fPIC
+      '-DCMAKE_POSITION_INDEPENDENT_CODE=ON',
+      # ensures pkg-config and installed libraries will be in lib, not lib64
+      '-DCMAKE_INSTALL_LIBDIR=lib'
+    ]
+
+    yield recipe
+  end
+end
+
+def load_recipes
+  require 'yaml'
+  dependencies = YAML.load_file(File.join(PACKAGE_ROOT_DIR, 'dependencies.yml'))
+
+  abseil_recipe = build_recipe('abseil', dependencies['abseil']['version']) do |recipe|
+    recipe.files = [{
+      url: "https://github.com/abseil/abseil-cpp/archive/refs/tags/#{recipe.version}.tar.gz",
+      sha256: dependencies['abseil']['sha256']
+    }]
+  end
+
+  re2_recipe = build_recipe('libre2', dependencies['libre2']['version']) do |recipe|
+    recipe.files = [{
+      url: "https://github.com/google/re2/releases/download/#{recipe.version}/re2-#{recipe.version}.tar.gz",
+      sha256: dependencies['libre2']['sha256']
+    }]
+  end
+
+  [abseil_recipe, re2_recipe]
+end

data/lib/re2/string.rb

@@ -12,30 +12,14 @@ module RE2
     # Replaces the first occurrence +pattern+ with +rewrite+ and returns a new
     # string.
     #
-    # @param [String, RE2::Regexp] pattern a regexp matching text to be replaced
-    # @param [String] rewrite the string to replace with
-    # @example
-    #   "hello there".re2_sub("hello", "howdy") #=> "howdy there"
-    #   re2 = RE2.new("hel+o")
-    #   "hello there".re2_sub(re2, "yo")        #=> "yo there"
-    #   text = "Good morning"
-    #   text.re2_sub("morn", "even")            #=> "Good evening"
-    #   text                                    #=> "Good morning"
+    # @see RE2.Replace
     def re2_sub(*args)
       RE2.Replace(self, *args)
     end
 
     # Replaces every occurrence of +pattern+ with +rewrite+ and return a new string.
     #
-    # @param [String, RE2::Regexp] pattern a regexp matching text to be replaced
-    # @param [String] rewrite the string to replace with
-    # @example
-    #   "hello there".re2_gsub("e", "i")   #=> "hillo thiri"
-    #   re2 = RE2.new("oo?")
-    #   "whoops-doops".re2_gsub(re2, "e")  #=> "wheps-deps"
-    #   text = "Good morning"
-    #   text.re2_gsub("o", "ee")           #=> "Geeeed meerning"
-    #   text                               #=> "Good morning"
+    # @see RE2.GlobalReplace
     def re2_gsub(*args)
       RE2.GlobalReplace(self, *args)
     end
@@ -74,7 +58,7 @@ module RE2
     #   matches returned (padded with nils if necessary).
     #
     #   @param [String, RE2::Regexp] pattern the regular expression to match
-    #   @param [Fixnum] number_of_matches the number of matches to return
+    #   @param [Integer] number_of_matches the number of matches to return
     #   @return [RE2::MatchData] the matches
     #   @raise [NoMemoryError] if there was not enough memory to allocate the matches
     #   @example

data/lib/re2/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module RE2
+  VERSION = "2.0.0.beta1"
+end

data/lib/re2.rb

@@ -3,5 +3,12 @@
 #
 # Copyright (c) 2010-2014, Paul Mucur (http://mudge.name)
 # Released under the BSD Licence, please see LICENSE.txt
-require "re2.so"
+begin
+  ::RUBY_VERSION =~ /(\d+\.\d+)/
+  require_relative "#{Regexp.last_match(1)}/re2.so"
+rescue LoadError
+  require 're2.so'
+end
+
 require "re2/scanner"
+require "re2/version"

data/re2.gemspec

@@ -0,0 +1,43 @@
+require_relative 'lib/re2/version'
+
+Gem::Specification.new do |s|
+  s.name = "re2"
+  s.summary = "Ruby bindings to re2."
+  s.description = 'Ruby bindings to re2, "an efficient, principled regular expression library".'
+  s.version = RE2::VERSION
+  s.authors = ["Paul Mucur"]
+  s.homepage = "https://github.com/mudge/re2"
+  s.extensions = ["ext/re2/extconf.rb"]
+  s.license = "BSD-3-Clause"
+  s.required_ruby_version = ">= 2.7.0"
+  s.files = [
+    ".rspec",
+    "dependencies.yml",
+    "ext/re2/extconf.rb",
+    "ext/re2/re2.cc",
+    "ext/re2/recipes.rb",
+    "Gemfile",
+    "lib/re2.rb",
+    "lib/re2/scanner.rb",
+    "lib/re2/string.rb",
+    "lib/re2/version.rb",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "re2.gemspec"
+  ]
+  s.test_files = [
+    "spec/spec_helper.rb",
+    "spec/re2_spec.rb",
+    "spec/kernel_spec.rb",
+    "spec/re2/regexp_spec.rb",
+    "spec/re2/match_data_spec.rb",
+    "spec/re2/string_spec.rb",
+    "spec/re2/set_spec.rb",
+    "spec/re2/scanner_spec.rb"
+  ]
+  s.add_development_dependency "rake-compiler", "~> 1.2.1"
+  s.add_development_dependency "rake-compiler-dock", "~> 1.3.0"
+  s.add_development_dependency("rspec", "~> 3.2")
+  s.add_runtime_dependency("mini_portile2", "~> 2.8.4") # keep version in sync with extconf.rb
+end

data/spec/re2/regexp_spec.rb

@@ -91,7 +91,8 @@ RSpec.describe RE2::Regexp do
   describe "#program_size" do
     it "returns a numeric value" do
       program_size = RE2::Regexp.new('w(o)(o)').program_size
-      expect(program_size).to be_a(Fixnum)
+
+      expect(program_size).to be_an(Integer)
     end
 
     it "returns -1 for an invalid pattern" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Paul Mucur
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -38,21 +52,43 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: mini_portile2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.4
 description: Ruby bindings to re2, "an efficient, principled regular expression library".
-email:
+email: 
 executables: []
 extensions:
 - ext/re2/extconf.rb
 extra_rdoc_files: []
 files:
+- ".rspec"
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- dependencies.yml
 - ext/re2/extconf.rb
 - ext/re2/re2.cc
+- ext/re2/recipes.rb
 - lib/re2.rb
 - lib/re2/scanner.rb
 - lib/re2/string.rb
+- lib/re2/version.rb
+- ports/archives/20230125.3.tar.gz
+- ports/archives/re2-2023-07-01.tar.gz
+- re2.gemspec
 - spec/kernel_spec.rb
 - spec/re2/match_data_spec.rb
 - spec/re2/regexp_spec.rb
@@ -65,7 +101,7 @@ homepage: https://github.com/mudge/re2
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -73,15 +109,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Ruby bindings to re2.
 test_files: