Fixups following the move from lib/ruby/gems/2.6.0 to lib/gems

Author: eregon

.gitattributes

@@ -26,7 +26,7 @@
 /lib/json/tools/* linguist-vendored
 /src/main/c/Makefile linguist-vendored
 /src/main/c/truffleposix/Makefile linguist-vendored
-/lib/ruby/gems/*/gems/*/bin/setup linguist-vendored
+/lib/gems/gems/*/bin/setup linguist-vendored
 /lib/truffle/post_install_hook.sh linguist-vendored
 /src/test/* linguist-vendored
 /src/processor/* linguist-vendored
@@ -41,7 +41,7 @@
 
 # Documentation
 
-/lib/ruby/gems/*/gems/*/doc/* linguist-documentation
+/lib/gems/gems/*/doc/* linguist-documentation
 
 # All our headers are C - don't magically work out they're ObjectiveC or C++
 

doc/contributor/updating-ruby.md

@@ -59,19 +59,19 @@ then copy the original source of `flori/json` into `lib/json`.
 ## Updating .gemspec of default gems
 
 Default gems are imported from MRI files, except the .gemspec files in
-`lib/ruby/gems/n.n.n/specifications/default`.
+`lib/gems/specifications/default`.
 To update those, copy the files over from an installed MRI.
 ```
-rm -rf lib/ruby/gems/n.n.n/specifications/default
-cp -r ~/.rubies/ruby-n.n.n/lib/ruby/gems/n.n.n/specifications/default lib/ruby/gems/n.n.n/specifications
+rm -rf lib/gems/specifications/default
+cp -r ~/.rubies/ruby-n.n.n/lib/ruby/gems/n.n.n/specifications/default lib/gems/specifications
 ```
 
 ## Updating bundled gems
 
 To update a bundled gem, follow these steps:
 
-* Remove the current gem and gemspec from `lib/ruby/gems/a.b.c/gems` and
-  `lib/ruby/gems/a.b.c/specifications`
+* Remove the current gem and gemspec from `lib/gems/gems` and
+  `lib/gems/specifications`
 * Run the gem install command with the desired version
   `gem install rake -v 10.4.2 --no-doc`
 * Update the project `.gitignore` to allow the newly install gem sources

doc/user/ruby-managers.md

@@ -123,7 +123,7 @@ are picked up by TruffleRuby (as any other Ruby implementation would do)
 causing TruffleRuby to pickup the wrong Gem home instead of its own.
 
 One way to fix this for all sessions is to tell TruffleRuby to ignore `GEM_*`
-variables and always use its own Gem home under `truffleruby/lib/ruby/gems`:
+variables and always use its own Gem home under `truffleruby/lib/gems`:
 
 ```bash
 # In ~/.bashrc or ~/.zshenv

lib/truffle/rubygems/defaults/truffleruby.rb

@@ -14,6 +14,6 @@
 module Gem
   # The path to the gems shipped with TruffleRuby
   def self.default_dir
-    @default_dir ||= "#{Truffle::Boot.ruby_home or raise 'TruffleRuby home not found'}/lib/ruby/gems/#{Truffle::RUBY_BASE_VERSION}"
+    @default_dir ||= "#{Truffle::Boot.ruby_home or raise 'TruffleRuby home not found'}/lib/gems"
   end
 end

mx.truffleruby/suite.py

@@ -428,27 +428,27 @@
                 "lib/mri/rbconfig/": [
                     "dependency:org.truffleruby.cext/src/main/c/rbconfig-sizeof/sizeof.su",
                 ],
-                "lib/ruby/gems/2.6.0/": [
-                    "file:lib/ruby/gems/2.6.0/truffleruby_gem_dir_marker.txt",
+                "lib/gems/": [
+                    "file:lib/gems/truffleruby_gem_dir_marker.txt",
                 ],
-                "lib/ruby/gems/2.6.0/gems/": [
-                    "file:lib/ruby/gems/2.6.0/gems/did_you_mean-1.3.0",
-                    "file:lib/ruby/gems/2.6.0/gems/minitest-5.11.3",
-                    "file:lib/ruby/gems/2.6.0/gems/net-telnet-0.2.0",
-                    "file:lib/ruby/gems/2.6.0/gems/power_assert-1.1.3",
-                    "file:lib/ruby/gems/2.6.0/gems/rake-12.3.2",
-                    "file:lib/ruby/gems/2.6.0/gems/test-unit-3.2.9",
-                    "file:lib/ruby/gems/2.6.0/gems/xmlrpc-0.3.0",
+                "lib/gems/gems/": [
+                    "file:lib/gems/gems/did_you_mean-1.3.0",
+                    "file:lib/gems/gems/minitest-5.11.3",
+                    "file:lib/gems/gems/net-telnet-0.2.0",
+                    "file:lib/gems/gems/power_assert-1.1.3",
+                    "file:lib/gems/gems/rake-12.3.2",
+                    "file:lib/gems/gems/test-unit-3.2.9",
+                    "file:lib/gems/gems/xmlrpc-0.3.0",
                 ],
-                "lib/ruby/gems/2.6.0/specifications/": [
-                    "file:lib/ruby/gems/2.6.0/specifications/default",
-                    "file:lib/ruby/gems/2.6.0/specifications/did_you_mean-1.3.0.gemspec",
-                    "file:lib/ruby/gems/2.6.0/specifications/minitest-5.11.3.gemspec",
-                    "file:lib/ruby/gems/2.6.0/specifications/net-telnet-0.2.0.gemspec",
-                    "file:lib/ruby/gems/2.6.0/specifications/power_assert-1.1.3.gemspec",
-                    "file:lib/ruby/gems/2.6.0/specifications/rake-12.3.2.gemspec",
-                    "file:lib/ruby/gems/2.6.0/specifications/test-unit-3.2.9.gemspec",
-                    "file:lib/ruby/gems/2.6.0/specifications/xmlrpc-0.3.0.gemspec",
+                "lib/gems/specifications/": [
+                    "file:lib/gems/specifications/default",
+                    "file:lib/gems/specifications/did_you_mean-1.3.0.gemspec",
+                    "file:lib/gems/specifications/minitest-5.11.3.gemspec",
+                    "file:lib/gems/specifications/net-telnet-0.2.0.gemspec",
+                    "file:lib/gems/specifications/power_assert-1.1.3.gemspec",
+                    "file:lib/gems/specifications/rake-12.3.2.gemspec",
+                    "file:lib/gems/specifications/test-unit-3.2.9.gemspec",
+                    "file:lib/gems/specifications/xmlrpc-0.3.0.gemspec",
                 ],
                 "src/main/c/openssl/": [
                     "file:src/main/c/openssl/deprecation.rb",

src/main/java/org/truffleruby/RubyContext.java

@@ -760,7 +760,9 @@ private String searchRubyHome(Options options) throws IOException {
 
     private boolean isRubyHome(File path) {
         final File lib = new File(path, "lib");
-        return new File(lib, "truffle").isDirectory() && new File(lib, "ruby").isDirectory() && new File(lib, "patches").isDirectory();
+        return new File(lib, "truffle").isDirectory() &&
+                new File(lib, "gems").isDirectory() &&
+                new File(lib, "patches").isDirectory();
     }
 
     public TruffleNFIPlatform getTruffleNFI() {

src/main/java/org/truffleruby/language/loader/FileLoader.java

@@ -108,7 +108,7 @@ private boolean isInternal(String path) {
         }
 
         if (canonicalPath.startsWith(context.getRubyHome() + "/lib/") &&
-                !canonicalPath.startsWith(context.getRubyHome() + "/lib/ruby/gems/")) {
+                !canonicalPath.startsWith(context.getRubyHome() + "/lib/gems/")) {
             return context.getOptions().STDLIB_AS_INTERNAL;
         } else {
             return false;

src/main/ruby/truffleruby/post-boot/post-boot.rb

@@ -53,7 +53,7 @@
         # Load DidYouMean here manually, to avoid loading RubyGems eagerly
         Truffle::Boot.print_time_metric :'before-did-you-mean'
         begin
-          $LOAD_PATH << "#{Truffle::Boot.ruby_home}/lib/ruby/gems/#{Truffle::RUBY_BASE_VERSION}/gems/did_you_mean-1.3.0/lib"
+          $LOAD_PATH << "#{Truffle::Boot.ruby_home}/lib/gems/gems/did_you_mean-1.3.0/lib"
           require 'did_you_mean'
         rescue LoadError => e
           Truffle::Debug.log_warning "#{File.basename(__FILE__)}:#{__LINE__} #{e.message}"

tool/jt.rb

@@ -2261,7 +2261,7 @@ def dockerfile(*args)
 
     if basic_test || full_test
       configs.each do |config|
-        lines.push "RUN cp -r #{ruby_base}/lib/ruby/gems /test/clean-gems"
+        lines.push "RUN cp -r #{ruby_base}/lib/gems /test/clean-gems"
 
         if config == '' && install_method != :source
           gem = "gem"
@@ -2278,8 +2278,8 @@ def dockerfile(*args)
         lines.push "RUN " + setup_env["#{gem} install unf"]
         lines.push "RUN " + setup_env["ruby #{config} -runf -e 'raise unless defined?(UNF)'"]
 
-        lines.push "RUN rm -rf #{ruby_base}/lib/ruby/gems"
-        lines.push "RUN mv /test/clean-gems #{ruby_base}/lib/ruby/gems"
+        lines.push "RUN rm -rf #{ruby_base}/lib/gems"
+        lines.push "RUN mv /test/clean-gems #{ruby_base}/lib/gems"
       end
     end