capitalization fixes
"curl" is the binary, while "cURL" is the umbrella project.
This commit is contained in:
parent
c0a753edd3
commit
a427de5bee
@ -382,10 +382,10 @@ else
|
||||
curl_name_and_version="${curl_version_output%% (*}"
|
||||
if [[ $(numeric "${curl_name_and_version##* }") -lt $(numeric "$HOMEBREW_MINIMUM_CURL_VERSION") ]]
|
||||
then
|
||||
message="Please update your system cURL.
|
||||
message="Please update your system curl.
|
||||
Minimum required version: ${HOMEBREW_MINIMUM_CURL_VERSION}
|
||||
Your cURL version: ${curl_name_and_version##* }
|
||||
Your cURL executable: $(type -p $HOMEBREW_CURL)"
|
||||
Your curl version: ${curl_name_and_version##* }
|
||||
Your curl executable: $(type -p $HOMEBREW_CURL)"
|
||||
|
||||
if [[ -z $HOMEBREW_CURL_PATH || -z $HOMEBREW_DEVELOPER ]]; then
|
||||
HOMEBREW_SYSTEM_CURL_TOO_OLD=1
|
||||
|
||||
@ -157,7 +157,7 @@ class Build
|
||||
puts "Install to this prefix: #{formula.prefix}"
|
||||
|
||||
if args.git?
|
||||
puts "This directory is now a git repo. Make your changes and then use:"
|
||||
puts "This directory is now a Git repo. Make your changes and then use:"
|
||||
puts " git diff | pbcopy"
|
||||
puts "to copy the diff to the clipboard."
|
||||
end
|
||||
|
||||
@ -98,7 +98,7 @@ module Cask
|
||||
begin
|
||||
value = cask.send(stanza)
|
||||
rescue
|
||||
opoo "failure calling '#{stanza}' on Cask '#{cask}'" unless args.quiet?
|
||||
opoo "Failure calling '#{stanza}' on Cask '#{cask}'" unless args.quiet?
|
||||
puts ""
|
||||
next
|
||||
end
|
||||
|
||||
@ -84,7 +84,7 @@ module Cask
|
||||
caveat :path_environment_variable do |path|
|
||||
<<~EOS
|
||||
To use #{@cask}, you may need to add the #{path} directory
|
||||
to your PATH environment variable, e.g. (for bash shell):
|
||||
to your PATH environment variable, e.g. (for Bash shell):
|
||||
export PATH=#{path}:"$PATH"
|
||||
EOS
|
||||
end
|
||||
|
||||
@ -356,7 +356,7 @@ module Cask
|
||||
missing_formulae_and_casks = missing_cask_and_formula_dependencies
|
||||
|
||||
if missing_formulae_and_casks.empty?
|
||||
puts "All Formula dependencies satisfied."
|
||||
puts "All formula dependencies satisfied."
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@ -370,7 +370,7 @@ EOS
|
||||
# we cannot install a Homebrew cURL if homebrew/core is unavailable.
|
||||
if [[ ! -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] || ! brew install curl
|
||||
then
|
||||
odie "Curl must be installed and in your PATH!"
|
||||
odie "'curl' must be installed and in your PATH!"
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -381,7 +381,7 @@ EOS
|
||||
# we cannot install a Homebrew Git if homebrew/core is unavailable.
|
||||
if [[ ! -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] || ! brew install git
|
||||
then
|
||||
odie "Git must be installed and in your PATH!"
|
||||
odie "'git' must be installed and in your PATH!"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -351,7 +351,7 @@ module Homebrew
|
||||
|
||||
alias_rename = alias_update_pair(formula, new_formula_version)
|
||||
if alias_rename.present?
|
||||
ohai "renaming alias #{alias_rename.first} to #{alias_rename.last}"
|
||||
ohai "Renaming alias #{alias_rename.first} to #{alias_rename.last}"
|
||||
alias_rename.map! { |a| formula.tap.alias_dir/a }
|
||||
end
|
||||
|
||||
|
||||
@ -145,7 +145,7 @@ module Homebrew
|
||||
fc.tap = Tap.fetch(args.tap || "homebrew/core")
|
||||
raise TapUnavailableError, args.tap unless fc.tap.installed?
|
||||
|
||||
fc.url = args.named.first # Pull the first (and only) url from ARGV
|
||||
fc.url = args.named.first # Pull the first (and only) URL from ARGV
|
||||
|
||||
fc.mode = if args.autotools?
|
||||
:autotools
|
||||
|
||||
@ -44,7 +44,7 @@ module Homebrew
|
||||
|
||||
raise UsageError, "#{path} doesn't exist on disk. " \
|
||||
"Run #{Formatter.identifier("brew create --set-name #{path.basename} $URL")} " \
|
||||
"to create a new Formula!"
|
||||
"to create a new formula!"
|
||||
end.presence
|
||||
|
||||
# If no brews are listed, open the project root in an editor.
|
||||
|
||||
@ -68,7 +68,7 @@ module Homebrew
|
||||
|
||||
next unless args.git?
|
||||
|
||||
ohai "Setting up git repository"
|
||||
ohai "Setting up Git repository"
|
||||
cd stage_dir
|
||||
system "git", "init", "-q"
|
||||
system "git", "add", "-A"
|
||||
|
||||
@ -715,7 +715,7 @@ module Homebrew
|
||||
return if (paths & gnubin).empty?
|
||||
|
||||
<<~EOS
|
||||
Putting non-prefixed coreutils in your path can cause gmp builds to fail.
|
||||
Putting non-prefixed coreutils in your path can cause GMP builds to fail.
|
||||
EOS
|
||||
rescue FormulaUnavailableError
|
||||
nil
|
||||
|
||||
@ -100,13 +100,13 @@ class Pathname
|
||||
src.resource.stage { install(*src.files) }
|
||||
when Array
|
||||
if src.empty?
|
||||
opoo "tried to install empty array to #{self}"
|
||||
opoo "Tried to install empty array to #{self}"
|
||||
break
|
||||
end
|
||||
src.each { |s| install_p(s, File.basename(s)) }
|
||||
when Hash
|
||||
if src.empty?
|
||||
opoo "tried to install empty hash to #{self}"
|
||||
opoo "Tried to install empty hash to #{self}"
|
||||
break
|
||||
end
|
||||
src.each { |s, new_basename| install_p(s, new_basename) }
|
||||
@ -372,7 +372,7 @@ class Pathname
|
||||
def write_exec_script(*targets)
|
||||
targets.flatten!
|
||||
if targets.empty?
|
||||
opoo "tried to write exec scripts to #{self} for an empty list of targets"
|
||||
opoo "Tried to write exec scripts to #{self} for an empty list of targets"
|
||||
return
|
||||
end
|
||||
mkpath
|
||||
|
||||
@ -828,7 +828,7 @@ class Formula
|
||||
HOMEBREW_PREFIX/"var"
|
||||
end
|
||||
|
||||
# The directory where the formula's ZSH function files should be
|
||||
# The directory where the formula's zsh function files should be
|
||||
# installed.
|
||||
# This is symlinked into `HOMEBREW_PREFIX` after installation or with
|
||||
# `brew link` for formulae that are not keg-only.
|
||||
@ -852,7 +852,7 @@ class Formula
|
||||
prefix/"etc/bash_completion.d"
|
||||
end
|
||||
|
||||
# The directory where the formula's ZSH completion files should be
|
||||
# The directory where the formula's zsh completion files should be
|
||||
# installed.
|
||||
# This is symlinked into `HOMEBREW_PREFIX` after installation or with
|
||||
# `brew link` for formulae that are not keg-only.
|
||||
@ -1705,7 +1705,7 @@ class Formula
|
||||
deps ||= declared_runtime_dependencies unless undeclared
|
||||
deps ||= (declared_runtime_dependencies | undeclared_runtime_dependencies)
|
||||
rescue FormulaUnavailableError
|
||||
onoe "could not get runtime dependencies from #{path}!"
|
||||
onoe "Could not get runtime dependencies from #{path}!"
|
||||
deps ||= []
|
||||
end
|
||||
deps
|
||||
|
||||
@ -15,9 +15,9 @@ module Language
|
||||
def self.stage_deps(resources, target)
|
||||
if resources.empty?
|
||||
if Homebrew::EnvConfig.developer?
|
||||
odie "tried to stage empty Language::Go resources array"
|
||||
odie "Tried to stage empty Language::Go resources array"
|
||||
else
|
||||
opoo "tried to stage empty Language::Go resources array"
|
||||
opoo "Tried to stage empty Language::Go resources array"
|
||||
end
|
||||
end
|
||||
resources.grep(Resource::Go) { |resource| resource.stage(target) }
|
||||
|
||||
@ -492,7 +492,7 @@ module Homebrew
|
||||
end
|
||||
|
||||
if livecheck_strategy.present? && livecheck_url.blank?
|
||||
odebug "#{strategy_name} strategy requires a url"
|
||||
odebug "#{strategy_name} strategy requires a URL"
|
||||
next
|
||||
end
|
||||
|
||||
|
||||
@ -293,7 +293,7 @@ module RuboCop
|
||||
next if url_has_revision?(parameters(url).last)
|
||||
|
||||
offending_node(url)
|
||||
problem "Formulae in homebrew/core should specify a revision for git urls"
|
||||
problem "Formulae in homebrew/core should specify a revision for git URLs"
|
||||
end
|
||||
end
|
||||
|
||||
@ -316,7 +316,7 @@ module RuboCop
|
||||
next if url_has_tag?(parameters(url).last)
|
||||
|
||||
offending_node(url)
|
||||
problem "Formulae in homebrew/core should specify a tag for git urls"
|
||||
problem "Formulae in homebrew/core should specify a tag for git URLs"
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -127,7 +127,7 @@ class Sandbox
|
||||
end
|
||||
|
||||
if @failed && Homebrew::EnvConfig.verbose?
|
||||
ohai "Sandbox log", logs
|
||||
ohai "Sandbox Log", logs
|
||||
$stdout.flush # without it, brew test-bot would fail to catch the log
|
||||
end
|
||||
end
|
||||
|
||||
@ -209,7 +209,7 @@ class Tap
|
||||
return "N/A" unless installed?
|
||||
|
||||
pretty_revision = git_short_head
|
||||
return "(no git repository)" unless pretty_revision
|
||||
return "(no Git repository)" unless pretty_revision
|
||||
|
||||
"(git revision #{pretty_revision}; last commit #{git_last_commit_date})"
|
||||
end
|
||||
|
||||
@ -26,8 +26,8 @@ begin
|
||||
trap("INT", old_trap)
|
||||
|
||||
if Homebrew::EnvConfig.developer? || ENV["CI"].present?
|
||||
raise "cannot find child processes without `pgrep`, please install!" unless which("pgrep")
|
||||
raise "cannot kill child processes without `pkill`, please install!" unless which("pkill")
|
||||
raise "Cannot find child processes without `pgrep`, please install!" unless which("pgrep")
|
||||
raise "Cannot kill child processes without `pkill`, please install!" unless which("pkill")
|
||||
end
|
||||
|
||||
formula = T.must(args.named.to_resolved_formulae.first)
|
||||
|
||||
@ -25,7 +25,7 @@ describe "Bash" do
|
||||
end
|
||||
|
||||
context "every `.sh` file" do
|
||||
it "has valid bash syntax" do
|
||||
it "has valid Bash syntax" do
|
||||
Pathname.glob("#{HOMEBREW_LIBRARY_PATH}/**/*.sh").each do |path|
|
||||
relative_path = path.relative_path_from(HOMEBREW_LIBRARY_PATH)
|
||||
next if relative_path.to_s.start_with?("shims/", "test/", "vendor/")
|
||||
@ -42,7 +42,7 @@ describe "Bash" do
|
||||
end
|
||||
|
||||
context "every shim script" do
|
||||
it "has valid bash syntax" do
|
||||
it "has valid Bash syntax" do
|
||||
# These have no file extension, but can be identified by their shebang.
|
||||
(HOMEBREW_LIBRARY_PATH/"shims").find do |path|
|
||||
next if path.directory?
|
||||
|
||||
@ -41,13 +41,13 @@ describe Cask::Cask, :cask do
|
||||
expect(c.token).to eq("local-caffeine")
|
||||
end
|
||||
|
||||
it "returns an instance of the Cask from a url" do
|
||||
it "returns an instance of the Cask from a URL" do
|
||||
c = Cask::CaskLoader.load("file://#{tap_path}/Casks/local-caffeine.rb")
|
||||
expect(c).to be_kind_of(described_class)
|
||||
expect(c.token).to eq("local-caffeine")
|
||||
end
|
||||
|
||||
it "raises an error when failing to download a Cask from a url" do
|
||||
it "raises an error when failing to download a Cask from a URL" do
|
||||
expect {
|
||||
url = "file://#{tap_path}/Casks/notacask.rb"
|
||||
|
||||
|
||||
@ -98,7 +98,7 @@ describe Cask::Cmd::Info, :cask do
|
||||
|
||||
Custom text via puts followed by DSL-generated text:
|
||||
To use with-caveats, you may need to add the /custom/path/bin directory
|
||||
to your PATH environment variable, e.g. (for bash shell):
|
||||
to your PATH environment variable, e.g. (for Bash shell):
|
||||
export PATH=/custom/path/bin:"$PATH"
|
||||
|
||||
EOS
|
||||
|
||||
@ -192,7 +192,7 @@ describe Caveats do
|
||||
allow(Utils::Shell).to receive(:parent).and_return(nil)
|
||||
end
|
||||
|
||||
it "gives dir where bash completions have been installed" do
|
||||
it "gives dir where Bash completions have been installed" do
|
||||
(path/"etc/bash_completion.d").mkpath
|
||||
expect(caveats).to include(HOMEBREW_PREFIX/"etc/bash_completion.d")
|
||||
end
|
||||
|
||||
@ -419,7 +419,7 @@ describe DownloadStrategyDetector do
|
||||
it { is_expected.to eq(GitHubGitDownloadStrategy) }
|
||||
end
|
||||
|
||||
it "defaults to cURL" do
|
||||
it "defaults to curl" do
|
||||
expect(subject).to eq(CurlDownloadStrategy)
|
||||
end
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ describe RuboCop::Cop::Cask::HomepageUrlTrailingSlash do
|
||||
|
||||
subject(:cop) { described_class.new }
|
||||
|
||||
context "when the homepage url ends with a slash" do
|
||||
context "when the homepage URL ends with a slash" do
|
||||
let(:source) do
|
||||
<<-CASK.undent
|
||||
cask 'foo' do
|
||||
@ -21,7 +21,7 @@ describe RuboCop::Cop::Cask::HomepageUrlTrailingSlash do
|
||||
include_examples "does not report any offenses"
|
||||
end
|
||||
|
||||
context "when the homepage url does not end with a slash but has a path" do
|
||||
context "when the homepage URL does not end with a slash but has a path" do
|
||||
let(:source) do
|
||||
<<-CASK.undent
|
||||
cask 'foo' do
|
||||
@ -33,7 +33,7 @@ describe RuboCop::Cop::Cask::HomepageUrlTrailingSlash do
|
||||
include_examples "does not report any offenses"
|
||||
end
|
||||
|
||||
context "when the homepage url does not end with a slash and has no path" do
|
||||
context "when the homepage URL does not end with a slash and has no path" do
|
||||
let(:source) do
|
||||
<<-CASK.undent
|
||||
cask 'foo' do
|
||||
|
||||
@ -280,7 +280,7 @@ describe RuboCop::Cop::FormulaAudit::GitUrls do
|
||||
subject(:cop) { described_class.new }
|
||||
|
||||
context "when a git URL is used" do
|
||||
it "reports no offenses with a non-git url" do
|
||||
it "reports no offenses with a non-git URL" do
|
||||
expect_no_offenses(<<~RUBY, "/homebrew-core/")
|
||||
class Foo < Formula
|
||||
desc "foo"
|
||||
@ -329,7 +329,7 @@ describe RuboCop::Cop::FormulaAudit::GitUrls do
|
||||
class Foo < Formula
|
||||
desc "foo"
|
||||
url "https://github.com/foo/bar.git",
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Formulae in homebrew/core should specify a revision for git urls
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Formulae in homebrew/core should specify a revision for git URLs
|
||||
tag: "v1.0.0"
|
||||
end
|
||||
RUBY
|
||||
@ -340,7 +340,7 @@ describe RuboCop::Cop::FormulaAudit::GitUrls do
|
||||
class Foo < Formula
|
||||
desc "foo"
|
||||
url "https://github.com/foo/bar.git",
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Formulae in homebrew/core should specify a revision for git urls
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Formulae in homebrew/core should specify a revision for git URLs
|
||||
shallow: false,
|
||||
tag: "v1.0.0"
|
||||
end
|
||||
@ -435,7 +435,7 @@ describe RuboCop::Cop::FormulaAuditStrict::GitUrls do
|
||||
class Foo < Formula
|
||||
desc "foo"
|
||||
url "https://github.com/foo/bar.git",
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Formulae in homebrew/core should specify a tag for git urls
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Formulae in homebrew/core should specify a tag for git URLs
|
||||
revision: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
||||
end
|
||||
RUBY
|
||||
@ -446,7 +446,7 @@ describe RuboCop::Cop::FormulaAuditStrict::GitUrls do
|
||||
class Foo < Formula
|
||||
desc "foo"
|
||||
url "https://github.com/foo/bar.git",
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Formulae in homebrew/core should specify a tag for git urls
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Formulae in homebrew/core should specify a tag for git URLs
|
||||
revision: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
|
||||
shallow: false
|
||||
end
|
||||
|
||||
@ -19,6 +19,6 @@ class Failball < Formula
|
||||
system "/usr/bin/false" if ENV["FAILBALL_BUILD_ERROR"]
|
||||
|
||||
# This should get marshalled into a RuntimeError.
|
||||
raise "something that isn't a build error happened!"
|
||||
raise "Something that isn't a build error happened!"
|
||||
end
|
||||
end
|
||||
|
||||
@ -82,7 +82,7 @@ describe Utils::Shell do
|
||||
describe "::prepend_path_in_profile" do
|
||||
let(:path) { "/my/path" }
|
||||
|
||||
it "supports Tcsh" do
|
||||
it "supports tcsh" do
|
||||
ENV["SHELL"] = "/bin/tcsh"
|
||||
expect(described_class.prepend_path_in_profile(path))
|
||||
.to eq("echo 'setenv PATH #{path}:$PATH' >> #{shell_profile}")
|
||||
@ -94,7 +94,7 @@ describe Utils::Shell do
|
||||
.to eq("echo 'export PATH=\"#{path}:$PATH\"' >> #{shell_profile}")
|
||||
end
|
||||
|
||||
it "supports Fish" do
|
||||
it "supports fish" do
|
||||
ENV["SHELL"] = "/usr/local/bin/fish"
|
||||
ENV["fish_user_paths"] = "/some/path"
|
||||
expect(described_class.prepend_path_in_profile(path))
|
||||
|
||||
@ -16,7 +16,7 @@ module Utils
|
||||
which("curl"),
|
||||
"/usr/bin/curl",
|
||||
].compact.map { |c| Pathname(c) }.find(&:executable?)
|
||||
raise "no executable curl was found" unless @curl
|
||||
raise "No executable curl was found" unless @curl
|
||||
|
||||
@curl
|
||||
end
|
||||
|
||||
@ -32,7 +32,7 @@ module PyPI
|
||||
match = if package_string.start_with?(PYTHONHOSTED_URL_PREFIX)
|
||||
File.basename(package_string).match(/^(.+)-([a-z\d.]+?)(?:.tar.gz|.zip)$/)
|
||||
end
|
||||
raise ArgumentError, "package should be a valid PyPI url" if match.blank?
|
||||
raise ArgumentError, "package should be a valid PyPI URL" if match.blank?
|
||||
|
||||
@name = match[1]
|
||||
@version = match[2]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user