6 files changed, 9 insertions, 21 deletions
diff --git a/Library/.rubocop_todo.yml b/Library/.rubocop_todo.yml
index 421944874..dd8b34df7 100644
--- a/Library/.rubocop_todo.yml
+++ b/Library/.rubocop_todo.yml
@@ -242,18 +242,6 @@ Style/IfUnlessModifier:
 Style/IndentArray:
   EnforcedStyle: special_inside_parentheses
 
-# Offense count: 5
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: snake_case, camelCase
-Style/MethodName:
-  Exclude:
-    - 'Homebrew/compat/**/*'
-    - 'Homebrew/cleanup.rb'
-    - 'Homebrew/diagnostic.rb'
-    - 'Homebrew/formula_cellar_checks.rb'
-    - 'Homebrew/formula_installer.rb'
-    - 'Homebrew/os/mac/cctools_mach.rb'
-
 # Offense count: 7
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: module_function, extend_self
diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb
index 42be339a0..04a976e55 100644
--- a/Library/Homebrew/cleanup.rb
+++ b/Library/Homebrew/cleanup.rb
@@ -12,7 +12,7 @@ module Homebrew
       cleanup_logs
       unless ARGV.dry_run?
         cleanup_lockfiles
-        rm_DS_Store
+        rm_ds_store
       end
     end
 
@@ -119,7 +119,7 @@ module Homebrew
       end
     end
 
-    def self.rm_DS_Store
+    def self.rm_ds_store
       paths = Queue.new
       %w[Cellar Frameworks Library bin etc include lib opt sbin share var]
         .map { |p| HOMEBREW_PREFIX/p }.each { |p| paths << p if p.exist? }
diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index ae5a64c1d..8f158ddd8 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -595,7 +595,7 @@ module Homebrew
         EOS
       end
 
-      def check_DYLD_vars
+      def check_dyld_vars
         dyld_vars = ENV.keys.grep(/^DYLD_/)
         return if dyld_vars.empty?
 
diff --git a/Library/Homebrew/formula_cellar_checks.rb b/Library/Homebrew/formula_cellar_checks.rb
index 3805d0f45..89757dfb2 100644
--- a/Library/Homebrew/formula_cellar_checks.rb
+++ b/Library/Homebrew/formula_cellar_checks.rb
@@ -1,7 +1,7 @@
 require "utils/shell"
 
 module FormulaCellarChecks
-  def check_PATH(bin)
+  def check_env_path(bin)
     # warn the user if stuff was installed outside of their PATH
     return unless bin.directory?
     return if bin.children.empty?
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 303617218..f63ecdcb9 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -546,7 +546,7 @@ class FormulaInstaller
     @build_time ||= Time.now - @start_time if @start_time && !interactive?
   end
 
-  def sanitized_ARGV_options
+  def sanitized_argv_options
     args = []
     args << "--ignore-dependencies" if ignore_deps?
 
@@ -585,7 +585,7 @@ class FormulaInstaller
   end
 
   def build_argv
-    sanitized_ARGV_options + options.as_flags
+    sanitized_argv_options + options.as_flags
   end
 
   def build
@@ -813,8 +813,8 @@ class FormulaInstaller
   end
 
   def audit_installed
-    audit_check_output(check_PATH(formula.bin))
-    audit_check_output(check_PATH(formula.sbin))
+    audit_check_output(check_env_path(formula.bin))
+    audit_check_output(check_env_path(formula.sbin))
     super
   end
 
diff --git a/Library/Homebrew/test/test_diagnostic.rb b/Library/Homebrew/test/test_diagnostic.rb
index 5d0f5f386..37f56e961 100644
--- a/Library/Homebrew/test/test_diagnostic.rb
+++ b/Library/Homebrew/test/test_diagnostic.rb
@@ -154,7 +154,7 @@ class DiagnosticChecksTest < Homebrew::TestCase
   def test_check_dyld_vars
     ENV["DYLD_INSERT_LIBRARIES"] = "foo"
     assert_match "Setting DYLD_INSERT_LIBRARIES",
-      @checks.check_DYLD_vars
+      @checks.check_dyld_vars
   end
 
   def test_check_for_symlinked_cellar