re2 2.10.0-x86-linux → 2.11.0-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bef41f7ca80bdd0eb9d6c58a72f4777d73622f20d02caded21ca7bbe3f63e764
-  data.tar.gz: d51d46b1164f428e633d13872fbace662e6ed4d5fc9f186424f0f75ffcec672f
+  metadata.gz: a7dc61ee738f2d61e792cbe45dd71547291e4f401989af621798c4645095e102
+  data.tar.gz: bab619e36cd50cdf248f65aad0fcbf0e5efd38cc159ac5cdc6306cace491fdf3
 SHA512:
-  metadata.gz: 52464b70633e25d0802ad37d5bede02360d12190bf9450355a579aa59aa0b831d92b65a3b4c3590be09e3725f721a98ac8bdf6348c35909dfefe2e3e103e9fed
-  data.tar.gz: 6b027f7229427a216b01a5162723ec3abb92456d6edc2c7f2c4222aef8374a13efeded870906615b4d0d8a25e50d6b8cd1a43e0b9803e3d49703f643e49dac3b
+  metadata.gz: f57bdc8ab26c9ebeede4acf4661383dbc3bb4dff3cd8d8bbdfa6ee5a947a7725cf23f2c229be89c6de77f06a0414d1be57d4733086299dfe6872cc0e07466732
+  data.tar.gz: 2b04d85ccf2e0412949740cc90e8604cf4f105370cd0c043cffdaf48d819ba480fedd08fc5f1087cfe461240eb2ae74159ca0e6dd52bbb9b6f1de2eebb6bfd09

data/README.md

