From c0c56d1714b44d30d69b51127f9c97df21322d58 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 25 Feb 2024 17:14:52 +0900 Subject: [PATCH] [ruby/tmpdir] Use `IO.popen` to list files - Redirect `git ls-files` without shelling out. - When building by `gem`, `__FILE__` is the path name given in the command line, or the gemspec file name in the current directory. In that case, comparison it and expanded path never equal. Compare listed file names with the base name of `__FILE__` instead. https://github.com/ruby/tmpdir/commit/f505e3f7cb --- lib/tmpdir.gemspec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/tmpdir.gemspec b/lib/tmpdir.gemspec index 15fbd1d4c883fe..d4bb892cc6a5fd 100644 --- a/lib/tmpdir.gemspec +++ b/lib/tmpdir.gemspec @@ -15,9 +15,10 @@ Gem::Specification.new do |spec| # Specify which files should be added to the gem when it is released. # The `git ls-files -z` loads the files in the RubyGem that have been added into git. - spec.files = Dir.chdir(__dir__) do - `git ls-files -z 2>#{IO::NULL}`.split("\x0").reject do |f| - (File.expand_path(f) == __FILE__) || + gemspec = File.basename(__FILE__) + spec.files = IO.popen(%w[git ls-files -z], chdir: __dir__, err: IO::NULL) do |ls| + ls.readlines("\x0", chomp: true).reject do |f| + (f == gemspec) || f.start_with?(*%w[bin/ test/ spec/ features/ .git Gemfile]) end end