1 files changed, 98 insertions, 7 deletions

diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 24c6234d84..047fd0a571 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -709,6 +709,77 @@ module RbInstall
   end
 
   class UnpackedInstaller < Gem::Installer
+    # This method is mostly copied from old version of Gem::Installer#install
+    def install_with_default_gem
+      verify_gem_home
+
+      # The name and require_paths must be verified first, since it could contain
+      # ruby code that would be eval'ed in #ensure_loadable_spec
+      verify_spec
+
+      ensure_loadable_spec
+
+      if options[:install_as_default]
+        Gem.ensure_default_gem_subdirectories gem_home
+      else
+        Gem.ensure_gem_subdirectories gem_home
+      end
+
+      return true if @force
+
+      ensure_dependencies_met unless @ignore_dependencies
+
+      run_pre_install_hooks
+
+      # Set loaded_from to ensure extension_dir is correct
+      if @options[:install_as_default]
+        spec.loaded_from = default_spec_file
+      else
+        spec.loaded_from = spec_file
+      end
+
+      # Completely remove any previous gem files
+      FileUtils.rm_rf gem_dir
+      FileUtils.rm_rf spec.extension_dir
+
+      dir_mode = options[:dir_mode]
+      FileUtils.mkdir_p gem_dir, mode: dir_mode && 0o755
+
+      if @options[:install_as_default]
+        extract_bin
+        write_default_spec
+      else
+        extract_files
+
+        build_extensions
+        write_build_info_file
+        run_post_build_hooks
+      end
+
+      generate_bin
+      generate_plugins
+
+      unless @options[:install_as_default]
+        write_spec
+        write_cache_file
+      end
+
+      File.chmod(dir_mode, gem_dir) if dir_mode
+
+      say spec.post_install_message if options[:post_install_message] && !spec.post_install_message.nil?
+
+      Gem::Specification.add_spec(spec) unless @install_dir
+
+      load_plugin
+
+      run_post_install_hooks
+
+      spec
+    rescue Errno::EACCES => e
+      # Permission denied - /path/to/foo
+      raise Gem::FilePermissionError, e.message.split(" - ").last
+    end
+
     def write_cache_file
     end
 
@@ -754,7 +825,7 @@ module RbInstall
     def install
       spec.post_install_message = nil
       dir_creating(without_destdir(gem_dir))
-      RbInstall.no_write(options) {super}
+      RbInstall.no_write(options) { install_with_default_gem }
     end
 
     # Now build-ext builds all extensions including bundled gems.
@@ -791,6 +862,18 @@ module RbInstall
     ensure
       $VERBOSE = verbose
     end
+
+    def regenerate_plugins_for(spec, plugins_dir)
+      plugins = spec.plugins
+      return if plugins.empty?
+      dir = without_destdir(plugins_dir)
+      plugins.each do |plugin|
+        $installed_list.puts(File.join(dir, "#{spec.name}_plugin#{File.extname(plugin)}"))
+      end
+      unless $dryrun
+        super
+      end
+    end
   end
 end
 
@@ -799,16 +882,25 @@ def load_gemspec(file, base = nil, files: nil)
   code = File.read(file, encoding: "utf-8:-")
 
   code.gsub!(/^ *#.*/, "")
-  files = files ? files.map(&:dump).join(", ") : ""
+  spec_files = files ? files.map(&:dump).join(", ") : ""
   code.gsub!(/(?:`git[^\`]*`|%x\[git[^\]]*\])\.split(\([^\)]*\))?/m) do
-    "[" + files + "]"
+    "[" + spec_files + "]"
   end \
   or
   code.gsub!(/IO\.popen\(.*git.*?\)/) do
-    "[" + files + "] || itself"
+    "[" + spec_files + "] || itself"
   end
 
   spec = eval(code, binding, file)
+  # for out-of-place build
+  collected_files = files ? spec.files.concat(files).uniq : spec.files
+  spec.files = collected_files.map do |f|
+    if !File.exist?(File.join(base || ".", f)) && f.end_with?(".rb")
+      "lib/#{f}"
+    else
+      f
+    end
+  end
   unless Gem::Specification === spec
     raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."
   end
@@ -1021,7 +1113,6 @@ install?(:local, :comm, :man) do
   prepare "manpages", mandir, ([] | mdocs.collect {|mdoc| mdoc[/\d+$/]}).sort.collect {|sec| "man#{sec}"}
 
   mantype, suffix, compress = Compressors.for($mantype)
-  mandir = File.join(mandir, "man")
   has_goruby = File.exist?(goruby_install_name+exeext)
   require File.join(srcdir, "tool/mdoc2man.rb") if /\Adoc\b/ !~ mantype
   mdocs.each do |mdoc|
@@ -1031,8 +1122,8 @@ install?(:local, :comm, :man) do
       next unless has_goruby
     end
 
-    destdir = mandir + (section = mdoc[/\d+$/])
-    destname = ruby_install_name.sub(/ruby/, base.chomp(".#{section}"))
+    destdir = File.join(mandir, "man" + (section = mdoc[/\d+$/]))
+    destname = $script_installer.transform(base.chomp(".#{section}"))
     destfile = File.join(destdir, "#{destname}.#{section}")
 
     if /\Adoc\b/ =~ mantype or !mdoc_file?(mdoc)