More deprecations.

Deprecate more methods. Internal APIs have been verified to be unused
elsewhere and removed. External APIs have had deprecation methods added.
Existing deprecations have been either upgraded to produce warnings or
no longer deprecated and the reasoning documented.

1 files changed, 28 insertions, 28 deletions

diff --git a/Library/Homebrew/test/utils/shell_spec.rb b/Library/Homebrew/test/utils/shell_spec.rb
index c44bd8253..d32f9928f 100644
--- a/Library/Homebrew/test/utils/shell_spec.rb
+++ b/Library/Homebrew/test/utils/shell_spec.rb
@@ -1,92 +1,92 @@
 require "utils/shell"
 
 describe Utils::Shell do
-  describe "::shell_profile" do
+  describe "::profile" do
     it "returns ~/.bash_profile by default" do
       ENV["SHELL"] = "/bin/another_shell"
-      expect(subject.shell_profile).to eq("~/.bash_profile")
+      expect(subject.profile).to eq("~/.bash_profile")
     end
 
     it "returns ~/.bash_profile for Sh" do
       ENV["SHELL"] = "/bin/another_shell"
-      expect(subject.shell_profile).to eq("~/.bash_profile")
+      expect(subject.profile).to eq("~/.bash_profile")
     end
 
     it "returns ~/.bash_profile for Bash" do
       ENV["SHELL"] = "/bin/bash"
-      expect(subject.shell_profile).to eq("~/.bash_profile")
+      expect(subject.profile).to eq("~/.bash_profile")
     end
 
     it "returns ~/.zshrc for Zsh" do
       ENV["SHELL"] = "/bin/zsh"
-      expect(subject.shell_profile).to eq("~/.zshrc")
+      expect(subject.profile).to eq("~/.zshrc")
     end
 
     it "returns ~/.kshrc for Ksh" do
       ENV["SHELL"] = "/bin/ksh"
-      expect(subject.shell_profile).to eq("~/.kshrc")
+      expect(subject.profile).to eq("~/.kshrc")
     end
   end
 
-  describe "::path_to_shell" do
+  describe "::from_path" do
     it "supports a raw command name" do
-      expect(subject.path_to_shell("bash")).to eq(:bash)
+      expect(subject.from_path("bash")).to eq(:bash)
     end
 
     it "supports full paths" do
-      expect(subject.path_to_shell("/bin/bash")).to eq(:bash)
+      expect(subject.from_path("/bin/bash")).to eq(:bash)
     end
 
     it "supports versions" do
-      expect(subject.path_to_shell("zsh-5.2")).to eq(:zsh)
+      expect(subject.from_path("zsh-5.2")).to eq(:zsh)
     end
 
     it "strips newlines" do
-      expect(subject.path_to_shell("zsh-5.2\n")).to eq(:zsh)
+      expect(subject.from_path("zsh-5.2\n")).to eq(:zsh)
     end
 
     it "returns nil when input is invalid" do
-      expect(subject.path_to_shell("")).to be nil
-      expect(subject.path_to_shell("@@@@@@")).to be nil
-      expect(subject.path_to_shell("invalid_shell-4.2")).to be nil
+      expect(subject.from_path("")).to be nil
+      expect(subject.from_path("@@@@@@")).to be nil
+      expect(subject.from_path("invalid_shell-4.2")).to be nil
     end
   end
 
   specify "::sh_quote" do
-    expect(subject.sh_quote("")).to eq("''")
-    expect(subject.sh_quote("\\")).to eq("\\\\")
-    expect(subject.sh_quote("\n")).to eq("'\n'")
-    expect(subject.sh_quote("$")).to eq("\\$")
-    expect(subject.sh_quote("word")).to eq("word")
+    expect(subject.send(:sh_quote, "")).to eq("''")
+    expect(subject.send(:sh_quote, "\\")).to eq("\\\\")
+    expect(subject.send(:sh_quote, "\n")).to eq("'\n'")
+    expect(subject.send(:sh_quote, "$")).to eq("\\$")
+    expect(subject.send(:sh_quote, "word")).to eq("word")
   end
 
   specify "::csh_quote" do
-    expect(subject.csh_quote("")).to eq("''")
-    expect(subject.csh_quote("\\")).to eq("\\\\")
+    expect(subject.send(:csh_quote, "")).to eq("''")
+    expect(subject.send(:csh_quote, "\\")).to eq("\\\\")
     # note this test is different than for sh
-    expect(subject.csh_quote("\n")).to eq("'\\\n'")
-    expect(subject.csh_quote("$")).to eq("\\$")
-    expect(subject.csh_quote("word")).to eq("word")
+    expect(subject.send(:csh_quote, "\n")).to eq("'\\\n'")
+    expect(subject.send(:csh_quote, "$")).to eq("\\$")
+    expect(subject.send(:csh_quote, "word")).to eq("word")
   end
 
-  describe "::prepend_path_in_shell_profile" do
+  describe "::prepend_path_in_profile" do
     let(:path) { "/my/path" }
 
     it "supports Tcsh" do
       ENV["SHELL"] = "/bin/tcsh"
-      expect(subject.prepend_path_in_shell_profile(path))
+      expect(subject.prepend_path_in_profile(path))
         .to start_with("echo 'setenv PATH #{path}:$")
     end
 
     it "supports Bash" do
       ENV["SHELL"] = "/bin/bash"
-      expect(subject.prepend_path_in_shell_profile(path))
+      expect(subject.prepend_path_in_profile(path))
         .to start_with("echo 'export PATH=\"#{path}:$")
     end
 
     it "supports Fish" do
       ENV["SHELL"] = "/usr/local/bin/fish"
-      expect(subject.prepend_path_in_shell_profile(path))
+      expect(subject.prepend_path_in_profile(path))
         .to start_with("echo 'set -g fish_user_paths \"#{path}\" $fish_user_paths' >>")
     end
   end