admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #10196 from souleater7/delete-devel

Browse Source 
Delete references to devel
This commit is contained in:
Mike McQuaid 2021-01-06 09:15:52 +00:00 committed by GitHub
commit dad7dc6a14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 24 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cli/args.rbi
View File

@ -3,9 +3,6 @@
module Homebrew
module CLI
class Args < OpenStruct
sig { returns(T.nilable(T::Boolean)) }
def devel?; end
sig { returns(T.nilable(T::Boolean)) }
def HEAD?; end

4
Library/Homebrew/cmd/fetch.rb
View File

@ -24,8 +24,6 @@ module Homebrew
EOS
switch "--HEAD",
description: "Fetch HEAD version instead of stable version."
switch "--devel",
description: "Fetch development version instead of stable version."
switch "-f", "--force",
description: "Remove a previously cached version and re-fetch."
switch "-v", "--verbose",
@ -53,10 +51,8 @@ module Homebrew
description: "Treat all named arguments as casks."
conflicts "--formula", "--cask"
conflicts "--devel", "--HEAD"
conflicts "--build-from-source", "--build-bottle", "--force-bottle"
conflicts "--cask", "--HEAD"
conflicts "--cask", "--devel"
conflicts "--cask", "--deps"
conflicts "--cask", "-s"
conflicts "--cask", "--build-bottle"

3
Library/Homebrew/dev-cmd/test.rb
View File

@ -23,8 +23,6 @@ module Homebrew
*Example:* `brew install jruby && brew test jruby`
EOS
switch "--devel",
description: "Test the development version of a formula."
switch "--HEAD",
description: "Test the head version of a formula."
switch "--keep-tmp",
@ -32,7 +30,6 @@ module Homebrew
switch "--retry",
description: "Retry if a testing fails."
conflicts "--devel", "--HEAD"
min_named :formula
end
end

5
Library/Homebrew/rubocops/lines.rb
View File

@ -473,10 +473,9 @@ module RuboCop
end
find_instance_method_call(body_node, "ARGV", :include?) do |method|
param = parameters(method).first
next unless match = regex_match_group(param, /^--(HEAD|devel)/)
next unless parameters_passed?(method, "--HEAD")
problem "Use \"if build.#{match[1].downcase}?\" instead"
problem "Use \"if build.head?\" instead"
end
find_const(body_node, "MACOS_VERSION") do

2
Library/Homebrew/test/rubocops/lines_spec.rb
View File

@ -1387,8 +1387,8 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
url 'https://brew.sh/foo-1.0.tgz'
test do
head = ARGV.include? "--HEAD"
^^^^^^ Use "if build.head?" instead
^^^^ Use build instead of ARGV to check options
^^^^^^^^^^^^^^^^^^^^^^ Use "if build.head?" instead
end
end
RUBY

32
Library/Homebrew/test/rubocops/urls_spec.rb
View File

@ -211,18 +211,18 @@ describe RuboCop::Cop::FormulaAudit::Urls do
end
end
it "with offenses in stable/devel/head block" do
it "with offenses in stable/head block" do
expect_offense(<<~RUBY)
class Foo < Formula
desc "foo"
url "https://foo.com"
devel do
stable do
url "git://github.com/foo.git",
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Please use https:// for git://github.com/foo.git
:tag => "v1.0.0-alpha.1",
:tag => "v1.0.1",
:revision => "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
version "1.0.0-alpha.1"
version "1.0.1"
end
end
RUBY
@ -380,18 +380,6 @@ describe RuboCop::Cop::FormulaAudit::GitUrls do
RUBY
end
it "reports no offenses with missing arguments in `devel`" do
expect_no_offenses(<<~RUBY, "/homebrew-core/")
class Foo < Formula
desc "foo"
url "https://foo.com"
devel do
url "https://github.com/foo/bar.git"
end
end
RUBY
end
it "reports no offenses for non-core taps" do
expect_no_offenses(<<~RUBY)
class Foo < Formula
@ -477,18 +465,6 @@ describe RuboCop::Cop::FormulaAuditStrict::GitUrls do
RUBY
end
it "reports no offenses with missing arguments in `devel`" do
expect_no_offenses(<<~RUBY, "/homebrew-core/")
class Foo < Formula
desc "foo"
url "https://foo.com"
devel do
url "https://github.com/foo/bar.git"
end
end
RUBY
end
it "reports no offenses for non-core taps" do
expect_no_offenses(<<~RUBY)
class Foo < Formula

1
Library/Homebrew/test/support/fixtures/receipt.json
View File

@ -31,7 +31,6 @@
"spec": "stable",
"versions": {
"stable": "2.14",
"devel": "2.15",
"head": "HEAD-0000000"
}
}

