requirements: reword error messages for consistency
also add formatting to download URLs
This commit is contained in:
parent
635233b37e
commit
212367c1c0
@ -21,7 +21,7 @@ class OsxfuseRequirement < Requirement
|
|||||||
end
|
end
|
||||||
|
|
||||||
def message
|
def message
|
||||||
msg = "libfuse is required to install this formula.\n"
|
msg = "libfuse is required for this software.\n"
|
||||||
if libfuse_formula_exists?
|
if libfuse_formula_exists?
|
||||||
<<~EOS
|
<<~EOS
|
||||||
#{msg}Run `brew install libfuse` to install it.
|
#{msg}Run `brew install libfuse` to install it.
|
||||||
|
@ -21,4 +21,8 @@ class OsxfuseRequirement < Requirement
|
|||||||
ENV.append_path "HOMEBREW_INCLUDE_PATHS", "/usr/local/include/osxfuse"
|
ENV.append_path "HOMEBREW_INCLUDE_PATHS", "/usr/local/include/osxfuse"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def message
|
||||||
|
"FUSE for macOS is required for this software. #{super}"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
@ -17,6 +17,6 @@ class X11Requirement < Requirement
|
|||||||
end
|
end
|
||||||
|
|
||||||
def message
|
def message
|
||||||
"XQuartz #{min_version} (or newer) is required to install this formula. #{super}"
|
"XQuartz #{min_version} (or newer) is required for this software. #{super}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -48,7 +48,7 @@ class Requirement
|
|||||||
if download
|
if download
|
||||||
s += <<~EOS
|
s += <<~EOS
|
||||||
You can download from:
|
You can download from:
|
||||||
#{download}
|
#{Formatter.url(download)}
|
||||||
EOS
|
EOS
|
||||||
end
|
end
|
||||||
s
|
s
|
||||||
|
@ -24,7 +24,7 @@ class ArchRequirement < Requirement
|
|||||||
end
|
end
|
||||||
|
|
||||||
def message
|
def message
|
||||||
"This formula requires an #{@arch} architecture."
|
"The #{@arch} architecture is required for this software."
|
||||||
end
|
end
|
||||||
|
|
||||||
def inspect
|
def inspect
|
||||||
|
@ -39,7 +39,7 @@ class JavaRequirement < Requirement
|
|||||||
|
|
||||||
def message
|
def message
|
||||||
version_string = " #{@version}" if @version
|
version_string = " #{@version}" if @version
|
||||||
s = "Java#{version_string} is required to install this formula.\n"
|
s = "Java#{version_string} is required for this software.\n"
|
||||||
s += suggestion
|
s += suggestion
|
||||||
s
|
s
|
||||||
end
|
end
|
||||||
|
@ -10,6 +10,6 @@ class LinuxRequirement < Requirement
|
|||||||
satisfy(build_env: false) { OS.linux? }
|
satisfy(build_env: false) { OS.linux? }
|
||||||
|
|
||||||
def message
|
def message
|
||||||
"Linux is required."
|
"Linux is required for this software."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -41,11 +41,11 @@ class MacOSRequirement < Requirement
|
|||||||
end
|
end
|
||||||
|
|
||||||
def message(type: :formula)
|
def message(type: :formula)
|
||||||
return "macOS is required." unless version_specified?
|
return "macOS is required for this software." unless version_specified?
|
||||||
|
|
||||||
case @comparator
|
case @comparator
|
||||||
when ">="
|
when ">="
|
||||||
"macOS #{@version.pretty_name} or newer is required."
|
"macOS #{@version.pretty_name} or newer is required for this software."
|
||||||
when "<="
|
when "<="
|
||||||
case type
|
case type
|
||||||
when :formula
|
when :formula
|
||||||
@ -59,10 +59,10 @@ class MacOSRequirement < Requirement
|
|||||||
else
|
else
|
||||||
if @version.respond_to?(:to_ary)
|
if @version.respond_to?(:to_ary)
|
||||||
*versions, last = @version.map(&:pretty_name)
|
*versions, last = @version.map(&:pretty_name)
|
||||||
return "macOS #{versions.join(", ")} or #{last} is required."
|
return "macOS #{versions.join(", ")} or #{last} is required for this software."
|
||||||
end
|
end
|
||||||
|
|
||||||
"macOS #{@version.pretty_name} is required."
|
"macOS #{@version.pretty_name} is required for this software."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ class X11Requirement < Requirement
|
|||||||
end
|
end
|
||||||
|
|
||||||
def message
|
def message
|
||||||
"X11 is required to install this formula, either Xorg #{min_version} or " \
|
"X11 is required for this software, either Xorg #{min_version} or " \
|
||||||
"xdpyinfo #{min_xdpyinfo_version}, or newer. #{super}"
|
"xdpyinfo #{min_xdpyinfo_version}, or newer. #{super}"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ describe JavaRequirement do
|
|||||||
end
|
end
|
||||||
|
|
||||||
describe "#message" do
|
describe "#message" do
|
||||||
its(:message) { is_expected.to match(/Java is required to install this formula./) }
|
its(:message) { is_expected.to match(/Java is required for this software./) }
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "#inspect" do
|
describe "#inspect" do
|
||||||
|
@ -44,7 +44,7 @@ describe OsxfuseRequirement do
|
|||||||
|
|
||||||
describe "#message" do
|
describe "#message" do
|
||||||
it "prompts for installation of 'libfuse' on Linux", :needs_linux do
|
it "prompts for installation of 'libfuse' on Linux", :needs_linux do
|
||||||
expect(requirement.message).to match("libfuse is required to install this formula")
|
expect(requirement.message).to match("libfuse is required for this software")
|
||||||
end
|
end
|
||||||
|
|
||||||
it "prompts for installation of 'osxFuse' on macOS", :needs_macos do
|
it "prompts for installation of 'osxFuse' on macOS", :needs_macos do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user