From efdef5f26cc2a0b730a10146f083d3bed7370f1a Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Wed, 1 Mar 2023 00:00:54 +0900 Subject: [PATCH] move cask/cmd/info to cask/info --- Library/Homebrew/cask/cmd.rb | 1 - Library/Homebrew/cask/cmd/info.rb | 154 ------------------ Library/Homebrew/cask/info.rb | 105 ++++++++++++ Library/Homebrew/cmd/info.rb | 5 +- .../Homebrew/extend/os/mac/missing_formula.rb | 4 +- 5 files changed, 109 insertions(+), 160 deletions(-) delete mode 100644 Library/Homebrew/cask/cmd/info.rb create mode 100644 Library/Homebrew/cask/info.rb diff --git a/Library/Homebrew/cask/cmd.rb b/Library/Homebrew/cask/cmd.rb index 1956cc4453..0ab2baf3d4 100644 --- a/Library/Homebrew/cask/cmd.rb +++ b/Library/Homebrew/cask/cmd.rb @@ -12,7 +12,6 @@ require "cask/config" require "cask/cmd/abstract_command" require "cask/cmd/audit" require "cask/cmd/fetch" -require "cask/cmd/info" require "cask/cmd/install" require "cask/cmd/list" require "cask/cmd/reinstall" diff --git a/Library/Homebrew/cask/cmd/info.rb b/Library/Homebrew/cask/cmd/info.rb deleted file mode 100644 index 343390a4b1..0000000000 --- a/Library/Homebrew/cask/cmd/info.rb +++ /dev/null @@ -1,154 +0,0 @@ -# typed: false -# frozen_string_literal: true - -require "json" - -module Cask - class Cmd - # Cask implementation of the `brew info` command. - # - # @api private - class Info < AbstractCommand - extend T::Sig - - def self.parser - super do - flag "--json=", - description: "Output information in JSON format." - switch "--github", - description: "Open the GitHub source page for in a browser. " - end - end - - def github_info(cask) - sourcefile_path = cask.sourcefile_path - dir = cask.tap.path - path = sourcefile_path.relative_path_from(dir) - remote = cask.tap.remote - github_remote_path(remote, path) - end - - def github_remote_path(remote, path) - if remote =~ %r{^(?:https?://|git(?:@|://))github\.com[:/](.+)/(.+?)(?:\.git)?$} - "https://github.com/#{Regexp.last_match(1)}/#{Regexp.last_match(2)}/blob/HEAD/#{path}" - else - "#{remote}/#{path}" - end - end - - sig { void } - def run - if args.json == "v1" - puts JSON.pretty_generate(args.named.to_casks.map(&:to_h)) - elsif args.github? - raise CaskUnspecifiedError if args.no_named? - - args.named.to_casks.map do |cask| - exec_browser(github_info(cask)) - end - else - args.named.to_casks.each_with_index do |cask, i| - puts unless i.zero? - odebug "Getting info for Cask #{cask}" - self.class.info(cask) - end - end - end - - def self.get_info(cask) - require "cask/installer" - - output = +"#{title_info(cask)}\n" - output << "#{Formatter.url(cask.homepage)}\n" if cask.homepage - output << installation_info(cask) - repo = repo_info(cask) - output << "#{repo}\n" if repo - output << name_info(cask) - output << desc_info(cask) - language = language_info(cask) - output << language if language - output << "#{artifact_info(cask)}\n" - caveats = Installer.caveats(cask) - output << caveats if caveats - output - end - - def self.info(cask) - puts get_info(cask) - ::Utils::Analytics.cask_output(cask, args: Homebrew::CLI::Args.new) - end - - def self.title_info(cask) - title = "#{oh1_title(cask.token)}: #{cask.version}" - title += " (auto_updates)" if cask.auto_updates - title - end - - def self.formatted_url(url) - "#{Tty.underline}#{url}#{Tty.reset}" - end - - def self.installation_info(cask) - return "Not installed\n" unless cask.installed? - - install_info = +"" - cask.versions.each do |version| - versioned_staged_path = cask.caskroom_path.join(version) - path_details = if versioned_staged_path.exist? - versioned_staged_path.abv - else - Formatter.error("does not exist") - end - install_info << "#{versioned_staged_path} (#{path_details})\n" - end - install_info.freeze - end - - def self.name_info(cask) - <<~EOS - #{ohai_title((cask.name.size > 1) ? "Names" : "Name")} - #{cask.name.empty? ? Formatter.error("None") : cask.name.join("\n")} - EOS - end - - def self.desc_info(cask) - <<~EOS - #{ohai_title("Description")} - #{cask.desc.nil? ? Formatter.error("None") : cask.desc} - EOS - end - - def self.language_info(cask) - return if cask.languages.empty? - - <<~EOS - #{ohai_title("Languages")} - #{cask.languages.join(", ")} - EOS - end - - def self.repo_info(cask) - return if cask.tap.nil? - - url = if cask.tap.custom_remote? && !cask.tap.remote.nil? - cask.tap.remote - else - "#{cask.tap.default_remote}/blob/HEAD/Casks/#{cask.token}.rb" - end - - "From: #{Formatter.url(url)}" - end - - def self.artifact_info(cask) - artifact_output = ohai_title("Artifacts").dup - cask.artifacts.each do |artifact| - next unless artifact.respond_to?(:install_phase) - next unless DSL::ORDINARY_ARTIFACT_CLASSES.include?(artifact.class) - - artifact_output << "\n" << artifact.to_s - end - artifact_output.freeze - end - end - end -end diff --git a/Library/Homebrew/cask/info.rb b/Library/Homebrew/cask/info.rb new file mode 100644 index 0000000000..64434a9e4b --- /dev/null +++ b/Library/Homebrew/cask/info.rb @@ -0,0 +1,105 @@ +# typed: false +# frozen_string_literal: true + +require "json" + +module Cask + # + # @api private + class Info + def self.get_info(cask) + require "cask/installer" + + output = +"#{title_info(cask)}\n" + output << "#{Formatter.url(cask.homepage)}\n" if cask.homepage + output << installation_info(cask) + repo = repo_info(cask) + output << "#{repo}\n" if repo + output << name_info(cask) + output << desc_info(cask) + language = language_info(cask) + output << language if language + output << "#{artifact_info(cask)}\n" + caveats = Installer.caveats(cask) + output << caveats if caveats + output + end + + def self.info(cask) + puts get_info(cask) + ::Utils::Analytics.cask_output(cask, args: Homebrew::CLI::Args.new) + end + + def self.title_info(cask) + title = "#{oh1_title(cask.token)}: #{cask.version}" + title += " (auto_updates)" if cask.auto_updates + title + end + + def self.formatted_url(url) + "#{Tty.underline}#{url}#{Tty.reset}" + end + + def self.installation_info(cask) + return "Not installed\n" unless cask.installed? + + install_info = +"" + cask.versions.each do |version| + versioned_staged_path = cask.caskroom_path.join(version) + path_details = if versioned_staged_path.exist? + versioned_staged_path.abv + else + Formatter.error("does not exist") + end + install_info << "#{versioned_staged_path} (#{path_details})\n" + end + install_info.freeze + end + + def self.name_info(cask) + <<~EOS + #{ohai_title((cask.name.size > 1) ? "Names" : "Name")} + #{cask.name.empty? ? Formatter.error("None") : cask.name.join("\n")} + EOS + end + + def self.desc_info(cask) + <<~EOS + #{ohai_title("Description")} + #{cask.desc.nil? ? Formatter.error("None") : cask.desc} + EOS + end + + def self.language_info(cask) + return if cask.languages.empty? + + <<~EOS + #{ohai_title("Languages")} + #{cask.languages.join(", ")} + EOS + end + + def self.repo_info(cask) + return if cask.tap.nil? + + url = if cask.tap.custom_remote? && !cask.tap.remote.nil? + cask.tap.remote + else + "#{cask.tap.default_remote}/blob/HEAD/Casks/#{cask.token}.rb" + end + + "From: #{Formatter.url(url)}" + end + + def self.artifact_info(cask) + artifact_output = ohai_title("Artifacts").dup + cask.artifacts.each do |artifact| + next unless artifact.respond_to?(:install_phase) + next unless DSL::ORDINARY_ARTIFACT_CLASSES.include?(artifact.class) + + artifact_output << "\n" << artifact.to_s + end + artifact_output.freeze + end + end +end diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb index d1d92be9b2..cbf457aedd 100644 --- a/Library/Homebrew/cmd/info.rb +++ b/Library/Homebrew/cmd/info.rb @@ -373,9 +373,8 @@ module Homebrew end def info_cask(cask, args:) - require "cask/cmd" - require "cask/cmd/info" + require "cask/info" - Cask::Cmd::Info.info(cask) + Cask::Info.info(cask) end end diff --git a/Library/Homebrew/extend/os/mac/missing_formula.rb b/Library/Homebrew/extend/os/mac/missing_formula.rb index 3b294e3663..681747e88b 100644 --- a/Library/Homebrew/extend/os/mac/missing_formula.rb +++ b/Library/Homebrew/extend/os/mac/missing_formula.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true require "cask/cmd/abstract_command" -require "cask/cmd/info" +require "cask/info" require "cask/cask_loader" require "cask/caskroom" @@ -48,7 +48,7 @@ module Homebrew suggestion = <<~EOS Found a cask named "#{name}" instead. - #{Cask::Cmd::Info.get_info(cask)} + #{Cask::Info.get_info(cask)} EOS else return