Merge branch 'master' into dependabot/bundler/examples/simple_rails_api/rack-2.2.3.1

Author: kigster

README.adoc

@@ -10,10 +10,13 @@
 :icons: font
 :license: apache
 
+== New Rules Ruby!
+
+This repo will be retired eventually, as these rules have not been actively maintained and are in the process of being replaced by the new rules, which you can find here:  https://github.com/bazel-contrib/rules_ruby
+
+
+
 
-====
-This repo is primarily maintained by https://github.com/kigster[Konstantin Gredeskoul] and https://github.com/yugui[Yuki "Yugui" Sonoda]. We are both very busy and would really love more contributors to join the core team. If you are interested in developing Ruby Rules for Bazel, please submit a couple of PRs and then lets talk!
-====
 
 TIP: You can read or print this README in a proper PDF format by grabbing our link:README.pdf[README.pdf].
 
@@ -205,7 +208,7 @@ ruby_rspec(
     specs = glob(["spec/**/*.rb"]),
     rspec_args = { "--format": "progress" },
     deps = [":foo"]
-}
+)
 ----
 
 ==== Package Ruby files as a Gem

examples/simple_rails_api/Gemfile.lock

@@ -60,13 +60,13 @@ GEM
       msgpack (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     erubi (1.10.0)
     ffi (1.15.4)
-    globalid (0.5.2)
+    globalid (1.0.1)
       activesupport (>= 5.0)
-    i18n (1.8.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -80,7 +80,7 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.1)
     mini_portile2 (2.8.0)
-    minitest (5.14.4)
+    minitest (5.17.0)
     msgpack (1.4.2)
     nio4r (2.5.8)
     nokogiri (1.13.4)
@@ -136,12 +136,12 @@ GEM
     sqlite3 (1.4.2)
     thor (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

ruby/private/bundle/create_bundle_build_file.rb

@@ -84,6 +84,8 @@
   Dir.glob("lib/#{RbConfig::CONFIG['RUBY_INSTALL_NAME']}/#{ruby_version}/specifications/#{gem_name}-#{gem_version}*.gemspec").first
 end
 
+HERE = File.absolute_path '.'
+
 require 'bundler'
 require 'json'
 require 'stringio'
@@ -271,7 +273,15 @@ def register_gem(spec, template_out, bundle_lib_paths, bundle_binaries)
     # Usually, registering the directory paths listed in the `require_paths` of gemspecs is sufficient, but
     # some gems also require additional paths to be included in the load paths.
     require_paths += include_array(spec.name)
-    gem_lib_paths = require_paths.map { |require_path| File.join(gem_path, require_path) }
+    gem_lib_paths = require_paths.map do |require_path|
+      # Gems with native extensions (like ffi) will sometimes have elements of
+      # require_paths that are absolute rather than gem-path relative paths.
+      # It is incorrect to prepend those paths with the gem_path and Bazel will
+      # only allow relative paths as inputs to its glob() function.
+      pathname = Pathname.new(require_path)
+      pathname.absolute? ? pathname.relative_path_from(HERE).to_s : File.join(gem_path, require_path)
+    end
+
     bundle_lib_paths.push(*gem_lib_paths)
 
     # paths to search for executables

ruby/private/sdk.bzl

@@ -8,26 +8,22 @@ def rules_ruby_select_sdk(version = "host"):
 
     supported_versions = [
         "host",
-        "2.5.8",
-        "2.5.9",
-        "2.6.3",
-        "2.6.4",
-        "2.6.5",
-        "2.6.6",
-        "2.6.7",
-        "2.6.8",
-        "2.6.9",
+        "2.7.0",
         "2.7.1",
         "2.7.2",
         "2.7.3",
         "2.7.4",
         "2.7.5",
+        "2.7.6",
         "3.0.0",
         "3.0.1",
         "3.0.2",
         "3.0.3",
+        "3.0.4",
         "3.1.0",
         "3.1.1",
+        "3.1.2",
+        "3.2.0",
     ]
 
     if version in supported_versions: