re2 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6e122dcf14c604d1cea516e7c6839bddc2144ff2a9ea96f90d4dc874e8f9056
-  data.tar.gz: 1a8e2b6444b9b3702c6e995a59069a681a615242fce804e824c9cd009d515745
+  metadata.gz: b84cf6ec8ce5bd9800f96ec578e998e4b8ca5345c1c96eaa699d0a0eebb03e2c
+  data.tar.gz: c7e89da8456e80c91f287ee444cf69daad53af97cd604e44e3cdf685f8af34f8
 SHA512:
-  metadata.gz: 9f8f4ffca57e02a52830c67a2177d509575d435ad1006e2fd5d3b435efecb7412d5507872fde660fb602d1c5cc8416a436719fac31b8d985a263f36e53626955
-  data.tar.gz: 6bc970e290326fb83473e3954e74d4de47a6d23a8200be6eae3a90e6df4a6b671d33cba1be74c456288274a178fa9deebb1aa6de205866bacf4a9ee5436ba5bb
+  metadata.gz: 9b018c0bbf42935fc86828b478dc85c4ff3e14ee89a5c27d2fb77ac120bcd1ad65b9277d9a53e031260710669ccd65d508018f70a78ad8a871ee1c21f65c2360
+  data.tar.gz: ff2832314da390eab285d44739b01ddfbc35ec4de635284d7886ead84b914b0b4d30dc4c80d50cf4e9cdfb91b3813a239e8206405bd5b12df496ce8b7ec92b25

data/Gemfile

@@ -2,12 +2,4 @@ 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
+gem "rake", "> 12.3.2"

data/README.md

@@ -4,17 +4,33 @@ 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.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  
+**Current version:** 2.0.0.beta1  
+**Supported Ruby versions:** 2.7, 3.0, 3.1, 3.2  
+**Bundled re2 version:** libre2.11 (2023-09-01)  
 **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
 ------------
 
-You will need [re2][] installed as well as a C++ compiler such as [gcc][] (on
-Debian and Ubuntu, this is provided by the [build-essential][] package). If
-you are using Mac OS X, I recommend installing re2 with [Homebrew][] by
-running the following:
+The gem comes bundled with a version of [re2][] and will compile itself (and
+any dependencies) on install. As compilation can take a while, precompiled
+native gems are available for Linux, Windows and macOS.
+
+In v2.0 and later, precompiled native gems are available for Ruby 2.7 to 3.2
+on these platforms:
+
+- `aarch64-linux` (requires: glibc >= 2.29)
+- `arm-linux` (requires: glibc >= 2.29)
+- `arm64-darwin`
+- `x64-mingw32` / `x64-mingw-ucrt`
+- `x86-linux` (requires: glibc >= 2.17)
+- `x86_64-darwin`
+- `x86_64-linux` (requires: glibc >= 2.17)
+
+If you wish to opt out of using the bundled libraries, you will need re2
+installed as well as a C++ compiler such as [gcc][] (on Debian and Ubuntu, this
+is provided by the [build-essential][] package). If you are using Mac OS X, I
+recommend installing re2 with [Homebrew][] by running the following:
 
     $ brew install re2
 
