Merge pull request #7361 from Homebrew/dependabot/bundler/Library/Homebrew/parser-2.7.1.1
build(deps): bump parser from 2.7.1.0 to 2.7.1.1 in /Library/Homebrew
This commit is contained in:
commit
b11d2b56f7
@ -51,7 +51,7 @@ GEM
|
|||||||
parallel (1.19.1)
|
parallel (1.19.1)
|
||||||
parallel_tests (2.32.0)
|
parallel_tests (2.32.0)
|
||||||
parallel
|
parallel
|
||||||
parser (2.7.1.0)
|
parser (2.7.1.1)
|
||||||
ast (~> 2.4.0)
|
ast (~> 2.4.0)
|
||||||
plist (3.5.0)
|
plist (3.5.0)
|
||||||
rainbow (3.0.0)
|
rainbow (3.0.0)
|
||||||
|
@ -12,7 +12,7 @@ RSpec/ExampleLength:
|
|||||||
Exclude:
|
Exclude:
|
||||||
- 'rubocops/patches_spec.rb'
|
- 'rubocops/patches_spec.rb'
|
||||||
|
|
||||||
# Offense count: 37
|
# Offense count: 41
|
||||||
# Configuration parameters: CustomTransform, IgnoreMethods.
|
# Configuration parameters: CustomTransform, IgnoreMethods.
|
||||||
RSpec/FilePath:
|
RSpec/FilePath:
|
||||||
Exclude:
|
Exclude:
|
||||||
@ -53,6 +53,7 @@ RSpec/FilePath:
|
|||||||
- 'rubocops/formula_desc_spec.rb'
|
- 'rubocops/formula_desc_spec.rb'
|
||||||
- 'search_spec.rb'
|
- 'search_spec.rb'
|
||||||
- 'string_spec.rb'
|
- 'string_spec.rb'
|
||||||
|
- 'style_spec.rb'
|
||||||
- 'system_command_result_spec.rb'
|
- 'system_command_result_spec.rb'
|
||||||
- 'unpack_strategy/p7zip_spec.rb'
|
- 'unpack_strategy/p7zip_spec.rb'
|
||||||
- 'utils/github_spec.rb'
|
- 'utils/github_spec.rb'
|
||||||
|
@ -5,80 +5,3 @@ require "cmd/shared_examples/args_parse"
|
|||||||
describe "Homebrew.style_args" do
|
describe "Homebrew.style_args" do
|
||||||
it_behaves_like "parseable arguments"
|
it_behaves_like "parseable arguments"
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "brew style" do
|
|
||||||
around do |example|
|
|
||||||
FileUtils.ln_s HOMEBREW_LIBRARY_PATH, HOMEBREW_LIBRARY/"Homebrew"
|
|
||||||
FileUtils.ln_s HOMEBREW_LIBRARY_PATH.parent/".rubocop.yml", HOMEBREW_LIBRARY/".rubocop.yml"
|
|
||||||
FileUtils.ln_s HOMEBREW_LIBRARY_PATH.parent/".rubocop_shared.yml", HOMEBREW_LIBRARY/".rubocop_shared.yml"
|
|
||||||
|
|
||||||
example.run
|
|
||||||
ensure
|
|
||||||
FileUtils.rm_f HOMEBREW_LIBRARY/"Homebrew"
|
|
||||||
FileUtils.rm_f HOMEBREW_LIBRARY/".rubocop.yml"
|
|
||||||
FileUtils.rm_f HOMEBREW_LIBRARY/".rubocop_shared.yml"
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
allow(Homebrew).to receive(:install_bundler_gems!)
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "Homebrew::check_style_json" do
|
|
||||||
let(:dir) { mktmpdir }
|
|
||||||
|
|
||||||
it "returns RubocopResults when RuboCop reports offenses" do
|
|
||||||
formula = dir/"my-formula.rb"
|
|
||||||
|
|
||||||
formula.write <<~'EOS'
|
|
||||||
class MyFormula < Formula
|
|
||||||
|
|
||||||
end
|
|
||||||
EOS
|
|
||||||
|
|
||||||
rubocop_result = Homebrew::Style.check_style_json([formula])
|
|
||||||
|
|
||||||
expect(rubocop_result.file_offenses(formula.realpath.to_s).map(&:message))
|
|
||||||
.to include("Extra empty line detected at class body beginning.")
|
|
||||||
end
|
|
||||||
|
|
||||||
it "corrected offense output format" do
|
|
||||||
formula = dir/"my-formula-2.rb"
|
|
||||||
|
|
||||||
formula.write <<~EOS
|
|
||||||
class MyFormula2 < Formula
|
|
||||||
desc "Test formula"
|
|
||||||
homepage "https://foo.org"
|
|
||||||
url "https://foo.org/foo-1.7.5.tgz"
|
|
||||||
sha256 "cc692fb9dee0cc288757e708fc1a3b6b56ca1210ca181053a371cb11746969da"
|
|
||||||
|
|
||||||
depends_on "foo"
|
|
||||||
depends_on "bar-config" => :build
|
|
||||||
|
|
||||||
test do
|
|
||||||
assert_equal 5, 5
|
|
||||||
end
|
|
||||||
end
|
|
||||||
EOS
|
|
||||||
rubocop_result = Homebrew::Style.check_style_json(
|
|
||||||
[formula],
|
|
||||||
fix: true, only_cops: ["FormulaAudit/DependencyOrder"],
|
|
||||||
)
|
|
||||||
offense_string = rubocop_result.file_offenses(formula.realpath).first.to_s
|
|
||||||
expect(offense_string).to match(/\[Corrected\]/)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "Homebrew::check_style_and_print" do
|
|
||||||
let(:dir) { mktmpdir }
|
|
||||||
|
|
||||||
it "returns false for conforming file with only audit-level violations" do
|
|
||||||
# This file is known to use non-rocket hashes and other things that trigger audit,
|
|
||||||
# but not regular, cop violations
|
|
||||||
target_file = HOMEBREW_LIBRARY_PATH/"utils.rb"
|
|
||||||
|
|
||||||
rubocop_result = Homebrew::Style.check_style_and_print([target_file])
|
|
||||||
|
|
||||||
expect(rubocop_result).to eq true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
80
Library/Homebrew/test/style_spec.rb
Normal file
80
Library/Homebrew/test/style_spec.rb
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require "style"
|
||||||
|
|
||||||
|
describe Homebrew::Style do
|
||||||
|
around do |example|
|
||||||
|
FileUtils.ln_s HOMEBREW_LIBRARY_PATH, HOMEBREW_LIBRARY/"Homebrew"
|
||||||
|
FileUtils.ln_s HOMEBREW_LIBRARY_PATH.parent/".rubocop.yml", HOMEBREW_LIBRARY/".rubocop.yml"
|
||||||
|
FileUtils.ln_s HOMEBREW_LIBRARY_PATH.parent/".rubocop_shared.yml", HOMEBREW_LIBRARY/".rubocop_shared.yml"
|
||||||
|
|
||||||
|
example.run
|
||||||
|
ensure
|
||||||
|
FileUtils.rm_f HOMEBREW_LIBRARY/"Homebrew"
|
||||||
|
FileUtils.rm_f HOMEBREW_LIBRARY/".rubocop.yml"
|
||||||
|
FileUtils.rm_f HOMEBREW_LIBRARY/".rubocop_shared.yml"
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
allow(Homebrew).to receive(:install_bundler_gems!)
|
||||||
|
end
|
||||||
|
|
||||||
|
describe ".check_style_json" do
|
||||||
|
let(:dir) { mktmpdir }
|
||||||
|
|
||||||
|
it "returns RubocopResults when RuboCop reports offenses" do
|
||||||
|
formula = dir/"my-formula.rb"
|
||||||
|
|
||||||
|
formula.write <<~'EOS'
|
||||||
|
class MyFormula < Formula
|
||||||
|
|
||||||
|
end
|
||||||
|
EOS
|
||||||
|
|
||||||
|
rubocop_result = described_class.check_style_json([formula])
|
||||||
|
|
||||||
|
expect(rubocop_result.file_offenses(formula.realpath.to_s).map(&:message))
|
||||||
|
.to include("Extra empty line detected at class body beginning.")
|
||||||
|
end
|
||||||
|
|
||||||
|
it "corrected offense output format" do
|
||||||
|
formula = dir/"my-formula-2.rb"
|
||||||
|
|
||||||
|
formula.write <<~EOS
|
||||||
|
class MyFormula2 < Formula
|
||||||
|
desc "Test formula"
|
||||||
|
homepage "https://foo.org"
|
||||||
|
url "https://foo.org/foo-1.7.5.tgz"
|
||||||
|
sha256 "cc692fb9dee0cc288757e708fc1a3b6b56ca1210ca181053a371cb11746969da"
|
||||||
|
|
||||||
|
depends_on "foo"
|
||||||
|
depends_on "bar-config" => :build
|
||||||
|
|
||||||
|
test do
|
||||||
|
assert_equal 5, 5
|
||||||
|
end
|
||||||
|
end
|
||||||
|
EOS
|
||||||
|
rubocop_result = described_class.check_style_json(
|
||||||
|
[formula],
|
||||||
|
fix: true, only_cops: ["FormulaAudit/DependencyOrder"],
|
||||||
|
)
|
||||||
|
offense_string = rubocop_result.file_offenses(formula.realpath).first.to_s
|
||||||
|
expect(offense_string).to match(/\[Corrected\]/)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe ".check_style_and_print" do
|
||||||
|
let(:dir) { mktmpdir }
|
||||||
|
|
||||||
|
it "returns false for conforming file with only audit-level violations" do
|
||||||
|
# This file is known to use non-rocket hashes and other things that trigger audit,
|
||||||
|
# but not regular, cop violations
|
||||||
|
target_file = HOMEBREW_LIBRARY_PATH/"utils.rb"
|
||||||
|
|
||||||
|
rubocop_result = described_class.check_style_and_print([target_file])
|
||||||
|
|
||||||
|
expect(rubocop_result).to eq true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
@ -46,7 +46,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mechanize-2.7.6/lib"
|
|||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mustache-1.1.1/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mustache-1.1.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel-1.19.1/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel-1.19.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel_tests-2.32.0/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel_tests-2.32.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parser-2.7.0.5/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parser-2.7.1.1/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.5.0/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.5.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.0.0/lib"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.0.0/lib"
|
||||||
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-19/2.6.0/rdiscount-2.2.0.1"
|
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-19/2.6.0/rdiscount-2.2.0.1"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user