Update Homebrew-Cask references.

Library/Homebrew/cask/lib/hbc/audit.rb

@@ -61,7 +61,7 @@ module Hbc
 
       tap = @cask.tap
       return if tap.nil?
-      return unless ["Homebrew", "caskroom"].include?(tap.user)
+      return if tap.user != "Homebrew"
 
       return unless cask.artifacts.any? { |k| k.is_a?(Hbc::Artifact::Pkg) && k.stanza_options.key?(:allow_untrusted) }
       add_warning "allow_untrusted is not permitted in official Homebrew-Cask taps"
@@ -133,7 +133,7 @@ module Hbc
         return unless previous_cask.version == cask.version
         return if previous_cask.sha256 == cask.sha256
 
-        add_error "only sha256 changed (see: https://github.com/caskroom/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/sha256.md)"
+        add_error "only sha256 changed (see: https://github.com/Homebrew/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/sha256.md)"
       rescue CaskError => e
         add_warning "Skipped version and checksum comparison. Reading previous version failed: #{e}"
       end
@@ -250,7 +250,7 @@ module Hbc
       return if cask.appcast
       return unless cask.url.to_s =~ %r{github.com/([^/]+)/([^/]+)/releases/download/(\S+)}
 
-      add_warning "Cask uses GitHub releases, please add an appcast. See https://github.com/caskroom/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/appcast.md"
+      add_warning "Cask uses GitHub releases, please add an appcast. See https://github.com/Homebrew/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/appcast.md"
     end
 
     def check_url
@@ -261,9 +261,9 @@ module Hbc
     def check_download_url_format
       odebug "Auditing URL format"
       if bad_sourceforge_url?
-        add_warning "SourceForge URL format incorrect. See https://github.com/caskroom/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#sourceforgeosdn-urls"
+        add_warning "SourceForge URL format incorrect. See https://github.com/Homebrew/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#sourceforgeosdn-urls"
       elsif bad_osdn_url?
-        add_warning "OSDN URL format incorrect. See https://github.com/caskroom/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#sourceforgeosdn-urls"
+        add_warning "OSDN URL format incorrect. See https://github.com/Homebrew/homebrew-cask/blob/master/doc/cask_language_reference/stanzas/url.md#sourceforgeosdn-urls"
       end
     end
 

Library/Homebrew/cask/lib/hbc/cli/search.rb

