Merge pull request #2537 from reitermarkus/pathname-to_str

Remove `to_s` from some `Pathname`s.

Author: reitermarkus

Library/Homebrew/brew.rb

@@ -24,7 +24,7 @@ def require?(path)
   require path
 rescue LoadError => e
   # we should raise on syntax errors but not if the file doesn't exist.
-  raise unless e.to_s.include? path
+  raise unless e.message.include?(path)
 end
 
 begin

Library/Homebrew/cask/lib/hbc/artifact/relocated.rb

@@ -35,10 +35,10 @@ def add_altname_metadata(file, altname)
         altnames = "(#{altnames})"
 
         # Some packges are shipped as u=rx (e.g. Bitcoin Core)
-        @command.run!("/bin/chmod", args: ["--", "u+rw", file.to_s, file.realpath.to_s])
+        @command.run!("/bin/chmod", args: ["--", "u+rw", file, file.realpath])
 
         @command.run!("/usr/bin/xattr",
-                      args:         ["-w", ALT_NAME_ATTRIBUTE, altnames, file.to_s],
+                      args:         ["-w", ALT_NAME_ATTRIBUTE, altnames, file],
                       print_stderr: false)
       end
 

Library/Homebrew/cask/lib/hbc/cli.rb

@@ -113,7 +113,7 @@ def self.run_command(command, *rest)
       if command.respond_to?(:run)
         # usual case: built-in command verb
         command.run(*rest)
-      elsif require? which("brewcask-#{command}.rb").to_s
+      elsif require?(which("brewcask-#{command}.rb"))
         # external command as Ruby library on PATH, Homebrew-style
       elsif command.to_s.include?("/") && require?(command.to_s)
         # external command as Ruby library with literal path, useful

Library/Homebrew/cmd/style.rb

@@ -94,7 +94,7 @@ def check_style_impl(files, output_type, options = {})
 
     if files.nil?
       args << "--config" << HOMEBREW_LIBRARY_PATH/".rubocop.yml"
-      args += [HOMEBREW_LIBRARY_PATH]
+      args << HOMEBREW_LIBRARY_PATH
     else
       args << "--config" << HOMEBREW_LIBRARY/".rubocop.yml"
       args += files

Library/Homebrew/dev-cmd/audit.rb

@@ -856,7 +856,7 @@ def audit_text
     end
     bin_names.each do |name|
       ["system", "shell_output", "pipe_output"].each do |cmd|
