Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More Formula/Casks sharding fixes #14825

Merged
merged 1 commit into from
Feb 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 51 additions & 31 deletions Library/.rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ Homebrew/MoveToExtendOS:
Layout/ArgumentAlignment:
Exclude:
- "Taps/*/*/*.rb"
- "/**/Formula/*.rb"
- "**/Formula/*.rb"
- "/**/Formula/**/*.rb"
- "**/Formula/**/*.rb"

# this is a bit less "floaty"
Layout/CaseIndentation:
Expand Down Expand Up @@ -130,8 +130,8 @@ Layout/SpaceBeforeBrackets:
Exclude:
- "**/*_spec.rb"
- "Taps/*/*/*.rb"
- "/**/{Formula,Casks}/*.rb"
- "**/{Formula,Casks}/*.rb"
- "/**/{Formula,Casks}/**/*.rb"
- "**/{Formula,Casks}/**/*.rb"

# favour parens-less DSL-style arguments
Lint/AmbiguousBlockAssociation:
Expand All @@ -140,15 +140,15 @@ Lint/AmbiguousBlockAssociation:
Lint/DuplicateBranch:
Exclude:
- "Taps/*/*/*.rb"
- "/**/{Formula,Casks}/*.rb"
- "**/{Formula,Casks}/*.rb"
- "/**/{Formula,Casks}/**/*.rb"
- "**/{Formula,Casks}/**/*.rb"

# so many of these in formulae and can't be autocorrected
Lint/ParenthesesAsGroupedExpression:
Exclude:
- "Taps/*/*/*.rb"
- "/**/Formula/*.rb"
- "**/Formula/*.rb"
- "/**/Formula/**/*.rb"
- "**/Formula/**/*.rb"

# unused keyword arguments improve APIs
Lint/UnusedMethodArgument:
Expand All @@ -173,11 +173,11 @@ Naming/InclusiveLanguage:
# TODO: If possible, make this stricter.
slave:
AllowedRegex:
- "gitslave" # Used in formula `gitslave`
- "log_slave" # Used in formula `ssdb`
- "ssdb_slave" # Used in formula `ssdb`
- "var_slave" # Used in formula `ssdb`
- "patches/13_fix_scope_for_show_slave_status_data.patch" # Used in formula `mytop`
- "gitslave" # Used in formula `gitslave`
- "log_slave" # Used in formula `ssdb`
- "ssdb_slave" # Used in formula `ssdb`
- "var_slave" # Used in formula `ssdb`
- "patches/13_fix_scope_for_show_slave_status_data.patch" # Used in formula `mytop`

Naming/MethodName:
AllowedPatterns:
Expand All @@ -189,7 +189,27 @@ Naming/MethodParameterName:
inherit_mode:
merge:
- AllowedNames
AllowedNames: ["a", "b", "cc", "c1", "c2", "d", "e", "f", "ff", "fn", "id", "o", "p", "pr", "r", "rb", "s", "v"]
AllowedNames:
[
"a",
"b",
"cc",
"c1",
"c2",
"d",
"e",
"f",
"ff",
"fn",
"id",
"o",
"p",
"pr",
"r",
"rb",
"s",
"v",
]

# Both styles are used depending on context,
# e.g. `sha256` and `something_countable_1`.
Expand Down Expand Up @@ -223,7 +243,7 @@ Rails/Blank:
Rails/CompactBlank:
Enabled: true
Rails/Delegate:
Enabled: false # TODO
Enabled: false # TODO
Rails/DelegateAllowBlank:
Enabled: true
Rails/DurationArithmetic:
Expand Down Expand Up @@ -288,8 +308,8 @@ Sorbet/ConstantsFromStrings:
Sorbet/FalseSigil:
Exclude:
- "Taps/**/*"
- "/**/{Formula,Casks}/*.rb"
- "**/{Formula,Casks}/*.rb"
- "/**/{Formula,Casks}/**/*.rb"
- "**/{Formula,Casks}/**/*.rb"
- "Homebrew/test/**/Casks/**/*.rb"

Sorbet/StrictSigil:
Expand Down Expand Up @@ -336,15 +356,15 @@ Style/DisableCopsWithinSourceCodeDirective:
Enabled: true
Include:
- "Taps/*/*/*.rb"
- "/**/{Formula,Casks}/*.rb"
- "**/{Formula,Casks}/*.rb"
- "/**/{Formula,Casks}/**/*.rb"
- "**/{Formula,Casks}/**/*.rb"

# Don't enforce documentation in casks or formulae.
Style/Documentation:
Exclude:
- "Taps/**/*"
- "/**/{Formula,Casks}/*.rb"
- "**/{Formula,Casks}/*.rb"
- "/**/{Formula,Casks}/**/*.rb"
- "**/{Formula,Casks}/**/*.rb"
- "**/*.rbi"

Style/DocumentationMethod:
Expand All @@ -356,8 +376,8 @@ Style/DocumentationMethod:
Style/FetchEnvVar:
Exclude:
- "Taps/*/*/*.rb"
- "/**/Formula/*.rb"
- "**/Formula/*.rb"
- "/**/Formula/**/*.rb"
- "**/Formula/**/*.rb"

# Prefer tokens with type annotations for consistency
# between formatting numbers and strings.
Expand All @@ -369,8 +389,8 @@ Style/FrozenStringLiteralComment:
EnforcedStyle: always
Exclude:
- "Taps/*/*/*.rb"
- "/**/{Formula,Casks}/*.rb"
- "**/{Formula,Casks}/*.rb"
- "/**/{Formula,Casks}/**/*.rb"
- "**/{Formula,Casks}/**/*.rb"
- "Homebrew/test/**/Casks/**/*.rb"
- "**/*.rbi"
- "**/Brewfile"
Expand All @@ -384,15 +404,15 @@ Style/GlobalVars:
Style/GuardClause:
Exclude:
- "Taps/*/*/*.rb"
- "/**/{Formula,Casks}/*.rb"
- "**/{Formula,Casks}/*.rb"
- "/**/{Formula,Casks}/**/*.rb"
- "**/{Formula,Casks}/**/*.rb"

# Allow for license expressions
Style/HashAsLastArrayItem:
Exclude:
- "Taps/*/*/*.rb"
- "/**/Formula/*.rb"
- "**/Formula/*.rb"
- "/**/Formula/**/*.rb"
- "**/Formula/**/*.rb"

# Zero-prefixed octal literals are widely used and understood.
Style/NumericLiteralPrefix:
Expand Down Expand Up @@ -426,8 +446,8 @@ Style/StderrPuts:
Style/StringConcatenation:
Exclude:
- "Taps/*/*/*.rb"
- "/**/{Formula,Casks}/*.rb"
- "**/{Formula,Casks}/*.rb"
- "/**/{Formula,Casks}/**/*.rb"
- "**/{Formula,Casks}/**/*.rb"

# ruby style guide favorite
Style/StringLiterals:
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/dev-cmd/edit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def edit
if Homebrew::EnvConfig.automatically_set_no_install_from_api? &&
!Homebrew::EnvConfig.no_env_hints?
paths.each do |path|
next if !path.fnmatch?("**/homebrew-core/Formula/*.rb") && !path.fnmatch?("**/homebrew-cask/Casks/*.rb")
next if !path.fnmatch?("**/homebrew-core/Formula/**/*.rb") && !path.fnmatch?("**/homebrew-cask/Casks/**/*.rb")

opoo <<~EOS
Unless `HOMEBREW_NO_INSTALL_FROM_API` is set when running
Expand Down