2
Library/Homebrew/test/version_spec.rb
View File

@ -615,7 +615,7 @@ describe Version do
.to be_detected_from("https://brew.sh/dada-v2017-04-17.tar.gz")
end
specify "devel spec version style" do
specify "unstable version style" do
expect(described_class.create("1.3.0-beta.1"))
.to be_detected_from("https://registry.npmjs.org/@angular/cli/-/cli-1.3.0-beta.1.tgz")
expect(described_class.create("2.074.0-beta1"))

1
Library/Homebrew/version.rb
View File

@ -412,7 +412,6 @@ class Version
m = /[-_](\d+\.\d+(?:\.\d+)?(?:-\d+)?)[-_.](?:i[36]86|x86|x64(?:[-_](?:32|64))?)$/.match(stem)
return m.captures.first unless m.nil?
# devel spec
# e.g. https://registry.npmjs.org/@angular/cli/-/cli-1.3.0-beta.1.tgz
# e.g. https://github.com/dlang/dmd/archive/v2.074.0-beta1.tar.gz
# e.g. https://github.com/dlang/dmd/archive/v2.074.0-rc1.tar.gz

7
completions/bash/brew
View File

@ -227,7 +227,7 @@ _brew_fetch() {
-*)
__brewcomp "
--deps --force
--devel --HEAD
--HEAD
--build-from-source --force-bottle --build-bottle
--retry
$(brew options --compact "$prv" 2>/dev/null)
@ -268,12 +268,11 @@ _brew_install() {
-*)
if __brewcomp_words_include "--interactive"
then
__brewcomp "--devel --git --HEAD"
__brewcomp "--git --HEAD"
else
__brewcomp "
--build-from-source --build-bottle --force-bottle
--debug
--devel
--HEAD
--ignore-dependencies
--interactive
@ -604,7 +603,7 @@ _brew_uses() {
local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in
-*)
__brewcomp "--installed --recursive --include-build --include-test --include-optional --skip-recommended --devel --HEAD"
__brewcomp "--installed --recursive --include-build --include-test --include-optional --skip-recommended"
return
;;
esac

16
completions/fish/brew.fish
View File

