From ac2cd67861d14110eeb2e492f1e06b95fd7801ee Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Thu, 6 Sep 2018 06:07:43 +0200
Subject: [PATCH] Deprecate `brew cask --version`.

---
 Library/Homebrew/cask/all.rb                        |  1 -
 Library/Homebrew/cask/cmd.rb                        |  1 -
 Library/Homebrew/cask/cmd/doctor.rb                 |  2 +-
 Library/Homebrew/cask/version.rb                    | 10 ----------
 Library/Homebrew/cmd/--version.rb                   |  3 ++-
 Library/Homebrew/compat/cask.rb                     |  1 +
 Library/Homebrew/{ => compat}/cask/cmd/--version.rb | 11 ++++++++++-
 Library/Homebrew/test/cask/cli/--version_spec.rb    | 13 -------------
 Library/Homebrew/test/cask/cli/doctor_spec.rb       |  6 +++---
 9 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 Library/Homebrew/cask/version.rb
 rename Library/Homebrew/{ => compat}/cask/cmd/--version.rb (61%)
 delete mode 100644 Library/Homebrew/test/cask/cli/--version_spec.rb

diff --git a/Library/Homebrew/cask/all.rb b/Library/Homebrew/cask/all.rb
index b73ce4ae69..6b8bf5f60e 100644
--- a/Library/Homebrew/cask/all.rb
+++ b/Library/Homebrew/cask/all.rb
@@ -18,4 +18,3 @@ require "cask/staged"
 require "cask/topological_hash"
 require "cask/utils"
 require "cask/verify"
-require "cask/version"
diff --git a/Library/Homebrew/cask/cmd.rb b/Library/Homebrew/cask/cmd.rb
index 30de50eb5f..6ec7a83212 100644
--- a/Library/Homebrew/cask/cmd.rb
+++ b/Library/Homebrew/cask/cmd.rb
@@ -23,7 +23,6 @@ require "cask/cmd/reinstall"
 require "cask/cmd/style"
 require "cask/cmd/uninstall"
 require "cask/cmd/upgrade"
-require "cask/cmd/--version"
 require "cask/cmd/zap"
 
 require "cask/cmd/abstract_internal_command"
diff --git a/Library/Homebrew/cask/cmd/doctor.rb b/Library/Homebrew/cask/cmd/doctor.rb
index 8772712282..69a931b285 100644
--- a/Library/Homebrew/cask/cmd/doctor.rb
+++ b/Library/Homebrew/cask/cmd/doctor.rb
@@ -33,7 +33,7 @@ module Hbc
       end
 
       def check_software_versions
-        ohai "Homebrew Cask Version", Hbc.full_version
+        ohai "Homebrew Version", HOMEBREW_VERSION
         ohai "macOS", MacOS.full_version
         ohai "SIP", self.class.check_sip
         ohai "Java", SystemConfig.describe_java
diff --git a/Library/Homebrew/cask/version.rb b/Library/Homebrew/cask/version.rb
deleted file mode 100644
index c766378427..0000000000
--- a/Library/Homebrew/cask/version.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Hbc
-  def self.full_version
-    @full_version ||= begin
-      <<~EOS
-        Homebrew Cask #{HOMEBREW_VERSION}
-        #{Tap.default_cask_tap.full_name} #{Tap.default_cask_tap.version_string}
-      EOS
-    end
-  end
-end
diff --git a/Library/Homebrew/cmd/--version.rb b/Library/Homebrew/cmd/--version.rb
index 5459264c71..a05369e25b 100644
--- a/Library/Homebrew/cmd/--version.rb
+++ b/Library/Homebrew/cmd/--version.rb
@@ -8,6 +8,7 @@ module Homebrew
     odie "This command does not take arguments." if ARGV.any?
 
     puts "Homebrew #{HOMEBREW_VERSION}"
-    puts "Homebrew/homebrew-core #{CoreTap.instance.version_string}"
+    puts "#{CoreTap.instance.full_name} #{CoreTap.instance.version_string}"
+    puts "#{Tap.default_cask_tap.full_name} #{Tap.default_cask_tap.version_string}" if Tap.default_cask_tap.installed?
   end
 end
diff --git a/Library/Homebrew/compat/cask.rb b/Library/Homebrew/compat/cask.rb
index cb0a05aa98..69d0cc7fa9 100644
--- a/Library/Homebrew/compat/cask.rb
+++ b/Library/Homebrew/compat/cask.rb
@@ -1,4 +1,5 @@
 require "compat/cask/cask_loader"
+require "compat/cask/cmd/--version"
 require "compat/cask/cmd/cleanup"
 require "compat/cask/cmd/search"
 require "compat/cask/cache"
diff --git a/Library/Homebrew/cask/cmd/--version.rb b/Library/Homebrew/compat/cask/cmd/--version.rb
similarity index 61%
rename from Library/Homebrew/cask/cmd/--version.rb
rename to Library/Homebrew/compat/cask/cmd/--version.rb
index 75fff8d2a9..1592b3bb7a 100644
--- a/Library/Homebrew/cask/cmd/--version.rb
+++ b/Library/Homebrew/compat/cask/cmd/--version.rb
@@ -1,3 +1,6 @@
+require "cask/cmd/abstract_command"
+require "cmd/--version"
+
 module Hbc
   class Cmd
     class Version < AbstractCommand
@@ -12,12 +15,18 @@ module Hbc
       end
 
       def run
-        puts Hbc.full_version
+        odeprecated "`brew cask --version`", "`brew --version`", disable_on: Time.new(2018, 10, 31)
+        ARGV.clear
+        Homebrew.__version
       end
 
       def self.help
         "displays the Homebrew Cask version"
       end
+
+      def self.visible
+        false
+      end
     end
   end
 end
diff --git a/Library/Homebrew/test/cask/cli/--version_spec.rb b/Library/Homebrew/test/cask/cli/--version_spec.rb
deleted file mode 100644
index b1fefeaa14..0000000000
--- a/Library/Homebrew/test/cask/cli/--version_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-describe Hbc::Cmd::Version, :cask do
-  describe "::run" do
-    it "outputs the current Homebrew Cask version" do
-      expect { described_class.run }
-        .to output(/\AHomebrew Cask.*\d+\.\d+\.\d+/).to_stdout
-        .and not_to_output.to_stderr
-    end
-
-    it "does not support arguments" do
-      expect { described_class.run(:foo, :bar) }.to raise_error(ArgumentError)
-    end
-  end
-end
diff --git a/Library/Homebrew/test/cask/cli/doctor_spec.rb b/Library/Homebrew/test/cask/cli/doctor_spec.rb
index e49eae51af..a8f0b4261d 100644
--- a/Library/Homebrew/test/cask/cli/doctor_spec.rb
+++ b/Library/Homebrew/test/cask/cli/doctor_spec.rb
@@ -5,13 +5,13 @@ describe Hbc::Cmd::Doctor, :cask do
 
   it "displays some nice info about the environment" do
     expect {
-      Hbc::Cmd::Doctor.run
-    }.to output(/\A==> Homebrew Cask Version/).to_stdout
+      described_class.run
+    }.to output(/^==> Homebrew Version/).to_stdout
   end
 
   it "raises an exception when arguments are given" do
     expect {
-      Hbc::Cmd::Doctor.run("argument")
+      described_class.run("argument")
     }.to raise_error(ArgumentError)
   end
 end