From c99cfd159122259f8c39a2680a9d4a8702327965 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Wed, 14 Mar 2018 16:55:45 -0500 Subject: [PATCH] add ? to svn_remote_exist --- Library/Homebrew/dev-cmd/audit.rb | 2 +- Library/Homebrew/test/utils/svn_spec.rb | 8 ++++---- Library/Homebrew/utils/svn.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index e3fb3a5809..c5e4bb8796 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -955,7 +955,7 @@ class ResourceAuditor elsif strategy <= SubversionDownloadStrategy next unless DevelopmentTools.subversion_handles_most_https_certificates? next unless Utils.svn_available? - unless Utils.svn_remote_exists url + unless Utils.svn_remote_exists? url problem "The URL #{url} is not a valid svn URL" end end diff --git a/Library/Homebrew/test/utils/svn_spec.rb b/Library/Homebrew/test/utils/svn_spec.rb index f527a614f2..5fbf1b109f 100644 --- a/Library/Homebrew/test/utils/svn_spec.rb +++ b/Library/Homebrew/test/utils/svn_spec.rb @@ -15,10 +15,10 @@ describe Utils do end end - describe "#self.svn_remote_exists" do + describe "#self.svn_remote_exists?" do it "returns true when svn is not available" do allow(Utils).to receive(:svn_available?).and_return(false) - expect(described_class.svn_remote_exists("blah")).to be_truthy + expect(described_class.svn_remote_exists?("blah")).to be_truthy end context "when svn is available" do @@ -27,7 +27,7 @@ describe Utils do end it "returns false when remote does not exist" do - expect(described_class.svn_remote_exists(HOMEBREW_CACHE/"install")).to be_falsey + expect(described_class.svn_remote_exists?(HOMEBREW_CACHE/"install")).to be_falsey end it "returns true when remote exists", :needs_network, :needs_svn do @@ -36,7 +36,7 @@ describe Utils do HOMEBREW_CACHE.cd { system svn, "checkout", remote } - expect(described_class.svn_remote_exists(HOMEBREW_CACHE/"install")).to be_truthy + expect(described_class.svn_remote_exists?(HOMEBREW_CACHE/"install")).to be_truthy end end end diff --git a/Library/Homebrew/utils/svn.rb b/Library/Homebrew/utils/svn.rb index 150b7eee74..e316a1344f 100644 --- a/Library/Homebrew/utils/svn.rb +++ b/Library/Homebrew/utils/svn.rb @@ -8,7 +8,7 @@ module Utils @svn = quiet_system HOMEBREW_SHIMS_PATH/"scm/svn", "--version" end - def self.svn_remote_exists(url) + def self.svn_remote_exists?(url) return true unless svn_available? quiet_system "svn", "ls", url, "--depth", "empty" end