From 376eac2b8d119c922cf7a42bcdfa4c5837e67f4f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 26 Oct 2018 19:41:14 +0100 Subject: [PATCH] rubocops: rename files for consistency. Make the filenames consistent with the class names. --- Library/Homebrew/rubocops.rb | 28 +++++++++---------- .../rubocops/{caveats_cop.rb => caveats.rb} | 2 +- .../rubocops/{checksum_cop.rb => checksum.rb} | 2 +- .../rubocops/{class_cop.rb => class.rb} | 2 +- ...nents_order_cop.rb => components_order.rb} | 2 +- ...ndancy_cop.rb => components_redundancy.rb} | 2 +- .../{conflicts_cop.rb => conflicts.rb} | 2 +- ...dency_order_cop.rb => dependency_order.rb} | 2 +- .../extend/{formula_cop.rb => formula.rb} | 0 .../{formula_desc_cop.rb => formula_desc.rb} | 2 +- .../rubocops/{homepage_cop.rb => homepage.rb} | 2 +- .../rubocops/{lines_cop.rb => lines.rb} | 2 +- .../rubocops/{options_cop.rb => options.rb} | 2 +- .../rubocops/{patches_cop.rb => patches.rb} | 2 +- Library/Homebrew/rubocops/rubocop-cask.rb | 28 +++++++++++++++++++ .../rubocops/{text_cop.rb => text.rb} | 2 +- .../rubocops/{urls_cop.rb => urls.rb} | 2 +- Library/Homebrew/test/.rubocop_todo.yml | 2 -- .../{caveats_cop_spec.rb => caveats_spec.rb} | 2 +- ...{checksum_cop_spec.rb => checksum_spec.rb} | 2 +- .../{class_cop_spec.rb => class_spec.rb} | 2 +- ...r_cop_spec.rb => components_order_spec.rb} | 2 +- ..._spec.rb => components_redundancy_spec.rb} | 2 +- ...onflicts_cop_spec.rb => conflicts_spec.rb} | 2 +- ...r_cop_spec.rb => dependency_order_spec.rb} | 4 +-- ..._desc_cop_spec.rb => formula_desc_spec.rb} | 2 +- ...{homepage_cop_spec.rb => homepage_spec.rb} | 2 +- .../{lines_cop_spec.rb => lines_spec.rb} | 10 +++---- .../{options_cop_spec.rb => options_spec.rb} | 2 +- .../{patches_cop_spec.rb => patches_spec.rb} | 2 +- .../{text_cop_spec.rb => text_spec.rb} | 2 +- .../{urls_cop_spec.rb => urls_spec.rb} | 2 +- 32 files changed, 75 insertions(+), 49 deletions(-) rename Library/Homebrew/rubocops/{caveats_cop.rb => caveats.rb} (91%) rename Library/Homebrew/rubocops/{checksum_cop.rb => checksum.rb} (98%) rename Library/Homebrew/rubocops/{class_cop.rb => class.rb} (98%) rename Library/Homebrew/rubocops/{components_order_cop.rb => components_order.rb} (99%) rename Library/Homebrew/rubocops/{components_redundancy_cop.rb => components_redundancy.rb} (97%) rename Library/Homebrew/rubocops/{conflicts_cop.rb => conflicts.rb} (94%) rename Library/Homebrew/rubocops/{dependency_order_cop.rb => dependency_order.rb} (99%) rename Library/Homebrew/rubocops/extend/{formula_cop.rb => formula.rb} (100%) rename Library/Homebrew/rubocops/{formula_desc_cop.rb => formula_desc.rb} (99%) rename Library/Homebrew/rubocops/{homepage_cop.rb => homepage.rb} (99%) rename Library/Homebrew/rubocops/{lines_cop.rb => lines.rb} (99%) rename Library/Homebrew/rubocops/{options_cop.rb => options.rb} (98%) rename Library/Homebrew/rubocops/{patches_cop.rb => patches.rb} (98%) create mode 100644 Library/Homebrew/rubocops/rubocop-cask.rb rename Library/Homebrew/rubocops/{text_cop.rb => text.rb} (98%) rename Library/Homebrew/rubocops/{urls_cop.rb => urls.rb} (99%) rename Library/Homebrew/test/rubocops/{caveats_cop_spec.rb => caveats_spec.rb} (94%) rename Library/Homebrew/test/rubocops/{checksum_cop_spec.rb => checksum_spec.rb} (99%) rename Library/Homebrew/test/rubocops/{class_cop_spec.rb => class_spec.rb} (99%) rename Library/Homebrew/test/rubocops/{components_order_cop_spec.rb => components_order_spec.rb} (98%) rename Library/Homebrew/test/rubocops/{components_redundancy_cop_spec.rb => components_redundancy_spec.rb} (97%) rename Library/Homebrew/test/rubocops/{conflicts_cop_spec.rb => conflicts_spec.rb} (96%) rename Library/Homebrew/test/rubocops/{dependency_order_cop_spec.rb => dependency_order_spec.rb} (97%) rename Library/Homebrew/test/rubocops/{formula_desc_cop_spec.rb => formula_desc_spec.rb} (99%) rename Library/Homebrew/test/rubocops/{homepage_cop_spec.rb => homepage_spec.rb} (99%) rename Library/Homebrew/test/rubocops/{lines_cop_spec.rb => lines_spec.rb} (99%) rename Library/Homebrew/test/rubocops/{options_cop_spec.rb => options_spec.rb} (98%) rename Library/Homebrew/test/rubocops/{patches_cop_spec.rb => patches_spec.rb} (99%) rename Library/Homebrew/test/rubocops/{text_cop_spec.rb => text_spec.rb} (99%) rename Library/Homebrew/test/rubocops/{urls_cop_spec.rb => urls_spec.rb} (99%) diff --git a/Library/Homebrew/rubocops.rb b/Library/Homebrew/rubocops.rb index aed555d72a..ac8c07e9f1 100644 --- a/Library/Homebrew/rubocops.rb +++ b/Library/Homebrew/rubocops.rb @@ -1,17 +1,17 @@ require_relative "load_path" require "rubocop-rspec" -require "rubocops/formula_desc_cop" -require "rubocops/components_order_cop" -require "rubocops/components_redundancy_cop" -require "rubocops/dependency_order_cop" -require "rubocops/homepage_cop" -require "rubocops/text_cop" -require "rubocops/caveats_cop" -require "rubocops/checksum_cop" -require "rubocops/patches_cop" -require "rubocops/conflicts_cop" -require "rubocops/options_cop" -require "rubocops/urls_cop" -require "rubocops/lines_cop" -require "rubocops/class_cop" +require "rubocops/formula_desc" +require "rubocops/components_order" +require "rubocops/components_redundancy" +require "rubocops/dependency_order" +require "rubocops/homepage" +require "rubocops/text" +require "rubocops/caveats" +require "rubocops/checksum" +require "rubocops/patches" +require "rubocops/conflicts" +require "rubocops/options" +require "rubocops/urls" +require "rubocops/lines" +require "rubocops/class" diff --git a/Library/Homebrew/rubocops/caveats_cop.rb b/Library/Homebrew/rubocops/caveats.rb similarity index 91% rename from Library/Homebrew/rubocops/caveats_cop.rb rename to Library/Homebrew/rubocops/caveats.rb index c64a9c78ab..6b6550a6e5 100644 --- a/Library/Homebrew/rubocops/caveats_cop.rb +++ b/Library/Homebrew/rubocops/caveats.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/checksum_cop.rb b/Library/Homebrew/rubocops/checksum.rb similarity index 98% rename from Library/Homebrew/rubocops/checksum_cop.rb rename to Library/Homebrew/rubocops/checksum.rb index 7b42de4179..d00bd6740d 100644 --- a/Library/Homebrew/rubocops/checksum_cop.rb +++ b/Library/Homebrew/rubocops/checksum.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/class_cop.rb b/Library/Homebrew/rubocops/class.rb similarity index 98% rename from Library/Homebrew/rubocops/class_cop.rb rename to Library/Homebrew/rubocops/class.rb index c7aebd8a4e..bba73ea672 100644 --- a/Library/Homebrew/rubocops/class_cop.rb +++ b/Library/Homebrew/rubocops/class.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/components_order_cop.rb b/Library/Homebrew/rubocops/components_order.rb similarity index 99% rename from Library/Homebrew/rubocops/components_order_cop.rb rename to Library/Homebrew/rubocops/components_order.rb index efce883d8d..c60a4c49fe 100644 --- a/Library/Homebrew/rubocops/components_order_cop.rb +++ b/Library/Homebrew/rubocops/components_order.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/components_redundancy_cop.rb b/Library/Homebrew/rubocops/components_redundancy.rb similarity index 97% rename from Library/Homebrew/rubocops/components_redundancy_cop.rb rename to Library/Homebrew/rubocops/components_redundancy.rb index 881b4fee75..1a192d178c 100644 --- a/Library/Homebrew/rubocops/components_redundancy_cop.rb +++ b/Library/Homebrew/rubocops/components_redundancy.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/conflicts_cop.rb b/Library/Homebrew/rubocops/conflicts.rb similarity index 94% rename from Library/Homebrew/rubocops/conflicts_cop.rb rename to Library/Homebrew/rubocops/conflicts.rb index 8fa0547db6..6dfe46901a 100644 --- a/Library/Homebrew/rubocops/conflicts_cop.rb +++ b/Library/Homebrew/rubocops/conflicts.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" require "extend/string" module RuboCop diff --git a/Library/Homebrew/rubocops/dependency_order_cop.rb b/Library/Homebrew/rubocops/dependency_order.rb similarity index 99% rename from Library/Homebrew/rubocops/dependency_order_cop.rb rename to Library/Homebrew/rubocops/dependency_order.rb index 82934e146a..1b7fac34a5 100644 --- a/Library/Homebrew/rubocops/dependency_order_cop.rb +++ b/Library/Homebrew/rubocops/dependency_order.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/extend/formula_cop.rb b/Library/Homebrew/rubocops/extend/formula.rb similarity index 100% rename from Library/Homebrew/rubocops/extend/formula_cop.rb rename to Library/Homebrew/rubocops/extend/formula.rb diff --git a/Library/Homebrew/rubocops/formula_desc_cop.rb b/Library/Homebrew/rubocops/formula_desc.rb similarity index 99% rename from Library/Homebrew/rubocops/formula_desc_cop.rb rename to Library/Homebrew/rubocops/formula_desc.rb index 4f856916de..94fde418fa 100644 --- a/Library/Homebrew/rubocops/formula_desc_cop.rb +++ b/Library/Homebrew/rubocops/formula_desc.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" require "extend/string" module RuboCop diff --git a/Library/Homebrew/rubocops/homepage_cop.rb b/Library/Homebrew/rubocops/homepage.rb similarity index 99% rename from Library/Homebrew/rubocops/homepage_cop.rb rename to Library/Homebrew/rubocops/homepage.rb index 630037d4c7..8038e786c2 100644 --- a/Library/Homebrew/rubocops/homepage_cop.rb +++ b/Library/Homebrew/rubocops/homepage.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/lines_cop.rb b/Library/Homebrew/rubocops/lines.rb similarity index 99% rename from Library/Homebrew/rubocops/lines_cop.rb rename to Library/Homebrew/rubocops/lines.rb index 24a2637e61..7076b75f10 100644 --- a/Library/Homebrew/rubocops/lines_cop.rb +++ b/Library/Homebrew/rubocops/lines.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/options_cop.rb b/Library/Homebrew/rubocops/options.rb similarity index 98% rename from Library/Homebrew/rubocops/options_cop.rb rename to Library/Homebrew/rubocops/options.rb index 98b6002f52..a5eaac00fd 100644 --- a/Library/Homebrew/rubocops/options_cop.rb +++ b/Library/Homebrew/rubocops/options.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/patches_cop.rb b/Library/Homebrew/rubocops/patches.rb similarity index 98% rename from Library/Homebrew/rubocops/patches_cop.rb rename to Library/Homebrew/rubocops/patches.rb index db17cf102a..8a5f98c484 100644 --- a/Library/Homebrew/rubocops/patches_cop.rb +++ b/Library/Homebrew/rubocops/patches.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" require "extend/string" module RuboCop diff --git a/Library/Homebrew/rubocops/rubocop-cask.rb b/Library/Homebrew/rubocops/rubocop-cask.rb new file mode 100644 index 0000000000..b6e9421b10 --- /dev/null +++ b/Library/Homebrew/rubocops/rubocop-cask.rb @@ -0,0 +1,28 @@ +require 'rubocop' + +require 'rubocops/cask/constants/cask_method_names' +require 'rubocops/cask/constants/stanza' + +require 'rubocops/cask/ast/stanza' +require 'rubocops/cask/ast/cask_header' +require 'rubocops/cask/ast/cask_block' +require 'rubocops/cask/extend/string' +require 'rubocops/cask/extend/node' +require 'rubocops/cask/mixin/cask_help' +require 'rubocops/cask/mixin/on_homepage_stanza' +require 'rubocops/cask/homepage_matches_url' +require 'rubocops/cask/homepage_url_trailing_slash' +require 'rubocops/cask/no_dsl_version' +require 'rubocops/cask/stanza_order' +require 'rubocops/cask/stanza_grouping' + +module RuboCop + module Cask + DEFAULT_CONFIG = File.expand_path('cask/config/default.yml', __dir__) + end + + ConfigLoader.default_configuration = ConfigLoader.merge_with_default( + ConfigLoader.load_file(Cask::DEFAULT_CONFIG), + Cask::DEFAULT_CONFIG + ) +end diff --git a/Library/Homebrew/rubocops/text_cop.rb b/Library/Homebrew/rubocops/text.rb similarity index 98% rename from Library/Homebrew/rubocops/text_cop.rb rename to Library/Homebrew/rubocops/text.rb index 72d01524f5..1aefacca58 100644 --- a/Library/Homebrew/rubocops/text_cop.rb +++ b/Library/Homebrew/rubocops/text.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/urls_cop.rb b/Library/Homebrew/rubocops/urls.rb similarity index 99% rename from Library/Homebrew/rubocops/urls_cop.rb rename to Library/Homebrew/rubocops/urls.rb index 76713d5a3b..c4ac19b220 100644 --- a/Library/Homebrew/rubocops/urls_cop.rb +++ b/Library/Homebrew/rubocops/urls.rb @@ -1,4 +1,4 @@ -require "rubocops/extend/formula_cop" +require "rubocops/extend/formula" module RuboCop module Cop diff --git a/Library/Homebrew/test/.rubocop_todo.yml b/Library/Homebrew/test/.rubocop_todo.yml index 6666df7549..6b7dcd94a9 100644 --- a/Library/Homebrew/test/.rubocop_todo.yml +++ b/Library/Homebrew/test/.rubocop_todo.yml @@ -117,8 +117,6 @@ RSpec/RepeatedDescription: Exclude: - 'inreplace_spec.rb' - 'migrator_spec.rb' - - 'rubocops/dependency_order_cop_spec.rb' - - 'rubocops/lines_cop_spec.rb' - 'tab_spec.rb' # Offense count: 31 diff --git a/Library/Homebrew/test/rubocops/caveats_cop_spec.rb b/Library/Homebrew/test/rubocops/caveats_spec.rb similarity index 94% rename from Library/Homebrew/test/rubocops/caveats_cop_spec.rb rename to Library/Homebrew/test/rubocops/caveats_spec.rb index c38f9d4eab..b2d9b4cfd5 100644 --- a/Library/Homebrew/test/rubocops/caveats_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/caveats_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/caveats_cop" +require "rubocops/caveats" describe RuboCop::Cop::FormulaAudit::Caveats do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/checksum_cop_spec.rb b/Library/Homebrew/test/rubocops/checksum_spec.rb similarity index 99% rename from Library/Homebrew/test/rubocops/checksum_cop_spec.rb rename to Library/Homebrew/test/rubocops/checksum_spec.rb index 802bcfee6e..438f438f7b 100644 --- a/Library/Homebrew/test/rubocops/checksum_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/checksum_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/checksum_cop" +require "rubocops/checksum" describe RuboCop::Cop::FormulaAudit::Checksum do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/class_cop_spec.rb b/Library/Homebrew/test/rubocops/class_spec.rb similarity index 99% rename from Library/Homebrew/test/rubocops/class_cop_spec.rb rename to Library/Homebrew/test/rubocops/class_spec.rb index 8273f3ebcb..1bd0b6edf9 100644 --- a/Library/Homebrew/test/rubocops/class_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/class_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/class_cop" +require "rubocops/class" describe RuboCop::Cop::FormulaAudit::ClassName do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/components_order_cop_spec.rb b/Library/Homebrew/test/rubocops/components_order_spec.rb similarity index 98% rename from Library/Homebrew/test/rubocops/components_order_cop_spec.rb rename to Library/Homebrew/test/rubocops/components_order_spec.rb index 38a25cfc69..208bfaba42 100644 --- a/Library/Homebrew/test/rubocops/components_order_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/components_order_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/components_order_cop" +require "rubocops/components_order" describe RuboCop::Cop::FormulaAudit::ComponentsOrder do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb b/Library/Homebrew/test/rubocops/components_redundancy_spec.rb similarity index 97% rename from Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb rename to Library/Homebrew/test/rubocops/components_redundancy_spec.rb index 3cb44387ca..758cb1e72e 100644 --- a/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/components_redundancy_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/components_redundancy_cop" +require "rubocops/components_redundancy" describe RuboCop::Cop::FormulaAudit::ComponentsRedundancy do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb b/Library/Homebrew/test/rubocops/conflicts_spec.rb similarity index 96% rename from Library/Homebrew/test/rubocops/conflicts_cop_spec.rb rename to Library/Homebrew/test/rubocops/conflicts_spec.rb index 0f311f904e..c89bcde1d5 100644 --- a/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/conflicts_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/conflicts_cop" +require "rubocops/conflicts" describe RuboCop::Cop::FormulaAudit::Conflicts do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/dependency_order_cop_spec.rb b/Library/Homebrew/test/rubocops/dependency_order_spec.rb similarity index 97% rename from Library/Homebrew/test/rubocops/dependency_order_cop_spec.rb rename to Library/Homebrew/test/rubocops/dependency_order_spec.rb index 991d6d586a..2e4fab6ee0 100644 --- a/Library/Homebrew/test/rubocops/dependency_order_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/dependency_order_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/dependency_order_cop" +require "rubocops/dependency_order" describe RuboCop::Cop::FormulaAudit::DependencyOrder do subject(:cop) { described_class.new } @@ -40,7 +40,7 @@ describe RuboCop::Cop::FormulaAudit::DependencyOrder do RUBY end - it "wrong conditional depends_on order" do + it "wrong conditional depends_on order with block" do expect_offense(<<~RUBY) class Foo < Formula homepage "https://example.com" diff --git a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb b/Library/Homebrew/test/rubocops/formula_desc_spec.rb similarity index 99% rename from Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb rename to Library/Homebrew/test/rubocops/formula_desc_spec.rb index 79eb3a2938..19fbeaf20a 100644 --- a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/formula_desc_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/formula_desc_cop" +require "rubocops/formula_desc" describe RuboCop::Cop::FormulaAudit::DescLength do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/homepage_cop_spec.rb b/Library/Homebrew/test/rubocops/homepage_spec.rb similarity index 99% rename from Library/Homebrew/test/rubocops/homepage_cop_spec.rb rename to Library/Homebrew/test/rubocops/homepage_spec.rb index 3758b28a19..843aad1d0c 100644 --- a/Library/Homebrew/test/rubocops/homepage_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/homepage_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/homepage_cop" +require "rubocops/homepage" describe RuboCop::Cop::FormulaAudit::Homepage do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/lines_cop_spec.rb b/Library/Homebrew/test/rubocops/lines_spec.rb similarity index 99% rename from Library/Homebrew/test/rubocops/lines_cop_spec.rb rename to Library/Homebrew/test/rubocops/lines_spec.rb index 7195efb1b4..55f5499fa0 100644 --- a/Library/Homebrew/test/rubocops/lines_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/lines_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/lines_cop" +require "rubocops/lines" describe RuboCop::Cop::FormulaAudit::Lines do subject(:cop) { described_class.new } @@ -565,7 +565,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do RUBY end - it "hardcoded gcc compiler" do + it "hardcoded gcc compiler system" do expect_offense(<<~'RUBY') class Foo < Formula desc "foo" @@ -578,7 +578,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do RUBY end - it "hardcoded g++ compiler" do + it "hardcoded g++ compiler system" do expect_offense(<<~'RUBY') class Foo < Formula desc "foo" @@ -591,7 +591,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do RUBY end - it "hardcoded llvm-g++ compiler" do + it "hardcoded llvm-g++ compiler COMPILER_PATH" do expect_offense(<<~'RUBY') class Foo < Formula desc "foo" @@ -604,7 +604,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do RUBY end - it "hardcoded gcc compiler" do + it "hardcoded gcc compiler COMPILER_PATH" do expect_offense(<<~RUBY) class Foo < Formula desc "foo" diff --git a/Library/Homebrew/test/rubocops/options_cop_spec.rb b/Library/Homebrew/test/rubocops/options_spec.rb similarity index 98% rename from Library/Homebrew/test/rubocops/options_cop_spec.rb rename to Library/Homebrew/test/rubocops/options_spec.rb index a6942745d0..51fdb8b30d 100644 --- a/Library/Homebrew/test/rubocops/options_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/options_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/options_cop" +require "rubocops/options" describe RuboCop::Cop::FormulaAudit::Options do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/patches_cop_spec.rb b/Library/Homebrew/test/rubocops/patches_spec.rb similarity index 99% rename from Library/Homebrew/test/rubocops/patches_cop_spec.rb rename to Library/Homebrew/test/rubocops/patches_spec.rb index 271c9cd957..4ef2e10bb7 100644 --- a/Library/Homebrew/test/rubocops/patches_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/patches_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/patches_cop" +require "rubocops/patches" describe RuboCop::Cop::FormulaAudit::Patches do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/text_cop_spec.rb b/Library/Homebrew/test/rubocops/text_spec.rb similarity index 99% rename from Library/Homebrew/test/rubocops/text_cop_spec.rb rename to Library/Homebrew/test/rubocops/text_spec.rb index d141ba82f0..9723c521cd 100644 --- a/Library/Homebrew/test/rubocops/text_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/text_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/text_cop" +require "rubocops/text" describe RuboCop::Cop::FormulaAudit::Text do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/urls_cop_spec.rb b/Library/Homebrew/test/rubocops/urls_spec.rb similarity index 99% rename from Library/Homebrew/test/rubocops/urls_cop_spec.rb rename to Library/Homebrew/test/rubocops/urls_spec.rb index 739e9be582..2d46595a1d 100644 --- a/Library/Homebrew/test/rubocops/urls_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/urls_spec.rb @@ -1,4 +1,4 @@ -require "rubocops/urls_cop" +require "rubocops/urls" describe RuboCop::Cop::FormulaAudit::Urls do subject(:cop) { described_class.new }