diff --git a/Library/Homebrew/cask/cmd/info.rb b/Library/Homebrew/cask/cmd/info.rb index 0b60974bae2e6acaada784afbbcff03d1d478cef..5d5e236000bae43a8d25fffccc494fedc27a37cc 100644 --- a/Library/Homebrew/cask/cmd/info.rb +++ b/Library/Homebrew/cask/cmd/info.rb @@ -36,8 +36,7 @@ module Cask repo = repo_info(cask) output << repo + "\n" if repo output << name_info(cask) - description = desc_info(cask) - output << description if description + output << desc_info(cask) language = language_info(cask) output << language if language output << artifact_info(cask) + "\n" @@ -85,11 +84,9 @@ module Cask end def self.desc_info(cask) - return if cask.desc.nil? - <<~EOS #{ohai_title("Description")} - #{cask.desc} + #{cask.desc.nil? ? Formatter.error("None") : cask.desc} EOS end diff --git a/Library/Homebrew/test/cask/cmd/info_spec.rb b/Library/Homebrew/test/cask/cmd/info_spec.rb index d21c62e7c4ba76595714176e5b98d0350c9204fd..3828d4d95e1f73a8af291eae9325b5cd538d7823 100644 --- a/Library/Homebrew/test/cask/cmd/info_spec.rb +++ b/Library/Homebrew/test/cask/cmd/info_spec.rb @@ -35,6 +35,8 @@ describe Cask::Cmd::Info, :cask do From: https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/with-auto-updates.rb ==> Name AutoUpdates + ==> Description + None ==> Artifacts AutoUpdates.app (App) EOS @@ -49,6 +51,8 @@ describe Cask::Cmd::Info, :cask do From: https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/local-caffeine.rb ==> Name None + ==> Description + None ==> Artifacts Caffeine.app (App) @@ -82,6 +86,8 @@ describe Cask::Cmd::Info, :cask do From: https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/with-caveats.rb ==> Name None + ==> Description + None ==> Artifacts Caffeine.app (App) ==> Caveats @@ -107,6 +113,8 @@ describe Cask::Cmd::Info, :cask do From: https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/with-conditional-caveats.rb ==> Name None + ==> Description + None ==> Artifacts Caffeine.app (App) EOS @@ -122,6 +130,8 @@ describe Cask::Cmd::Info, :cask do From: https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/with-languages.rb ==> Name None + ==> Description + None ==> Languages zh, en-US ==> Artifacts @@ -139,6 +149,8 @@ describe Cask::Cmd::Info, :cask do From: https://github.com/Homebrew/homebrew-cask/blob/HEAD/Casks/without-languages.rb ==> Name None + ==> Description + None ==> Artifacts Caffeine.app (App) EOS @@ -167,6 +179,8 @@ describe Cask::Cmd::Info, :cask do ==> Names Docker Community Edition Docker CE + ==> Description + None ==> Artifacts Docker.app (App) ==> Analytics @@ -178,6 +192,8 @@ describe Cask::Cmd::Info, :cask do ==> Names Docker Community Edition Docker CE + ==> Description + None ==> Artifacts Docker.app (App) ==> Analytics