diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb index a6d8545cb0ca48d70cd939dbea2542b6306ad008..2c6f91c04d18667004533604f252a74fa6e935d8 100644 --- a/Library/Homebrew/requirement.rb +++ b/Library/Homebrew/requirement.rb @@ -126,7 +126,7 @@ class Requirement end def display_s - name + name.capitalize end def mktemp(&block) diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb index a519a2cdbba625620a3ff4e44ec3678ea049a8f5..89bfb67928a349d27b21b6d9354ff84a5f4cf789 100644 --- a/Library/Homebrew/requirements/java_requirement.rb +++ b/Library/Homebrew/requirements/java_requirement.rb @@ -55,9 +55,9 @@ class JavaRequirement < Requirement else ">=" end - "#{name} #{op} #{version_without_plus}" + "#{name.capitalize} #{op} #{version_without_plus}" else - name + name.capitalize end end diff --git a/Library/Homebrew/requirements/macos_requirement.rb b/Library/Homebrew/requirements/macos_requirement.rb index b9d4fbc5561a793000e9be4b0cb7dbe1cf9b4a69..1b248be836fd87c574d4e12187c310bebb6ff9d0 100644 --- a/Library/Homebrew/requirements/macos_requirement.rb +++ b/Library/Homebrew/requirements/macos_requirement.rb @@ -71,7 +71,7 @@ class MacOSRequirement < Requirement end def display_s - return "macOS is required" unless version_specified? + return "macOS" unless version_specified? "macOS #{@comparator} #{@version}" end diff --git a/Library/Homebrew/requirements/osxfuse_requirement.rb b/Library/Homebrew/requirements/osxfuse_requirement.rb index 9a4a0f527f492d6c4b1fdfe6cb7838f1f058d411..6dbc3917e1b9aa5ec5e4988b1e18c65485633830 100644 --- a/Library/Homebrew/requirements/osxfuse_requirement.rb +++ b/Library/Homebrew/requirements/osxfuse_requirement.rb @@ -7,8 +7,14 @@ require "requirement" # # @api private class OsxfuseRequirement < Requirement + extend T::Sig cask "osxfuse" fatal true + + sig { returns(String) } + def display_s + "FUSE" + end end require "extend/os/requirements/osxfuse_requirement" diff --git a/Library/Homebrew/requirements/xcode_requirement.rb b/Library/Homebrew/requirements/xcode_requirement.rb index c58b72259f6380b328e3f6606ab0d1b4999a891a..5dbb1ce1f60a9554b6964eea85b94cf7b1febd17 100644 --- a/Library/Homebrew/requirements/xcode_requirement.rb +++ b/Library/Homebrew/requirements/xcode_requirement.rb @@ -48,6 +48,12 @@ class XcodeRequirement < Requirement def inspect "#<#{self.class.name}: #{tags.inspect} version=#{@version.inspect}>" end + + def display_s + return name.capitalize unless @version + + "#{name.capitalize} >= #{@version}" + end end require "extend/os/requirements/xcode_requirement" diff --git a/Library/Homebrew/test/java_requirement_spec.rb b/Library/Homebrew/test/java_requirement_spec.rb index 42a065faf2a32a5081a870cf475b6f2142d5ac66..62b3e82b68375cea0bbba727f4fb4dfcadee44a9 100644 --- a/Library/Homebrew/test/java_requirement_spec.rb +++ b/Library/Homebrew/test/java_requirement_spec.rb @@ -23,19 +23,19 @@ describe JavaRequirement do describe "#display_s" do context "without specific version" do - its(:display_s) { is_expected.to eq("java") } + its(:display_s) { is_expected.to eq("Java") } end context "with version 1.8" do subject { described_class.new(%w[1.8]) } - its(:display_s) { is_expected.to eq("java = 1.8") } + its(:display_s) { is_expected.to eq("Java = 1.8") } end context "with version 1.8+" do subject { described_class.new(%w[1.8+]) } - its(:display_s) { is_expected.to eq("java >= 1.8") } + its(:display_s) { is_expected.to eq("Java >= 1.8") } end end diff --git a/Library/Homebrew/test/requirements/java_requirement_spec.rb b/Library/Homebrew/test/requirements/java_requirement_spec.rb index 59e4dcc645b7c8280de9db124794174ca38f0a74..eb43af7a72203963e61521e6111892188d323d36 100644 --- a/Library/Homebrew/test/requirements/java_requirement_spec.rb +++ b/Library/Homebrew/test/requirements/java_requirement_spec.rb @@ -7,27 +7,27 @@ describe JavaRequirement do describe "initialize" do it "parses '1.8' tag correctly" do req = described_class.new(["1.8"]) - expect(req.display_s).to eq("java = 1.8") + expect(req.display_s).to eq("Java = 1.8") end it "parses '9' tag correctly" do req = described_class.new(["9"]) - expect(req.display_s).to eq("java = 9") + expect(req.display_s).to eq("Java = 9") end it "parses '9+' tag correctly" do req = described_class.new(["9+"]) - expect(req.display_s).to eq("java >= 9") + expect(req.display_s).to eq("Java >= 9") end it "parses '11' tag correctly" do req = described_class.new(["11"]) - expect(req.display_s).to eq("java = 11") + expect(req.display_s).to eq("Java = 11") end it "parses bogus tag correctly" do req = described_class.new(["bogus1.8"]) - expect(req.display_s).to eq("java") + expect(req.display_s).to eq("Java") end end end