@ -322,9 +322,7 @@ __fish_brew_complete_arg 'fetch' -l deps -d "Also download dependen
__fish_brew_complete_arg 'fetch' -l build-from-source -d "Fetch source package instead of bottle"
__fish_brew_complete_arg 'fetch' -s v -l verbose -d "Do a verbose VCS checkout"
__fish_brew_complete_arg 'fetch' -l retry -d "Retry if a download fails or re-download if the checksum has changed"
# --HEAD and --devel are mutually exclusive:
__fish_brew_complete_arg 'fetch; and not __fish_brew_opt --devel --HEAD' -l devel -d "Download the development version from a VCS"
__fish_brew_complete_arg 'fetch; and not __fish_brew_opt --devel --HEAD' -l HEAD -d "Download the HEAD version from a VCS"
__fish_brew_complete_arg 'fetch' -l HEAD -d "Download the HEAD version from a VCS"
# --build-from-source and --force-bottle are mutually exclusive:
__fish_brew_complete_arg 'fetch; and not __fish_brew_opt --force-bottle' -s s -l build-from-source -d "Download the source rather than a bottle"
__fish_brew_complete_arg 'fetch; and not __fish_brew_opt --build-from-source -s' -l force-bottle -d "Download a bottle if it exists"
@ -386,9 +384,7 @@ __fish_brew_complete_arg 'install upgrade' -l cc -d "Attempt to compile using th
__fish_brew_complete_arg 'install upgrade; and not __fish_brew_opt --force-bottle' -s s -l build-from-source -d "Compile the formula from source"
# FIXME: -s misbehaves allowing --force-bottle
__fish_brew_complete_arg 'install upgrade; and not __fish_brew_opt -s --build-from-source' -l force-bottle -d "Install from a bottle if it exists"
# --HEAD and --devel are mutually exclusive:
__fish_brew_complete_arg 'install upgrade; and not __fish_brew_opt --devel --HEAD' -l devel -d "Install the development version"
__fish_brew_complete_arg 'install upgrade; and not __fish_brew_opt --devel --HEAD' -l HEAD -d "Install the HEAD version"
__fish_brew_complete_arg 'install upgrade' -l HEAD -d "Install the HEAD version"
__fish_brew_complete_arg 'install upgrade' -l keep-tmp -d "Keep temp files created during installation"
__fish_brew_complete_arg 'install upgrade' -l build-bottle -d "Prepare the formula for eventual bottling during installation"
__fish_brew_complete_arg 'install upgrade' -s i -l interactive -d "Download and patch formula, then open a shell"
@ -596,9 +592,6 @@ __fish_brew_complete_arg 'uses' -l recursive -d "Resolve more than one level of
__fish_brew_complete_arg 'uses' -l include-build -d "Include the :build type dependencies"
__fish_brew_complete_arg 'uses' -l include-optional -d "Include the :optional type dependencies"
__fish_brew_complete_arg 'uses' -l skip-recommended -d "Skip :recommended type dependencies"
# --HEAD and --devel are mutually exclusive:
__fish_brew_complete_arg 'uses; and not __fish_brew_opt --devel --HEAD' -l devel -d "Find cases development builds using formulae"
__fish_brew_complete_arg 'uses; and not __fish_brew_opt --devel --HEAD' -l HEAD -d "Find cases HEAD builds using formulae"
__fish_brew_complete_cmd '--cache' "Display Homebrew/formula's cache location"
@ -666,7 +659,6 @@ __fish_brew_complete_arg 'bottle; and __fish_brew_opt --write' -l no-commit -d "
__fish_brew_complete_cmd 'bump-formula-pr' "Create a pull request to update formula with a new URL or tag"
# FIXME: should it suggest all/installed formulae or only files with a cetain name?
__fish_brew_complete_arg 'bump-formula-pr' -a '(__fish_brew_suggest_formulae_all)'
__fish_brew_complete_arg 'bump-formula-pr' -l devel -d "Bump the development version instead of stable"
__fish_brew_complete_arg 'bump-formula-pr' -s n -l dry-run -d "Show what would be done"
# --write depends on --dry-run:
__fish_brew_complete_arg 'bump-formula-pr; and __fish_brew_opt -n --dry-run' -l write -d "Write changes but not commit them"
@ -742,9 +734,7 @@ __fish_brew_complete_cmd 'test' "Run tests for given formula"
__fish_brew_complete_arg 'test' -a '(__fish_brew_suggest_formulae_installed)'
__fish_brew_complete_arg 'test' -s d -l debug -d "Test with an interative debugger"
__fish_brew_complete_arg 'test' -l keep-tmp -d "Don't delete temp files created for the test"
# --HEAD and --devel are mutually exclusive:
__fish_brew_complete_arg 'test; and not __fish_brew_opt --devel --HEAD' -l devel -d "Test the development version"
__fish_brew_complete_arg 'test; and not __fish_brew_opt --devel --HEAD' -l HEAD -d "Test the HEAD version"
__fish_brew_complete_arg 'test' -l HEAD -d "Test the HEAD version"
__fish_brew_complete_cmd 'tests' "Run Homebrew's unit and integration tests"

23
completions/zsh/_brew
View File