@@ -6,8 +6,8 @@ Python".
 
 [![Build Status](https://github.com/mudge/re2/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/mudge/re2/actions)
 
-**Current version:** 2.10.0  
-**Bundled RE2 version:** libre2.11 (2024-04-01)  
+**Current version:** 2.11.0  
+**Bundled RE2 version:** libre2.11 (2024-05-01)  
 
 ```ruby
 RE2('h.*o').full_match?("hello")    #=> true
@@ -261,7 +261,7 @@ This gem requires the following to run:
 
 It supports the following RE2 ABI versions:
 
-* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2024-04-01)
+* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2024-05-01)
 
 ### Native gems
 
@@ -279,18 +279,18 @@ Where possible, a pre-compiled native gem will be provided for the following pla
 SHA256 checksums are included in the [release notes](https://github.com/mudge/re2/releases) for each version and can be checked with `sha256sum`, e.g.
 
 ```console
-$ gem fetch re2 -v 2.9.0
-Fetching re2-2.9.0-arm64-darwin.gem
-Downloaded re2-2.9.0-arm64-darwin
-$ sha256sum re2-2.9.0-arm64-darwin.gem
-91dcc103257d7abb0ee832d673267cee48be7194883fed502b1407d2779c3499  re2-2.9.0-arm64-darwin.gem
+$ gem fetch re2 -v 2.10.0
+Fetching re2-2.10.0-arm64-darwin.gem
+Downloaded re2-2.10.0-arm64-darwin
+$ sha256sum re2-2.10.0-arm64-darwin.gem
+b0faba64963f04734b2a08cd81a5064733796bb33ab135d46fea2b65c16fe2fa  re2-2.10.0-arm64-darwin.gem
 ```
 
 [GPG](https://www.gnupg.org/) signatures are attached to each release (the assets ending in `.sig`) and can be verified if you import [our signing key `0x39AC3530070E0F75`](https://mudge.name/39AC3530070E0F75.asc) (or fetch it from a public keyserver, e.g. `gpg --keyserver keyserver.ubuntu.com --recv-key 0x39AC3530070E0F75`):
 
 ```console
-$ gpg --verify re2-2.9.0-arm64-darwin.gem.sig re2-2.9.0-arm64-darwin.gem
-gpg: Signature made Thu 29 Feb 14:00:55 2024 GMT
+$ gpg --verify re2-2.10.0-arm64-darwin.gem.sig re2-2.10.0-arm64-darwin.gem
+gpg: Signature made Mon  1 Apr 12:50:24 2024 BST
 gpg:                using RSA key 702609D9C790F45B577D7BEC39AC3530070E0F75
 gpg: Good signature from "Paul Mucur <mudge@mudge.name>" [unknown]
 gpg:                 aka "Paul Mucur <paul@ghostcassette.com>" [unknown]

data/Rakefile

@@ -1,40 +1,23 @@
 # frozen_string_literal: true
 
 require 'rake/extensiontask'
-require 'rspec/core/rake_task'
 require 'rake_compiler_dock'
-require 'yaml'
+require 'rspec/core/rake_task'
 
 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_gemspec = Gem::Specification.load('re2.gemspec')
+abseil_recipe, re2_recipe = load_recipes
 
-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
+# Add Abseil and RE2's latest archives to the gem files. (Note these will be
+# removed from the precompiled native gems.)
+abseil_archive = File.join("ports/archives", File.basename(abseil_recipe.files[0][:url]))
+re2_archive = File.join("ports/archives", File.basename(re2_recipe.files[0][:url]))
 
-task gem: :prepare
+re2_gemspec.files << abseil_archive
+re2_gemspec.files << re2_archive
 
-Gem::PackageTask.new(RE2_GEM_SPEC) do |p|
-  p.need_zip = false
-  p.need_tar = false
-end
-
-CROSS_RUBY_VERSIONS = %w[3.3.0 3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(':')
-CROSS_RUBY_PLATFORMS = %w[
+cross_platforms = %w[
   aarch64-linux
   arm-linux
   arm64-darwin
@@ -46,13 +29,15 @@ CROSS_RUBY_PLATFORMS = %w[
   x86_64-linux
 ].freeze
 
-ENV['RUBY_CC_VERSION'] = CROSS_RUBY_VERSIONS
+ENV['RUBY_CC_VERSION'] = %w[3.3.0 3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(':')
 
-Rake::ExtensionTask.new('re2', RE2_GEM_SPEC) do |e|
+Gem::PackageTask.new(re2_gemspec).define
+
+Rake::ExtensionTask.new('re2', re2_gemspec) 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_platform = cross_platforms
   e.cross_compiling do |spec|
     spec.files.reject! { |path| File.fnmatch?('ports/*', path) }
     spec.dependencies.reject! { |dep| dep.name == 'mini_portile2' }
@@ -61,72 +46,34 @@ end
 
 RSpec::Core::RakeTask.new(: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
+namespace :gem do
+  cross_platforms.each do |platform|
 
-  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"
+    # Compile each platform's native gem, packaging up the result. Note we add
+    # /usr/local/bin to the PATH as it contains the newest version of CMake in
+    # the rake-compiler-dock images.
+    desc "Compile and 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}
+        bundle exec rake native:#{platform} pkg/#{re2_gemspec.full_name}-#{Gem::Platform.new(platform)}.gem PATH="/usr/local/bin:$PATH"
       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
+# Set up file tasks for Abseil and RE2's archives so they are automatically
+# downloaded when required by the gem task.
+file abseil_archive do
+  abseil_recipe.download
 end
 
-def gem_build_path
-  File.join 'pkg', RE2_GEM_SPEC.full_name
+file re2_archive do
+  re2_recipe.download
 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
+task default: :spec
 
-task default: [:compile, :spec]
+CLEAN.add("lib/**/*.{o,so,bundle}", "pkg")
+CLOBBER.add("ports")

data/dependencies.yml

@@ -1,7 +1,7 @@
 ---
 libre2:
-  version: '2024-04-01'
-  sha256: 3f6690c3393a613c3a0b566309cf04dc381d61470079b653afc47c67fb898198
+  version: '2024-05-01'
+  sha256: fef2f366578401eada34f5603679fb2aebe9b409de8d275a482ce5f2cbac2492
 abseil:
-  version: '20240116.1'
-  sha256: 3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a
+  version: '20240116.2'
+  sha256: 733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc

data/ext/re2/extconf.rb

@@ -226,8 +226,6 @@ module RE2
         .shellsplit
         .map { |flag| flag.delete_prefix('-L') }
 
-      $LIBPATH = static_library_paths | $LIBPATH
-
       # Replace all -l flags that can be found in one of the static library
       # paths with the absolute path instead.
       minimal_pkg_config(pc_file, '--libs-only-l', '--static')

data/ext/re2/recipes.rb

@@ -9,7 +9,7 @@
 # Released under the BSD Licence, please see LICENSE.txt
 
 PACKAGE_ROOT_DIR = File.expand_path('../..', __dir__)
-REQUIRED_MINI_PORTILE_VERSION = '~> 2.8.5' # keep this version in sync with the one in the gemspec
+REQUIRED_MINI_PORTILE_VERSION = '~> 2.8.6' # keep this version in sync with the one in the gemspec
 
 def load_recipes
   require 'yaml'

data/lib/re2/version.rb

@@ -10,5 +10,5 @@
 
 
 module RE2
-  VERSION = "2.10.0"
+  VERSION = "2.11.0"
 end

data/re2.gemspec

@@ -40,8 +40,8 @@ Gem::Specification.new do |s|
     "spec/re2/set_spec.rb",
     "spec/re2/scanner_spec.rb"
   ]
-  s.add_development_dependency("rake-compiler", "~> 1.2.5")
-  s.add_development_dependency("rake-compiler-dock", "~> 1.4.0")
+  s.add_development_dependency("rake-compiler", "~> 1.2.7")
+  s.add_development_dependency("rake-compiler-dock", "~> 1.5.0")
   s.add_development_dependency("rspec", "~> 3.2")
-  s.add_runtime_dependency("mini_portile2", "~> 2.8.5") # keep version in sync with extconf.rb
+  s.add_runtime_dependency("mini_portile2", "~> 2.8.6") # keep version in sync with extconf.rb
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: x86-linux
 authors:
 - Paul Mucur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-01 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement