Only "extend self" once on the Homebrew module

Library/Contributions/cmd/brew-which.rb

@@ -1,7 +1,6 @@
 require 'extend/pathname'
 
-
+module Homebrew
-module Homebrew extend self
   def which_versions which_brews=nil
     brew_links = Array.new
     version_map = Hash.new

Library/Homebrew/cmd/--cache.rb

@@ -1,6 +1,6 @@
 require "cmd/fetch"
 
-module Homebrew extend self
+module Homebrew
   def __cache
     if ARGV.named.empty?
       puts HOMEBREW_CACHE

Library/Homebrew/cmd/--cellar.rb

@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def __cellar
     if ARGV.named.empty?
       puts HOMEBREW_CELLAR

Library/Homebrew/cmd/--env.rb

@@ -1,7 +1,7 @@
 require 'extend/ENV'
 require 'hardware'
 
-module Homebrew extend self
+module Homebrew
   def __env
     ENV.activate_extensions!
 

Library/Homebrew/cmd/--prefix.rb

@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def __prefix
     if ARGV.named.empty?
       puts HOMEBREW_PREFIX

Library/Homebrew/cmd/--repository.rb

@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def __repository
     puts HOMEBREW_REPOSITORY
   end

Library/Homebrew/cmd/audit.rb

@@ -3,7 +3,7 @@ require 'utils'
 require 'extend/ENV'
 require 'formula_cellar_checks'
 
-module Homebrew extend self
+module Homebrew
   def audit
     formula_count = 0
     problem_count = 0

Library/Homebrew/cmd/bottle.rb

@@ -32,7 +32,7 @@ BOTTLE_ERB = <<-EOS
   end
 EOS
 
-module Homebrew extend self
+module Homebrew
   def keg_contains string, keg
     if not ARGV.homebrew_developer?
       return quiet_system 'fgrep', '--recursive', '--quiet', '--max-count=1', string, keg

Library/Homebrew/cmd/cat.rb

@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def cat
     # do not "fix" this to support multiple arguments, the output would be
     # unparsable, if the user wants to cat multiple formula they can call

Library/Homebrew/cmd/cleanup.rb

@@ -2,8 +2,7 @@ require 'formula'
 require 'keg'
 require 'bottles'
 
-module Homebrew extend self
+module Homebrew
-
   def cleanup
     # individual cleanup_ methods should also check for the existence of the
     # appropriate directories before assuming they exist

Library/Homebrew/cmd/commands.rb

@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def commands
     # Find commands in Homebrew/cmd
     cmds = (HOMEBREW_REPOSITORY/"Library/Homebrew/cmd").

Library/Homebrew/cmd/config.rb

@@ -1,6 +1,6 @@
 require 'hardware'
 
-module Homebrew extend self
+module Homebrew
   def config
     dump_verbose_config
   end

Library/Homebrew/cmd/create.rb

@@ -3,7 +3,7 @@ require 'blacklist'
 require 'digest'
 require 'erb'
 
-module Homebrew extend self
+module Homebrew
 
   # Create a formula from a tarball URL
   def create

Library/Homebrew/cmd/deps.rb

@@ -1,7 +1,7 @@
 require 'formula'
 require 'ostruct'
 
-module Homebrew extend self
+module Homebrew
   def deps
     mode = OpenStruct.new(
       :installed?  => ARGV.include?('--installed'),

Library/Homebrew/cmd/diy.rb

@@ -1,6 +1,6 @@
 require "formula"
 
-module Homebrew extend self
+module Homebrew
   def diy
     %w[name version].each do |opt|
       if ARGV.include? "--set-#{opt}"

Library/Homebrew/cmd/doctor.rb

@@ -1122,7 +1122,7 @@ end
   end
 end # end class Checks
 
-module Homebrew extend self
+module Homebrew
   def doctor
     checks = Checks.new
 

Library/Homebrew/cmd/edit.rb

@@ -1,6 +1,6 @@
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def edit
     unless (HOMEBREW_REPOSITORY/'.git').directory?
       raise <<-EOS.undent

Library/Homebrew/cmd/fetch.rb

@@ -1,6 +1,6 @@
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def fetch
     raise FormulaUnspecifiedError if ARGV.named.empty?
 

Library/Homebrew/cmd/help.rb

@@ -31,7 +31,7 @@ EOS
 # NOTE Keep lines less than 80 characters! Wrapping is just not cricket.
 # NOTE The reason the string is at the top is so 25 lines is easy to measure!
 
-module Homebrew extend self
+module Homebrew
   def help
     puts HOMEBREW_HELP
   end

Library/Homebrew/cmd/home.rb

@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def home
     if ARGV.named.empty?
       exec_browser HOMEBREW_WWW

Library/Homebrew/cmd/info.rb

@@ -5,7 +5,7 @@ require 'caveats'
 require 'blacklist'
 require 'utils/json'
 
-module Homebrew extend self
+module Homebrew
   def info
     # eventually we'll solidify an API, but we'll keep old versions
     # awhile around for compatibility

Library/Homebrew/cmd/install.rb

@@ -5,7 +5,7 @@ require "cmd/tap"
 require "formula_installer"
 require "hardware"
 
-module Homebrew extend self
+module Homebrew
   def install
     raise FormulaUnspecifiedError if ARGV.named.empty?
 

Library/Homebrew/cmd/irb.rb

@@ -13,7 +13,7 @@ class String
   end
 end
 
-module Homebrew extend self
+module Homebrew
   def irb
     if ARGV.include? "--help"
       puts "'v8'.f # => instance of the Ack formula"

Library/Homebrew/cmd/leaves.rb

@@ -2,7 +2,7 @@ require 'formula'
 require 'tab'
 require 'set'
 
-module Homebrew extend self
+module Homebrew
   def leaves
     installed = Formula.installed
     deps_of_installed = Set.new

Library/Homebrew/cmd/link.rb

@@ -1,7 +1,6 @@
 require 'ostruct'
 
-module Homebrew extend self
+module Homebrew
-
   def link
     raise KegUnspecifiedError if ARGV.named.empty?
 

Library/Homebrew/cmd/linkapps.rb

@@ -1,8 +1,7 @@
 # Links any Applications (.app) found in installed prefixes to /Applications
 require 'keg'
 
-module Homebrew extend self
+module Homebrew
-
   def linkapps
     target_dir = ARGV.include?("--local") ? File.expand_path("~/Applications") : "/Applications"
 

Library/Homebrew/cmd/list.rb

@@ -1,6 +1,6 @@
 require "metafiles"
 
-module Homebrew extend self
+module Homebrew
   def list
 
     # Use of exec means we don't explicitly exit

Library/Homebrew/cmd/log.rb

@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def log
     if ARGV.named.empty?
       cd HOMEBREW_REPOSITORY

Library/Homebrew/cmd/missing.rb

@@ -1,7 +1,7 @@
 require 'formula'
 require 'tab'
 
-module Homebrew extend self
+module Homebrew
   def missing_deps ff
     missing = {}
     ff.each do |f|

Library/Homebrew/cmd/options.rb

@@ -1,6 +1,6 @@
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def options
     if ARGV.include? '--all'
       puts_options Formula.to_a

Library/Homebrew/cmd/outdated.rb

@@ -1,7 +1,7 @@
 require 'formula'
 require 'keg'
 
-module Homebrew extend self
+module Homebrew
   def outdated
     outdated_brews do |f, versions|
       if ($stdout.tty? || ARGV.verbose?) and not ARGV.flag? '--quiet'

Library/Homebrew/cmd/pin.rb

@@ -1,6 +1,6 @@
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def pin
     raise FormulaUnspecifiedError if ARGV.named.empty?
 

Library/Homebrew/cmd/postinstall.rb

@@ -1,6 +1,6 @@
 require 'formula_installer'
 
-module Homebrew extend self
+module Homebrew
   def postinstall
     ARGV.formulae.each {|f| f.post_install }
   end

Library/Homebrew/cmd/prune.rb

@@ -1,7 +1,7 @@
 require 'keg'
 require 'cmd/tap'
 
-module Homebrew extend self
+module Homebrew
   def prune
     ObserverPathnameExtension.reset_counts!
 

Library/Homebrew/cmd/reinstall.rb

@@ -1,6 +1,6 @@
 require 'cmd/install'
 
-module Homebrew extend self
+module Homebrew
   def reinstall
     ARGV.formulae.each { |f| reinstall_formula(f) }
   end

Library/Homebrew/cmd/search.rb

@@ -3,7 +3,7 @@ require 'blacklist'
 require 'utils'
 require 'thread'
 
-module Homebrew extend self
+module Homebrew
 
   SEARCH_ERROR_QUEUE = Queue.new
 

Library/Homebrew/cmd/sh.rb

@@ -1,7 +1,7 @@
 require 'extend/ENV'
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def sh
     ENV.activate_extensions!
 

Library/Homebrew/cmd/tap.rb

@@ -1,5 +1,4 @@
-module Homebrew extend self
+module Homebrew
-
   def tap
     if ARGV.empty?
       each_tap do |user, repo|

Library/Homebrew/cmd/test.rb

@@ -3,7 +3,7 @@ require 'hardware'
 require 'keg'
 require 'timeout'
 
-module Homebrew extend self
+module Homebrew
   TEST_TIMEOUT_SECONDS = 5*60
 
   if defined?(Gem)

Library/Homebrew/cmd/tests.rb

@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def tests
     (HOMEBREW_LIBRARY/'Homebrew/test').cd do
       ENV['TESTOPTS'] = '-v' if ARGV.verbose?

Library/Homebrew/cmd/uninstall.rb

@@ -1,7 +1,7 @@
 require 'keg'
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def uninstall
     raise KegUnspecifiedError if ARGV.named.empty?
 

Library/Homebrew/cmd/unlink.rb

@@ -1,4 +1,4 @@
-module Homebrew extend self
+module Homebrew
   def unlink
     raise KegUnspecifiedError if ARGV.named.empty?
 

Library/Homebrew/cmd/unlinkapps.rb

@@ -1,8 +1,7 @@
 # Unlinks any Applications (.app) found in installed prefixes from /Applications
 require 'keg'
 
-module Homebrew extend self
+module Homebrew
-
   def unlinkapps
     target_dir = ARGV.include?("--local") ? File.expand_path("~/Applications") : "/Applications"
 

Library/Homebrew/cmd/unpack.rb

@@ -2,8 +2,6 @@ require "stringio"
 require "formula"
 
 module Homebrew
-  extend self
-
   module DATALoader
     # Original code from http://stackoverflow.com/a/2157556/371237
     def self.load(path)

Library/Homebrew/cmd/unpin.rb

@@ -1,6 +1,6 @@
 require 'formula'
 
-module Homebrew extend self
+module Homebrew
   def unpin
     raise FormulaUnspecifiedError if ARGV.named.empty?
 

Library/Homebrew/cmd/untap.rb

@@ -1,6 +1,6 @@
 require 'cmd/tap' # for tap_args
 
-module Homebrew extend self
+module Homebrew
   def untap
     raise "Usage is `brew untap <tap-name>`" if ARGV.empty?
 

Library/Homebrew/cmd/update.rb

@@ -1,7 +1,7 @@
 require 'cmd/tap'
 require 'cmd/untap'
 
-module Homebrew extend self
+module Homebrew
   def update
     unless ARGV.named.empty?
       abort <<-EOS.undent

Library/Homebrew/cmd/upgrade.rb

@@ -1,7 +1,7 @@
 require 'cmd/install'
 require 'cmd/outdated'
 
-module Homebrew extend self
+module Homebrew
   def upgrade
     Homebrew.perform_preinstall_checks
 

Library/Homebrew/cmd/uses.rb

@@ -4,7 +4,7 @@ require 'formula'
 # If you want the union, run the command twice and concatenate the results.
 # The intersection is harder to achieve with shell tools.
 
-module Homebrew extend self
+module Homebrew
   def uses
     raise FormulaUnspecifiedError if ARGV.named.empty?
 

Library/Homebrew/cmd/versions.rb

@@ -1,7 +1,7 @@
 require "formula"
 require "formula_versions"
 
-module Homebrew extend self
+module Homebrew
   def versions
     raise "Please `brew install git` first" unless which "git"
     raise "Please `brew update` first" unless (HOMEBREW_REPOSITORY/".git").directory?

Library/Homebrew/global.rb

@@ -93,8 +93,9 @@ HOMEBREW_CURL_ARGS = '-f#LA'
 
 require 'tap_constants'
 
-module Homebrew extend self
+module Homebrew
   include FileUtils
+  extend self
 
   attr_accessor :failed
   alias_method :failed?, :failed

Library/Homebrew/test/testing_env.rb

@@ -65,6 +65,7 @@ end
 
 module Homebrew
   include FileUtils
+  extend self
 
   module VersionAssertions
     def version v