Merge branch 'segiddins/add-compact-index-support-for-private-sources…

…' into martinemde/bypass-string-agg-for-compact-index-on-jruby
rubygems · Feb 25, 2025 · 779c598 · 779c598
2 parents 50e4d64 + 3f822e6
commit 779c598
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.rubocop-bundler.yml b/.rubocop-bundler.yml
@@ -15,6 +15,11 @@ Lint/AssignmentInCondition:
 Lint/UnusedMethodArgument:
   Enabled: false
 
+Lint/UriEscapeUnescape:
+  Enabled: true
+
+# Style
+
 Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 

diff --git a/Gemfile b/Gemfile
@@ -29,6 +29,6 @@ group :linting do
 end
 
 group :test do
-  gem "gem_server_conformance", "~> 0.1.4"
+  gem "gem_server_conformance", "~> 0.1.5"
   gem "mock_redis"
 end
diff --git a/spec/support/jruby_binstubs/gem_server_conformance b/spec/support/jruby_binstubs/gem_server_conformance
@@ -1,3 +1,9 @@
 require "rubygems"
 
-load Gem.bin_path("gem_server_conformance", "gem_server_conformance")
+begin
+  load Gem.bin_path("gem_server_conformance", "gem_server_conformance")
+rescue Gem::GemNotFoundException
+  require "bundler"
+  Bundler::Env.write($stderr)
+  raise
+end