From 619af6a723e69f2c91e2bb6d293dc8046704d81d Mon Sep 17 00:00:00 2001
From: Waldir Pimenta <waldyrious@gmail.com>
Date: Thu, 13 Aug 2020 20:16:24 +0100
Subject: [PATCH] Show cask description in `brew cask info` command
---
Library/Homebrew/cask/cmd/info.rb | 11 +++++++++++
Library/Homebrew/test/cask/cmd/info_spec.rb | 4 ++++
Library/Homebrew/test/cask/cmd/list_spec.rb | 2 +-
.../support/fixtures/cask/Casks/local-transmission.rb | 1 +
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/Library/Homebrew/cask/cmd/info.rb b/Library/Homebrew/cask/cmd/info.rb
index 49806cd131..0b60974bae 100644
--- a/Library/Homebrew/cask/cmd/info.rb
+++ b/Library/Homebrew/cask/cmd/info.rb
@@ -36,6 +36,8 @@ module Cask
repo = repo_info(cask)
output << repo + "\n" if repo
output << name_info(cask)
+ description = desc_info(cask)
+ output << description if description
language = language_info(cask)
output << language if language
output << artifact_info(cask) + "\n"
@@ -82,6 +84,15 @@ module Cask
EOS
end
+ def self.desc_info(cask)
+ return if cask.desc.nil?
+
+ <<~EOS
+ #{ohai_title("Description")}
+ #{cask.desc}
+ EOS
+ end
+
def self.language_info(cask)
return if cask.languages.empty?
diff --git a/Library/Homebrew/test/cask/cmd/info_spec.rb b/Library/Homebrew/test/cask/cmd/info_spec.rb
index 44ca60e9bb..d21c62e7c4 100644
--- a/Library/Homebrew/test/cask/cmd/info_spec.rb
+++ b/Library/Homebrew/test/cask/cmd/info_spec.rb
@@ -18,6 +18,8 @@ describe Cask::Cmd::Info, :cask do
From: https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/local-transmission.rb
==> Name
Transmission
+ ==> Description
+ BitTorrent client
==> Artifacts
Transmission.app (App)
EOS
@@ -56,6 +58,8 @@ describe Cask::Cmd::Info, :cask do
From: https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/local-transmission.rb
==> Name
Transmission
+ ==> Description
+ BitTorrent client
==> Artifacts
Transmission.app (App)
EOS
diff --git a/Library/Homebrew/test/cask/cmd/list_spec.rb b/Library/Homebrew/test/cask/cmd/list_spec.rb
index 6f65837b52..775b6787c2 100644
--- a/Library/Homebrew/test/cask/cmd/list_spec.rb
+++ b/Library/Homebrew/test/cask/cmd/list_spec.rb
@@ -90,7 +90,7 @@ describe Cask::Cmd::List, :cask do
let(:casks) { ["local-caffeine", "local-transmission"] }
let(:expected_output) {
<<~EOS
- [{"token":"local-caffeine","name":[],"desc":null,"homepage":"https://brew.sh/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/caffeine.zip","appcast":null,"version":"1.2.3","sha256":"67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94","artifacts":[["Caffeine.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"local-transmission","name":["Transmission"],"desc":null,"homepage":"https://transmissionbt.com/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg","appcast":null,"version":"2.61","sha256":"e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68","artifacts":[["Transmission.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null}]
+ [{"token":"local-caffeine","name":[],"desc":null,"homepage":"https://brew.sh/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/caffeine.zip","appcast":null,"version":"1.2.3","sha256":"67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94","artifacts":[["Caffeine.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"local-transmission","name":["Transmission"],"desc":"BitTorrent client","homepage":"https://transmissionbt.com/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg","appcast":null,"version":"2.61","sha256":"e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68","artifacts":[["Transmission.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null}]
EOS
}
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/local-transmission.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/local-transmission.rb
index e765f67764..a4820e1c55 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/local-transmission.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/local-transmission.rb
@@ -4,6 +4,7 @@ cask "local-transmission" do
url "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg"
name "Transmission"
+ desc "BitTorrent client"
homepage "https://transmissionbt.com/"
app "Transmission.app"
--
GitLab