re2 2.14.0-x86-mingw32 → 2.16.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f127939847063a811a50d4c3ba7061ba71e3d1308bde2164cd60c980bec5300
-  data.tar.gz: 63620cd9ab71d58a4b71b191cd81f89cd92e493c748f9c2be62503704fb00ffb
+  metadata.gz: 06e593085810b30fcafd5a0e68c95097e88508e6914d921ee34452e24c55c2ea
+  data.tar.gz: a673ed7a1688c62bacbf03e5984711de54ff88555876a08318f754c2735f6b06
 SHA512:
-  metadata.gz: 25c352f96df60018dc24cdc69731ff57b8d6f80dcbc66c563ba28cc963fbd67208ea79e158fe4abbbe9f7c0f468b496b87cde153443f08d6cb3f79823a3e4453
-  data.tar.gz: 5ccbc92c7249b6d47c3bdcaaf64d3b50feae16cd144175079c7067d3b463337df6936990d3da53778f8562aca3756554ebf52b797d0d4bcfd6c43a375858a0b4
+  metadata.gz: e996666e9e2f69b0c65565dc78b0e686adeda207d55ba63777c86bfc94edfd1cab3cf0f65205ca1fd6c674d3484602227576918cb8e5b14d052ef244c60a04b6
+  data.tar.gz: 17da7b25caafbfaacf2d5dc240e6fb8fb59815003c9ddc7aacf08c632d62735bb87cdbfe89f396c8b3167f2d98f107b78469dd823c6bef8a4f8f9ece47d0d4fc

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.14.0  
-**Bundled RE2 version:** libre2.11 (2024-07-02)  
+**Current version:** 2.16.0  
+**Bundled RE2 version:** libre2.11 (2025-06-26b)  
 
 ```ruby
 RE2('h.*o').full_match?("hello")    #=> true
@@ -224,12 +224,15 @@ the set. After all patterns have been added, the set can be compiled using
 and then
 [`RE2::Set#match`](https://mudge.name/re2/RE2/Set.html#match-instance_method)
 will return an array containing the indices of all the patterns that matched.