@@ -21,7 +21,7 @@ module Hbc
       def self.search_remote(query)
         matches = begin
           GitHub.search_code(
-            user: ["Homebrew", "caskroom"],
+            user: "Homebrew",
             path: "Casks",
             filename: query,
             extension: "rb",

Library/Homebrew/cask/lib/hbc/dsl/caveats.rb

@@ -100,7 +100,7 @@ module Hbc
           <<~EOS
             #{@cask} requires Java #{java_version}. You can install it with
 
-              brew cask install caskroom/versions/java#{java_version}
+              brew cask install homebrew/cask-versions/java#{java_version}
           EOS
         end
       end
@@ -150,7 +150,7 @@ module Hbc
           If this report is accurate, please duplicate it at
             #{Formatter.url("https://bugreport.apple.com/")}
           If this report is a mistake, please let us know by opening an issue at
-            #{Formatter.url("https://github.com/caskroom/homebrew-cask/issues/new")}
+            #{Formatter.url("https://github.com/Homebrew/homebrew-cask/issues/new")}
         EOS
       end
     end

Library/Homebrew/cask/lib/hbc/locations.rb

@@ -17,7 +17,7 @@ module Hbc
       attr_writer :default_tap
 
       def default_tap
-        @default_tap ||= Tap.fetch("caskroom", "homebrew-cask")
+        @default_tap ||= Tap.fetch("homebrew", "homebrew-cask")
       end
 
       def tcc_db

Library/Homebrew/cask/lib/hbc/utils.rb

@@ -2,7 +2,7 @@ require "yaml"
 require "open3"
 require "stringio"
 
-BUG_REPORTS_URL = "https://github.com/caskroom/homebrew-cask#reporting-bugs".freeze
+BUG_REPORTS_URL = "https://github.com/Homebrew/homebrew-cask#reporting-bugs".freeze
 
 # global methods
 

Library/Homebrew/cmd/search.rb

@@ -110,7 +110,7 @@ module Homebrew
 
     matches = begin
       GitHub.search_code(
-        user: ["Homebrew", "caskroom"],
+        user: "Homebrew",
         path: ["Formula", "HomebrewFormula", "Casks", "."],
         filename: query,
         extension: "rb",
@@ -122,7 +122,7 @@ module Homebrew
     matches.map do |match|
       filename = File.basename(match["path"], ".rb")
       tap = Tap.fetch(match["repository"]["full_name"])
-      next if tap.installed? && match["repository"]["owner"]["login"] != "caskroom"
+      next if tap.installed? && !(tap.user == "Homebrew" && tap.repo.start_with?("cask"))
       "#{tap.name}/#{filename}"
     end.compact
   end

Library/Homebrew/cmd/update-report.rb

@@ -470,7 +470,7 @@ class Reporter
       next unless tabs.first.tap == tap # skip if installed formula is not from this tap.
       new_tap = Tap.fetch(new_tap_name)
       # For formulae migrated to cask: Auto-install cask or provide install instructions.
-      if ["homebrew/cask", "caskroom/cask"].include?(new_tap_name)
+      if new_tap_name.start_with?("homebrew/cask")
         if new_tap.installed? && (HOMEBREW_PREFIX/"Caskroom").directory?
           ohai "#{name} has been moved to Homebrew-Cask."
           ohai "brew unlink #{name}"
@@ -489,6 +489,7 @@ class Reporter
           ohai "#{name} has been moved to Homebrew-Cask.", <<~EOS
             To uninstall the formula and install the cask run:
               brew uninstall --force #{name}
+              brew tap #{new_tap_name}
               brew cask install #{new_name}
           EOS
         end

Library/Homebrew/manpages/brew-cask.1.md

@@ -242,13 +242,13 @@ described above, the argument can take the form of:
 Homebrew-Cask also accepts three other forms in place of plain tokens:
 
   * A fully-qualified token which includes the Tap name, e.g.
-    `caskroom/fonts/font-symbola`
+    `homebrew/cask-fonts/font-symbola`
 
   * A fully-qualified pathname to a Cask file, e.g.
-    `/usr/local/Library/Taps/caskroom/homebrew-cask/Casks/google-chrome.rb`
+    `/usr/local/Library/Taps/homebrew/homebrew-cask/Casks/google-chrome.rb`
 
   * A `curl`-retrievable URI to a Cask file, e.g.
-    `https://raw.githubusercontent.com/caskroom/homebrew-cask/f25b6babcd398abf48e33af3d887b2d00de1d661/Casks/google-chrome.rb`
+    `https://raw.githubusercontent.com/Homebrew/homebrew-cask/f25b6babcd398abf48e33af3d887b2d00de1d661/Casks/google-chrome.rb`
 
 ## ENVIRONMENT
 
@@ -275,7 +275,7 @@ Other environment variables:
 
 The Homebrew-Cask home page: <https://caskroom.github.io/>
 
-The Homebrew-Cask GitHub page: <https://github.com/caskroom/homebrew-cask>
+The Homebrew-Cask GitHub page: <https://github.com/Homebrew/homebrew-cask>
 
 `brew`(1), `curl`(1)
 
@@ -288,7 +288,7 @@ Man page format based on `brew.1.md` from Homebrew.
 ## BUGS
 
 We still have bugs - and we are busy fixing them!  If you have a problem, don't
-be shy about reporting it on our [GitHub issues page](https://github.com/caskroom/homebrew-cask/issues?state=open).
+be shy about reporting it on our [GitHub issues page](https://github.com/Homebrew/homebrew-cask/issues?state=open).
 
 When reporting bugs, remember that Homebrew-Cask is an independent project from
 Homebrew. Do your best to direct bug reports to the appropriate project. If

Library/Homebrew/manpages/brew.1.md.erb

@@ -65,7 +65,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
     Install macOS applications distributed as binaries.
 
 
-  Caskroom/homebrew-cask <https://github.com/caskroom/homebrew-cask>
+  Homebrew/homebrew-cask <https://github.com/Homebrew/homebrew-cask>
 
   <%= homebrew_services.join("\n  ").strip %>
 

Library/Homebrew/missing_formula.rb

@@ -101,7 +101,7 @@ module Homebrew
           EOS
           break if new_tap_name == CoreTap.instance.name
 
-          install_cmd = if new_tap_user == "caskroom" || (new_tap_user == "homebrew" && new_tap_repo.start_with?("cask"))
+          install_cmd = if new_tap_name.start_with?("homebrew/cask")
             "cask install"
           else
             "install"

Library/Homebrew/requirements/java_requirement.rb

@@ -57,7 +57,7 @@ class JavaRequirement < Requirement
   private
 
   JAVA_CASK_MAP = {
-    "1.8" => "caskroom/versions/java8",
+    "1.8" => "homebrew/cask-versions/java8",
     "10.0" => "java",
   }.freeze
 

Library/Homebrew/test/cask/cli_spec.rb

@@ -1,14 +1,14 @@
 describe Hbc::CLI, :cask do
   it "lists the taps for Casks that show up in two taps" do
     listing = described_class.nice_listing(%w[
-                                             caskroom/cask/adium
-                                             caskroom/cask/google-chrome
+                                             homebrew/cask/adium
+                                             homebrew/cask/google-chrome
                                              passcod/homebrew-cask/adium
                                            ])
 
     expect(listing).to eq(%w[
-                            caskroom/cask/adium
                             google-chrome
+                            homebrew/cask/adium
                             passcod/cask/adium
                           ])
   end

Library/Homebrew/test/cask/dsl_spec.rb

@@ -26,7 +26,7 @@ describe Hbc::DSL, :cask do
         .*
         Unexpected method 'future_feature' called on Cask unexpected-method-cask\\.
         .*
-        https://github.com/caskroom/homebrew-cask#reporting-bugs
+        https://github.com/Homebrew/homebrew-cask#reporting-bugs
       EOS
 
       expect {

Library/Homebrew/test/cmd/cask_spec.rb

@@ -1,7 +1,7 @@
 describe "brew cask", :integration_test, :needs_macos, :needs_network do
   describe "list" do
     it "returns a list of installed Casks" do
-      setup_remote_tap("caskroom/cask")
+      setup_remote_tap("homebrew/cask")
 
       expect { brew "cask", "list" }.to be_a_success
     end

Library/Homebrew/test/cmd/search_spec.rb

@@ -25,9 +25,9 @@ describe "brew search", :integration_test do
   end
 
   it "falls back to a GitHub tap search when no formula is found", :needs_network, retry: 3 do
-    setup_remote_tap "caskroom/cask"
+    setup_remote_tap "homebrew/cask"
 
-    expect { brew "search", "caskroom/cask/firefox" }
+    expect { brew "search", "homebrew/cask/firefox" }
       .to output(/firefox/).to_stdout
       .and output(/Searching/).to_stderr
       .and be_a_success

Library/Homebrew/test/spec_helper.rb

@@ -133,7 +133,6 @@ RSpec.configure do |config|
         HOMEBREW_PREFIX/"share",
         HOMEBREW_PREFIX/"opt",
         HOMEBREW_PREFIX/"Caskroom",
-        HOMEBREW_LIBRARY/"Taps/caskroom",
         HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-cask",
         HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bar",
         HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-bundle",