admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Let Artifact::for_cask return artifact instances.

Browse Source
This commit is contained in:
Markus Reiter 2017-02-05 23:27:35 +01:00
parent e18a174607
commit 4a4a162223
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/cask/lib/hbc/artifact.rb
View File

@ -56,12 +56,12 @@ module Hbc
] ]
end end
def self.for_cask(cask) def self.for_cask(cask, command: SystemCommand, force: false)
odebug "Determining which artifacts are present in Cask #{cask}" odebug "Determining which artifacts are present in Cask #{cask}"
artifacts.select do |artifact|
odebug "Checking for artifact class #{artifact}" artifacts
artifact.me?(cask) .select { |klass| klass.me?(cask) }
end .map { |klass| klass.new(cask, command: command, force: force) }
end end
end end
end end

2
Library/Homebrew/cask/lib/hbc/cli/list.rb
View File

@ -55,7 +55,7 @@ module Hbc
def self.list_artifacts(cask) def self.list_artifacts(cask)
Artifact.for_cask(cask).each do |artifact| Artifact.for_cask(cask).each do |artifact|
summary = artifact.new(cask).summary summary = artifact.summary
ohai summary[:english_description], summary[:contents] unless summary.empty? ohai summary[:english_description], summary[:contents] unless summary.empty?
end end
end end

14
Library/Homebrew/cask/lib/hbc/installer.rb
View File

@ -133,16 +133,14 @@ module Hbc
def install_artifacts def install_artifacts
already_installed_artifacts = [] already_installed_artifacts = []
options = { command: @command, force: force }
odebug "Installing artifacts" odebug "Installing artifacts"
artifacts = Artifact.for_cask(@cask) artifacts = Artifact.for_cask(@cask, command: @command, force: force)
odebug "#{artifacts.length} artifact/s defined", artifacts odebug "#{artifacts.length} artifact/s defined", artifacts
artifacts.each do |artifact| artifacts.each do |artifact|
artifact = artifact.new(@cask, options)
next unless artifact.respond_to?(:install_phase) next unless artifact.respond_to?(:install_phase)
odebug "Installing artifact of class #{artifact}" odebug "Installing artifact of class #{artifact.class}"
artifact.install_phase artifact.install_phase
already_installed_artifacts.unshift(artifact) already_installed_artifacts.unshift(artifact)
end end
@ -150,7 +148,7 @@ module Hbc
begin begin
already_installed_artifacts.each do |artifact| already_installed_artifacts.each do |artifact|
next unless artifact.respond_to?(:uninstall_phase) next unless artifact.respond_to?(:uninstall_phase)
odebug "Reverting installation of artifact of class #{artifact}" odebug "Reverting installation of artifact of class #{artifact.class}"
artifact.uninstall_phase artifact.uninstall_phase
end end
ensure ensure
@ -319,13 +317,11 @@ module Hbc
def uninstall_artifacts def uninstall_artifacts
odebug "Un-installing artifacts" odebug "Un-installing artifacts"
artifacts = Artifact.for_cask(@cask) artifacts = Artifact.for_cask(@cask, command: @command, force: force)
odebug "#{artifacts.length} artifact/s defined", artifacts odebug "#{artifacts.length} artifact/s defined", artifacts
artifacts.each do |artifact| artifacts.each do |artifact|
options = { command: @command, force: force }
artifact = artifact.new(@cask, options)
next unless artifact.respond_to?(:uninstall_phase) next unless artifact.respond_to?(:uninstall_phase)
odebug "Un-installing artifact of class #{artifact}" odebug "Un-installing artifact of class #{artifact.class}"
artifact.uninstall_phase artifact.uninstall_phase
end end
end end