+[`RE2::Set#size`](https://mudge.name/re2/RE2/Set.html#size-instance_method)
+will return the number of patterns in the set.
 
 ```ruby
 set = RE2::Set.new
 set.add("abc")         #=> 0
 set.add("def")         #=> 1
 set.add("ghi")         #=> 2
+set.size               #=> 3
 set.compile            #=> true
 set.match("abcdefghi") #=> [0, 1, 2]
 set.match("ghidefabc") #=> [2, 1, 0]
@@ -257,20 +260,19 @@ RE2(non_latin1_pattern.encode("ISO-8859-1"), utf8: false).match(non_latin1_text.
 
 This gem requires the following to run:
 
-* [Ruby](https://www.ruby-lang.org/en/) 2.6 to 3.3
+* [Ruby](https://www.ruby-lang.org/en/) 2.6 to 3.4
 
 It supports the following RE2 ABI versions:
 
-* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2024-07-02)
+* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2025-06-26b)
 
 ### Native gems
 
 Where possible, a pre-compiled native gem will be provided for the following platforms:
 
 * Linux
-    * `aarch64-linux` and `arm-linux` (requires [glibc](https://www.gnu.org/software/libc/) 2.29+)
-    * `x86-linux` and `x86_64-linux` (requires [glibc](https://www.gnu.org/software/libc/) 2.17+)
-    * [musl](https://musl.libc.org/)-based systems such as [Alpine](https://alpinelinux.org) are supported as long as a [glibc-compatible library is installed](https://wiki.alpinelinux.org/wiki/Running_glibc_programs)
+    * `aarch64-linux`, `arm-linux`, `x86-linux` and `x86_64-linux` (requires [glibc](https://www.gnu.org/software/libc/) 2.29+, RubyGems 3.3.22+ and Bundler 2.3.21+)
+    * [musl](https://musl.libc.org/)-based systems such as [Alpine](https://alpinelinux.org) are supported with Bundler 2.5.6+
 * macOS `x86_64-darwin` and `arm64-darwin`
 * Windows `x64-mingw32` and `x64-mingw-ucrt`
 
@@ -279,18 +281,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.13.1
-Fetching re2-2.13.1-arm64-darwin.gem
-Downloaded re2-2.13.1-arm64-darwin
-$ sha256sum re2-2.13.1-arm64-darwin.gem
-57dc2a77cef60ed8ba35e2f647a6dd17bcba99bfdb0bcb5b08bff69cd566f0be  re2-2.13.1-arm64-darwin.gem
+$ gem fetch re2 -v 2.14.0
+Fetching re2-2.14.0-arm64-darwin.gem
+Downloaded re2-2.14.0-arm64-darwin
+$ sha256sum re2-2.14.0-arm64-darwin.gem
+3c922d54a44ac88499f6391bc2f9740559381deaf7f4e49eef5634cf32efc2ce  re2-2.14.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.13.1-arm64-darwin.gem.sig re2-2.13.1-arm64-darwin.gem
-gpg: Signature made Mon  1 Jul 17:51:09 2024 BST
+$ gpg --verify re2-2.14.0-arm64-darwin.gem.sig re2-2.14.0-arm64-darwin.gem
+gpg: Signature made Fri  2 Aug 12:39:12 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

@@ -18,18 +18,22 @@ re2_gemspec.files << abseil_archive
 re2_gemspec.files << re2_archive
 
 cross_platforms = %w[
-  aarch64-linux
-  arm-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
   arm64-darwin
   x64-mingw-ucrt
   x64-mingw32
-  x86-linux
+  x86-linux-gnu
+  x86-linux-musl
   x86-mingw32
   x86_64-darwin
-  x86_64-linux
+  x86_64-linux-gnu
+  x86_64-linux-musl
 ].freeze
 
-ENV['RUBY_CC_VERSION'] = %w[3.3.0 3.2.0 3.1.0 3.0.0 2.7.0 2.6.0].join(':')
+RakeCompilerDock.set_ruby_cc_version("~> 2.6", "~> 3.0")
 
 Gem::PackageTask.new(re2_gemspec).define
 
@@ -66,6 +70,7 @@ namespace :gem do
     desc "Compile and build native gem for #{platform} platform"
     task platform do
       RakeCompilerDock.sh <<~SCRIPT, platform: platform, verbose: true
+        rbenv shell 3.1.6 &&
         gem install bundler --no-document &&
         bundle &&
         bundle exec rake native:#{platform} pkg/#{re2_gemspec.full_name}-#{Gem::Platform.new(platform)}.gem PATH="/usr/local/bin:$PATH"

data/dependencies.yml

@@ -1,7 +1,7 @@
 ---
 libre2:
-  version: '2024-07-02'
-  sha256: eb2df807c781601c14a260a507a5bb4509be1ee626024cb45acbd57cb9d4032b
+  version: 2025-06-26b
+  sha256: 641a3ca337814a6c3676a389ea065812e00ff796f31a427038bc010bae0b86e3
 abseil:
-  version: '20240722.0'
-  sha256: f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3
+  version: '20250127.1'
+  sha256: b396401fd29e2e679cace77867481d388c807671dc2acc602a0259eeb79b7811

data/ext/re2/extconf.rb

@@ -217,6 +217,24 @@ module RE2
           $defs.push("-DHAVE_ERROR_INFO_ARGUMENT")
         end
       end
+
+      checking_for("RE2::Set::Size()") do
+        test_re2_set_size = <<~SRC
+          #include <re2/re2.h>
+          #include <re2/set.h>
+
+          int main() {
+            RE2::Set s(RE2::DefaultOptions, RE2::UNANCHORED);
+            s.Size();
+
+            return 0;
+          }
+        SRC
+
+        if try_compile(test_re2_set_size, compile_options)
+          $defs.push("-DHAVE_SET_SIZE")
+        end
+      end
     end
 
     def static_pkg_config(pc_file, pkg_config_paths)

data/ext/re2/re2.cc

@@ -1962,6 +1962,26 @@ static VALUE re2_set_compile(VALUE self) {
   return BOOL2RUBY(s->set->Compile());
 }
 
+/*
+ * Returns the size of the {RE2::Set}.
+ *
+ * @return [Integer] the number of patterns in the set
+ * @example
+ *   set = RE2::Set.new
+ *   set.add("abc")
+ *   set.size #=> 1
+ */
+static VALUE re2_set_size(VALUE self) {
+#ifdef HAVE_SET_SIZE
+  re2_set *s;
+  TypedData_Get_Struct(self, re2_set, &re2_set_data_type, s);
+
+  return INT2FIX(s->set->Size());
+#else
+  rb_raise(re2_eSetUnsupportedError, "current version of RE2::Set does not have Size method");
+#endif
+}
+
 /*
  * Returns whether the underlying RE2 version outputs error information from
  * {https://github.com/google/re2/blob/bc0faab533e2b27b85b8ad312abf061e33ed6b5d/re2/set.h#L62-L65
@@ -1978,6 +1998,19 @@ static VALUE re2_set_match_raises_errors_p(VALUE) {
 #endif
 }
 
+/*
+ * Returns whether the underlying RE2 version has a Set::Size method.
+ *
+ * @return [Boolean] whether the underlying RE2 has a Set::Size method
+ */
+static VALUE re2_set_size_p(VALUE) {
+#ifdef HAVE_SET_SIZE
+  return Qtrue;
+#else
+  return Qfalse;
+#endif
+}
+
 /*
  * Matches the given text against patterns in the set, returning an array of
  * integer indices of the matching patterns if matched or an empty array if
@@ -2208,11 +2241,15 @@ extern "C" void Init_re2(void) {
 
   rb_define_singleton_method(re2_cSet, "match_raises_errors?",
       RUBY_METHOD_FUNC(re2_set_match_raises_errors_p), 0);
+  rb_define_singleton_method(re2_cSet, "size?",
+      RUBY_METHOD_FUNC(re2_set_size_p), 0);
   rb_define_method(re2_cSet, "initialize",
       RUBY_METHOD_FUNC(re2_set_initialize), -1);
   rb_define_method(re2_cSet, "add", RUBY_METHOD_FUNC(re2_set_add), 1);
   rb_define_method(re2_cSet, "compile", RUBY_METHOD_FUNC(re2_set_compile), 0);
   rb_define_method(re2_cSet, "match", RUBY_METHOD_FUNC(re2_set_match), -1);
+  rb_define_method(re2_cSet, "size", RUBY_METHOD_FUNC(re2_set_size), 0);
+  rb_define_method(re2_cSet, "length", RUBY_METHOD_FUNC(re2_set_size), 0);
 
   rb_define_module_function(re2_mRE2, "Replace",
       RUBY_METHOD_FUNC(re2_Replace), 3);

data/lib/re2/version.rb

@@ -10,5 +10,5 @@
 
 
 module RE2
-  VERSION = "2.14.0"
+  VERSION = "2.16.0"
 end

data/re2.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     "spec/re2/scanner_spec.rb"
   ]
   s.add_development_dependency("rake-compiler", "~> 1.2.7")
-  s.add_development_dependency("rake-compiler-dock", "~> 1.5.2")
+  s.add_development_dependency("rake-compiler-dock", "~> 1.9.1")
   s.add_development_dependency("rspec", "~> 3.2")
   s.add_runtime_dependency("mini_portile2", "~> 2.8.7") # keep version in sync with extconf.rb
 end

data/spec/re2/set_spec.rb

@@ -204,6 +204,50 @@ RSpec.describe RE2::Set do
     end
   end
 
+  describe "#size" do
+    it "returns the number of patterns added to the set", :aggregate_failures do
+      skip "Underlying RE2::Set has no Size method" unless RE2::Set.size?
+
+      set = RE2::Set.new
+
+      expect(set.size).to eq(0)
+
+      set.add("abc")
+
+      expect(set.size).to eq(1)
+
+      set.add("def")
+
+      expect(set.size).to eq(2)
+    end
+
+    it "raises an error if RE2 does not support Set::Size" do
+      skip "Underlying RE2::Set has a Size method" if RE2::Set.size?
+
+      set = RE2::Set.new
+
+      expect { set.size }.to raise_error(RE2::Set::UnsupportedError)
+    end
+  end
+
+  describe "#length" do
+    it "is an alias for size" do
+      skip "Underlying RE2::Set has no Size method" unless RE2::Set.size?
+
+      set = RE2::Set.new
+
+      expect(set.length).to eq(0)
+
+      set.add("abc")
+
+      expect(set.length).to eq(1)
+
+      set.add("def")
+
+      expect(set.length).to eq(2)
+    end
+  end
+
   def silence_stderr
     original_stream = STDERR
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.16.0
 platform: x86-mingw32
 authors:
 - Paul Mucur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 2025-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,7 @@ files:
 - lib/3.1/re2.so
 - lib/3.2/re2.so
 - lib/3.3/re2.so
+- lib/3.4/re2.so
 - lib/re2.rb
 - lib/re2/regexp.rb
 - lib/re2/scanner.rb
@@ -105,14 +106,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.4.dev
+      version: 3.5.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to RE2.