diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb index 2c6f91c04d..9d228c3cfd 100644 --- a/Library/Homebrew/requirement.rb +++ b/Library/Homebrew/requirement.rb @@ -122,7 +122,7 @@ class Requirement end def inspect - "#<#{self.class.name}: #{name.inspect} #{tags.inspect}>" + "#<#{self.class.name}: #{tags.inspect}>" end def display_s diff --git a/Library/Homebrew/requirements/arch_requirement.rb b/Library/Homebrew/requirements/arch_requirement.rb index 8a9dc636a4..7157b5e7e4 100644 --- a/Library/Homebrew/requirements/arch_requirement.rb +++ b/Library/Homebrew/requirements/arch_requirement.rb @@ -27,6 +27,10 @@ class ArchRequirement < Requirement "This formula requires an #{@arch} architecture." end + def inspect + "#<#{self.class.name}: arch=#{@arch.to_s.inspect} #{tags.inspect}>" + end + def display_s "#{@arch} architecture" end diff --git a/Library/Homebrew/requirements/java_requirement.rb b/Library/Homebrew/requirements/java_requirement.rb index 89bfb67928..1c91bf5a52 100644 --- a/Library/Homebrew/requirements/java_requirement.rb +++ b/Library/Homebrew/requirements/java_requirement.rb @@ -45,7 +45,7 @@ class JavaRequirement < Requirement end def inspect - "#<#{self.class.name}: #{tags.inspect} version=#{@version.inspect}>" + "#<#{self.class.name}: version=#{@version.inspect} #{tags.inspect}>" end def display_s diff --git a/Library/Homebrew/requirements/macos_requirement.rb b/Library/Homebrew/requirements/macos_requirement.rb index 1b248be836..e8d9411a3a 100644 --- a/Library/Homebrew/requirements/macos_requirement.rb +++ b/Library/Homebrew/requirements/macos_requirement.rb @@ -67,7 +67,7 @@ class MacOSRequirement < Requirement end def inspect - "#<#{self.class.name}: #{tags.inspect} version#{@comparator}#{@version}>" + "#<#{self.class.name}: version#{@comparator}#{@version.to_s.inspect} #{tags.inspect}>" end def display_s diff --git a/Library/Homebrew/requirements/x11_requirement.rb b/Library/Homebrew/requirements/x11_requirement.rb index 4fe5c98538..d758c771c1 100644 --- a/Library/Homebrew/requirements/x11_requirement.rb +++ b/Library/Homebrew/requirements/x11_requirement.rb @@ -48,10 +48,6 @@ class X11Requirement < Requirement 0 end - - def inspect - "#<#{self.class.name}: #{tags.inspect}>" - end end require "extend/os/requirements/x11_requirement" diff --git a/Library/Homebrew/requirements/xcode_requirement.rb b/Library/Homebrew/requirements/xcode_requirement.rb index 5dbb1ce1f6..b3e6973cfd 100644 --- a/Library/Homebrew/requirements/xcode_requirement.rb +++ b/Library/Homebrew/requirements/xcode_requirement.rb @@ -46,7 +46,7 @@ class XcodeRequirement < Requirement end def inspect - "#<#{self.class.name}: #{tags.inspect} version=#{@version.inspect}>" + "#<#{self.class.name}: version>=#{@version.inspect} #{tags.inspect}>" end def display_s diff --git a/Library/Homebrew/test/java_requirement_spec.rb b/Library/Homebrew/test/java_requirement_spec.rb index 62b3e82b68..4998f4176b 100644 --- a/Library/Homebrew/test/java_requirement_spec.rb +++ b/Library/Homebrew/test/java_requirement_spec.rb @@ -18,7 +18,7 @@ describe JavaRequirement do describe "#inspect" do subject { described_class.new(%w[1.7+]) } - its(:inspect) { is_expected.to eq('#') } + its(:inspect) { is_expected.to eq('#') } end describe "#display_s" do