-        if text =~ %r{(def test|test do).*(#{Regexp.escape HOMEBREW_PREFIX}/bin/)?#{cmd}[\(\s]+['"]#{Regexp.escape name}[\s'"]}m
+        if text =~ %r{(def test|test do).*(#{Regexp.escape(HOMEBREW_PREFIX)}/bin/)?#{cmd}[\(\s]+['"]#{Regexp.escape(name)}[\s'"]}m
           problem %Q(fully scope test #{cmd} calls e.g. #{cmd} "\#{bin}/#{name}")
         end
       end

Library/Homebrew/diagnostic.rb

@@ -119,7 +119,7 @@ def check_for_anaconda
         return unless which("python")
 
         anaconda_directory = which("anaconda").realpath.dirname
-        python_binary = Utils.popen_read which("python"), "-c", "import sys; sys.stdout.write(sys.executable)"
+        python_binary = Utils.popen_read(which("python"), "-c", "import sys; sys.stdout.write(sys.executable)")
         python_directory = Pathname.new(python_binary).realpath.dirname
 
         # Only warn if Python lives with Anaconda, since is most problematic case.

Library/Homebrew/extend/os/mac/keg_relocate.rb

@@ -63,9 +63,9 @@ def detect_cxx_stdlibs(options = {})
   # expensive recursive search if possible.
   def fixed_name(file, bad_name)
     if bad_name.start_with? PREFIX_PLACEHOLDER
-      bad_name.sub(PREFIX_PLACEHOLDER, HOMEBREW_PREFIX.to_s)
+      bad_name.sub(PREFIX_PLACEHOLDER, HOMEBREW_PREFIX)
     elsif bad_name.start_with? CELLAR_PLACEHOLDER
-      bad_name.sub(CELLAR_PLACEHOLDER, HOMEBREW_CELLAR.to_s)
+      bad_name.sub(CELLAR_PLACEHOLDER, HOMEBREW_CELLAR)
     elsif (file.dylib? || file.mach_o_bundle?) && (file.parent + bad_name).exist?
       "@loader_path/#{bad_name}"
     elsif file.mach_o_executable? && (lib + bad_name).exist?

Library/Homebrew/tap_constants.rb

@@ -3,7 +3,7 @@
 # match taps' casks, e.g. someuser/sometap/somecask
 HOMEBREW_TAP_CASK_REGEX = %r{^([\w-]+)/([\w-]+)/([a-z0-9\-]+)$}
 # match taps' directory paths, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap
-HOMEBREW_TAP_DIR_REGEX = %r{#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Taps/([\w-]+)/([\w-]+)}
+HOMEBREW_TAP_DIR_REGEX = %r{#{Regexp.escape(HOMEBREW_LIBRARY)}/Taps/([\w-]+)/([\w-]+)}
 # match taps' formula paths, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap/someformula
 HOMEBREW_TAP_PATH_REGEX = Regexp.new(HOMEBREW_TAP_DIR_REGEX.source + %r{/(.*)}.source)
 # match the default and the versions brew-cask tap e.g. Caskroom/cask or Caskroom/versions

Library/Homebrew/test/cmd/--env_spec.rb

@@ -9,7 +9,7 @@
   describe "--shell=bash" do
     it "prints the Homebrew build environment variables in Bash syntax" do
       expect { brew "--env", "--shell=bash" }
-        .to output(/export CMAKE_PREFIX_PATH="#{Regexp.quote(HOMEBREW_PREFIX.to_s)}"/).to_stdout
+        .to output(/export CMAKE_PREFIX_PATH="#{Regexp.quote(HOMEBREW_PREFIX)}"/).to_stdout
         .and not_to_output.to_stderr
         .and be_a_success
     end
@@ -18,7 +18,7 @@
   describe "--shell=fish" do
     it "prints the Homebrew build environment variables in Fish syntax" do
       expect { brew "--env", "--shell=fish" }
-        .to output(/set [-]gx CMAKE_PREFIX_PATH "#{Regexp.quote(HOMEBREW_PREFIX.to_s)}"/).to_stdout
+        .to output(/set [-]gx CMAKE_PREFIX_PATH "#{Regexp.quote(HOMEBREW_PREFIX)}"/).to_stdout
         .and not_to_output.to_stderr
         .and be_a_success
     end
@@ -27,7 +27,7 @@
   describe "--shell=tcsh" do
     it "prints the Homebrew build environment variables in Tcsh syntax" do
       expect { brew "--env", "--shell=tcsh" }
-        .to output(/setenv CMAKE_PREFIX_PATH #{Regexp.quote(HOMEBREW_PREFIX.to_s)};/).to_stdout
+        .to output(/setenv CMAKE_PREFIX_PATH #{Regexp.quote(HOMEBREW_PREFIX)};/).to_stdout
         .and not_to_output.to_stderr
         .and be_a_success
     end

Library/Homebrew/test/cmd/--version_spec.rb

@@ -1,7 +1,7 @@
 describe "brew --version", :integration_test do
   it "prints the Homebrew version" do
     expect { brew "--version" }
-      .to output(/^Homebrew #{Regexp.escape(HOMEBREW_VERSION.to_s)}\n/).to_stdout
+      .to output(/^Homebrew #{Regexp.escape(HOMEBREW_VERSION)}\n/).to_stdout
       .and not_to_output.to_stderr
       .and be_a_success
   end