@ -266,11 +266,10 @@ _brew_bottle() {
'--write'
}
# brew bump-formula-pr [--devel] [--dry-run] [--audit|--strict] --url=url --sha256=sha-256 formula
# brew bump-formula-pr [--devel] [--dry-run] [--audit|--strict] --tag=tag --revision=revision formula
# brew bump-formula-pr [--dry-run] [--audit|--strict] --url=url --sha256=sha-256 formula
# brew bump-formula-pr [--dry-run] [--audit|--strict] --tag=tag --revision=revision formula
_brew_bump_formula_pr() {
_arguments \
'--devel[bump the development rather than stable version]' \
'--dry-run[print what would be done rather than doing it]' \
'(--strict)--audit[run brew audit before opening the PR]' \
'(--audit)--strict[run brew audit --strict before opening the PR]' \
@ -403,15 +402,14 @@ _brew_edit() {
'*:: :__brew_formulae_or_ruby_files'
}
# brew fetch [--force] [--retry] [-v] [--devel|--HEAD] [--deps]
# brew fetch [--force] [--retry] [-v] [--HEAD] [--deps]
# [--build-from-source|--build-bottle|--force-bottle] formulae
_brew_fetch() {
_arguments \
'(--force -f)'{--force,-f}'[remove previously cached version and re-fetch]' \
'--retry[retry if a download fails or re-download if the checksum of a previously cached version no longer matches]' \
'(--verbose -v)'{--verbose,-v}'[verbose VCS checkout]' \
'(--HEAD)--devel[fetch devel version instead of stable]' \
'(--devel)--HEAD[fetch HEAD version instead of stable]' \
'--HEAD[fetch HEAD version instead of stable]' \
'--deps[also download dependencies for any listed formulae]' \
'(--build-from-source -s --force-bottle --build-bottle)'{--build-from-source,-s}'[download the source rather than a bottle]' \
'(--build-from-source -s --force-bottle)--build-bottle[download the source (for eventual bottling) rather than a bottle]' \
@ -466,7 +464,7 @@ _brew_info() {
# brew install [--debug] [--env=std|super]
# [--ignore-dependencies|--only-dependencies] [--include-test]
# [--cc=compiler] [--build-from-source|--build-bottle|--force-fottle]
# [--devel|--HEAD] [--fetch-HEAD] [--bottle-arch=architecture] [--keep-tmp] formulae
# [--HEAD] [--fetch-HEAD] [--bottle-arch=architecture] [--keep-tmp] formulae
# brew install --interactive [--git] formula
# brew install --cask cask
_brew_install() {
@ -482,7 +480,7 @@ _brew_install() {
'(--build-from-source -s --force-bottle)--build-bottle[prepare the formula for eventual bottling during installation, skipping any post-install steps]' \
'(--build-from-source -s --build-bottle)--force-bottle[install from a bottle if it exists for the current version of OS X, even if it would not normally be used for installation]' \
'--include-test[install testing dependencies]' \
'(--devel --HEAD)'{--devel,--HEAD}'[install the development / HEAD version]' \
'--HEAD[install the HEAD version]' \
'--fetch-HEAD[fetch the upstream repository to detect if the HEAD installation of the formula is outdated]' \
'--bottle-arch=-[optimise bottles for the specified architecture]:architecture: ' \
'--keep-tmp[don''t delete temporary files created during installation]' \
@ -751,10 +749,10 @@ _brew_tap_readme() {
':name: '
}
# brew test [--devel|--HEAD] [--debug] [--keep-tmp] formulae:
# brew test [--HEAD] [--debug] [--keep-tmp] formulae:
_brew_test() {
_arguments \
'(--devel --HEAD)'{--devel,--HEAD}'[use the development / head version of the formula]' \
'--HEAD[use the head version of the formula]' \
'--debug[launch an interactive debugger if test fails]' \
'--keep-tmp[don''t delete temporary files]' \
'*:formula:__brew_formulae_or_ruby_files'
@ -866,7 +864,7 @@ _brew_upgrade() {
'--cc=-[attempt to compile using compiler]:compiler: ' \
'(--build-from-source -s --force-bottle)'{--build-from-source,-s}'[compile the specified formula from source even if a bottle is provided]' \
'(--build-from-source -s)--force-bottle[install from a bottle if it exists for the current version of OS X, even if it would not normally be used for installation]' \
'(--devel --HEAD)'{--devel,--HEAD}'[install the development / HEAD version]' \
'--HEAD[install the HEAD version]' \
'--keep-tmp[don''t delete temporary files created during installation]' \
'--display-times[display installation times at end of run]' \
'*: : __brew_outdated_formulae' \
@ -878,7 +876,7 @@ _brew_upgrade() {
}
# brew uses [--installed] [--recursive] [--include-build] [--include-optional]
# [--skip-recommended] [--devel|--HEAD] formulae:
# [--skip-recommended] formulae:
_brew_uses() {
_arguments \
'--installed[only list installed formulae]' \
@ -886,7 +884,6 @@ _brew_uses() {
'--include-build[include the :build type dependencies]' \
'--include-optional[include the :optional dependencies]' \
'--skip-recommended[skip :recommended type dependencies]' \
'(--devel --HEAD)'{--devel,--HEAD}'[find cases where formula is used by development / HEAD build]' \
'*:formula:__brew_formulae'
}

4
docs/Manpage.md
View File

@ -167,8 +167,6 @@ and binaries for *`cask`*s. For files, also print SHA-256 checksums.
* `--HEAD`:
Fetch HEAD version instead of stable version.
* `--devel`:
Fetch development version instead of stable version.
* `-f`, `--force`:
Remove a previously cached version and re-fetch.
* `-v`, `--verbose`:
@ -1277,8 +1275,6 @@ user if something is wrong with the installed formula.
*Example:* `brew install jruby && brew test jruby`
* `--devel`:
Test the development version of a formula.
* `--HEAD`:
Test the head version of a formula.
* `--keep-tmp`:

8
manpages/brew.1
View File

@ -194,10 +194,6 @@ Download a bottle (if available) or source packages for \fIformula\fRe and binar
Fetch HEAD version instead of stable version\.
.
.TP
\fB\-\-devel\fR
Fetch development version instead of stable version\.
.
.TP
\fB\-f\fR, \fB\-\-force\fR
Remove a previously cached version and re\-fetch\.
.
@ -1768,10 +1764,6 @@ Run the test method provided by an installed formula\. There is no standard outp
\fIExample:\fR \fBbrew install jruby && brew test jruby\fR
.
.TP
\fB\-\-devel\fR
Test the development version of a formula\.
.
.TP
\fB\-\-HEAD\fR
Test the head version of a formula\.
.