@@ -22,20 +38,26 @@ 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++14 support such as [clang](http://clang.llvm.org/) 3.4 or [gcc](https://gcc.gnu.org/) 5.
+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
 on Debian and Ubuntu.
 
-You can then install the library via RubyGems with `gem install re2` or `gem
-install re2 -- --with-re2-dir=/path/to/re2/prefix` if re2 is not installed in
-any of the following default locations:
+You can then install the library via RubyGems with `gem install re2 --platform=ruby --
+--enable-system-libraries` or `gem install re2 --platform=ruby -- --enable-system-libraries
+--with-re2-dir=/path/to/re2/prefix` if re2 is not installed in any of the
+following default locations:
 
 * `/usr/local`
 * `/opt/homebrew`
 * `/usr`
 
+If you're using Bundler, you can use the
+[`force_ruby_platform`](https://bundler.io/v2.3/man/gemfile.5.html#FORCE_RUBY_PLATFORM)
+option in your Gemfile.
+
 Documentation
 -------------
 
@@ -214,7 +236,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` and for contributing support for libre2.11 (2023-07-01);
+* Thanks to [Stan Hu](https://github.com/stanhu) for reporting a bug with empty patterns and `RE2::Regexp#scan`, contributing support for libre2.11 (2023-07-01) and for vendoring re2 and abseil and compiling native gems in 2.0;
 * 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

@@ -33,7 +33,7 @@ Gem::PackageTask.new(RE2_GEM_SPEC) do |p|
   p.need_tar = false
 end
 
-CROSS_RUBY_VERSIONS = %w[3.2.0 3.1.0 3.0.0 2.7.0].join(':')
+CROSS_RUBY_VERSIONS = %w[3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(':')
 CROSS_RUBY_PLATFORMS = %w[
   aarch64-linux
   arm-linux
@@ -129,27 +129,4 @@ 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

@@ -1,7 +1,7 @@
 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
+  version: "2023-09-01"
+  sha256: "5bb6875ae1cd1e9fedde98018c346db7260655f86fdb8837e3075103acd3649b"
+  # sha-256 hash provided in https://github.com/google/re2/releases/download/2023-09-01/re2-2023-09-01.tar.gz
 
 abseil:
   version: "20230125.3"

data/ext/re2/extconf.rb

@@ -117,8 +117,10 @@ if ENV["CXX"]
   RbConfig::CONFIG["CXX"] = ENV["CXX"]
 end
 
-def build_extension
+def build_extension(static_p = false)
+  # Enable optional warnings but disable deprecated register warning for Ruby 2.6 support
   $CFLAGS << " -Wall -Wextra -funroll-loops"
+  $CPPFLAGS << " -Wno-register"
 
   # Pass -x c++ to force gcc to compile the test program
   # as C++ (as it will end in .c by default).
@@ -128,7 +130,7 @@ def build_extension
   have_header("stdint.h")
   have_func("rb_str_sublen")
 
-  unless have_library("re2")
+  if !static_p and !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
 
@@ -326,14 +328,65 @@ ABSL_LDFLAGS = %w[
   -labsl_time_zone
 ].freeze
 
-def add_static_ldflags(flags)
-  static_flags = flags.split
+def libflag_to_filename(ldflag)
+  case ldflag
+  when /\A-l(.+)/
+    "lib#{Regexp.last_match(1)}.#{$LIBEXT}"
+  end
+end
+
+# This method does a number of things to ensure the final shared library
+# is compiled statically with the vendored libraries:
+#
+# 1. For -L<path> flags, ensure that any `ports` paths are prioritized just
+#    in case there are installed libraries that might take precedence.
+# 2. For -l<lib> flags, convert the library to the static library with a
+#    full path and substitute the absolute static library.  For example,
+#    -lre2 maps to /path/to/ports/<arch>/libre2/<version>/lib/libre2.a.
+#
+# This is needed because when building the extension, Ruby appears to
+# insert `-L#{RbConfig::CONFIG['exec_prefix']}/lib` first. If libre2 is
+# in installed in that location then the extension will link against the
+# system library instead of the vendored library.
+def add_flag(arg, lib_paths)
+  case arg
+  when /\A-L(.+)\z/
+    # Prioritize ports' directories
+    lib_dir = Regexp.last_match(1)
+    $LIBPATH =
+      if lib_dir.start_with?(PACKAGE_ROOT_DIR + "/")
+        [lib_dir] | $LIBPATH
+      else
+        $LIBPATH | [lib_dir]
+      end
+  when /\A-l./
+    filename = libflag_to_filename(arg)
+
+    added = false
+    lib_paths.each do |path|
+      static_lib = File.join(path, filename)
+
+      next unless File.exist?(static_lib)
+
+      $LDFLAGS << " " << static_lib
+      added = true
+      break
+    end
+
+    append_ldflags(arg.shellescape) unless added
+  else
+    append_ldflags(arg.shellescape)
+  end
+end
+
+def add_static_ldflags(flags, lib_paths)
+  static_flags = flags.strip.shellsplit
 
   if MiniPortile.windows?
-    static_flags.each { |flag| append_ldflags(flag) unless ABSL_LDFLAGS.include?(flag) }
-    ABSL_LDFLAGS.each { |flag| append_ldflags(flag) }
+    static_flags.each { |flag| add_flag(flag, lib_paths) unless ABSL_LDFLAGS.include?(flag) }
+    ABSL_LDFLAGS.each { |flag| add_flag(flag, lib_paths) }
   else
-    static_flags.each { |flag| append_ldflags(flag) }
+    static_flags.each { |flag| add_flag(flag, lib_paths) }
   end
 end
 
@@ -371,8 +424,9 @@ def build_with_vendored_libraries
 
   raise 'Unable to run pkg-config --libs --static' unless $?.success?
 
-  add_static_ldflags(flags)
-  build_extension
+  lib_paths = [File.join(abseil_recipe.path, 'lib'), File.join(re2_recipe.path, 'lib')]
+  add_static_ldflags(flags, lib_paths)
+  build_extension(true)
 end
 
 if config_system_libraries?

data/lib/re2/version.rb

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

data/re2.gemspec

@@ -5,11 +5,11 @@ Gem::Specification.new do |s|
   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.authors = ["Paul Mucur", "Stan Hu"]
   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.required_ruby_version = ">= 2.6.0"
   s.files = [
     ".rspec",
     "dependencies.yml",

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Paul Mucur
+- Stan Hu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -87,7 +88,7 @@ files:
 - lib/re2/string.rb
 - lib/re2/version.rb
 - ports/archives/20230125.3.tar.gz
-- ports/archives/re2-2023-07-01.tar.gz
+- ports/archives/re2-2023-09-01.tar.gz
 - re2.gemspec
 - spec/kernel_spec.rb
 - spec/re2/match_data_spec.rb
@@ -109,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"