requirements: reword inspect() to place tags at end
This more closely matches requirements' display in the DSL.
This commit is contained in:
parent
a232ac8b1e
commit
635233b37e
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -48,10 +48,6 @@ class X11Requirement < Requirement
|
||||
|
||||
0
|
||||
end
|
||||
|
||||
def inspect
|
||||
"#<#{self.class.name}: #{tags.inspect}>"
|
||||
end
|
||||
end
|
||||
|
||||
require "extend/os/requirements/x11_requirement"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -18,7 +18,7 @@ describe JavaRequirement do
|
||||
describe "#inspect" do
|
||||
subject { described_class.new(%w[1.7+]) }
|
||||
|
||||
its(:inspect) { is_expected.to eq('#<JavaRequirement: [] version="1.7+">') }
|
||||
its(:inspect) { is_expected.to eq('#<JavaRequirement: version="1.7+" []>') }
|
||||
end
|
||||
|
||||
describe "#display_s" do
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user