diff options
author | Vít Ondruch <vondruch@redhat.com> | 2019-10-01 12:03:33 +0200 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-02-26 11:04:52 +0900 |
commit | e960ef6f18a25c637c54f00c75bb6c24f8ab55d0 (patch) | |
tree | 5656a876bf3529023dd63a29201be70c04e67b78 /tool/rbinstall.rb | |
parent | 0686e4181d04dd911316a227753ceaa96d8c6533 (diff) |
Use `Gem::Package` like object instead of monkey patching.
1. This is similar to what RubyGems does and it is less magic [[1]].
2. It avoids deprecated code paths in RubyGems [[2]].
[1]: https://github.com/rubygems/rubygems/blob/92892bbc3adba86a90756c385433835f6761b8da/lib/rubygems/installer.rb#L151
[2]: https://github.com/rubygems/rubygems/blob/92892bbc3adba86a90756c385433835f6761b8da/lib/rubygems/installer.rb#L187
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2515
Diffstat (limited to 'tool/rbinstall.rb')
-rwxr-xr-x | tool/rbinstall.rb | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index a9b6b9b179..7fc0109923 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -706,29 +706,34 @@ module RbInstall end end - class UnpackedInstaller < Gem::Installer - module DirPackage - def extract_files(destination_dir, pattern = "*") - path = File.dirname(@gem.path) - return if path == destination_dir - File.chmod(0700, destination_dir) - mode = pattern == "bin/*" ? $script_mode : $data_mode - spec.files.each do |f| - src = File.join(path, f) - dest = File.join(without_destdir(destination_dir), f) - makedirs(dest[/.*(?=\/)/m]) - install src, dest, :mode => mode - end - File.chmod($dir_mode, destination_dir) + class DirPackage + attr_reader :spec + + attr_accessor :dir_mode + attr_accessor :prog_mode + attr_accessor :data_mode + + def initialize(spec) + @spec = spec + @src_dir = File.dirname(@spec.loaded_from) + end + + def extract_files(destination_dir, pattern = "*") + path = @src_dir + return if path == destination_dir + File.chmod(0700, destination_dir) + mode = pattern == "bin/*" ? $script_mode : $data_mode + spec.files.each do |f| + src = File.join(path, f) + dest = File.join(without_destdir(destination_dir), f) + makedirs(dest[/.*(?=\/)/m]) + install src, dest, :mode => mode end + File.chmod($dir_mode, destination_dir) end + end - def initialize(spec, *options) - package = Gem::Package.new(spec.loaded_from) - super(package, *options) - @package.extend(DirPackage).spec = spec - end - + class UnpackedInstaller < Gem::Installer def write_cache_file end @@ -890,7 +895,8 @@ install?(:ext, :comm, :gem, :'bundled-gems') do if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") spec.extensions[0] ||= "-" end - ins = RbInstall::UnpackedInstaller.new(spec, options) + package = RbInstall::DirPackage.new spec + ins = RbInstall::UnpackedInstaller.new(package, options) puts "#{INDENT}#{spec.name} #{spec.version}" ins.install File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) |