From 4a4a162223f015abd6bb78d0dc268157526686f8 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Sun, 5 Feb 2017 23:27:35 +0100
Subject: [PATCH] Let `Artifact::for_cask` return artifact instances.
---
Library/Homebrew/cask/lib/hbc/artifact.rb | 10 +++++-----
Library/Homebrew/cask/lib/hbc/cli/list.rb | 2 +-
Library/Homebrew/cask/lib/hbc/installer.rb | 14 +++++---------
3 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/Library/Homebrew/cask/lib/hbc/artifact.rb b/Library/Homebrew/cask/lib/hbc/artifact.rb
index 8b4babdf62..49346d7cc0 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact.rb
+++ b/Library/Homebrew/cask/lib/hbc/artifact.rb
@@ -56,12 +56,12 @@ module Hbc
]
end
- def self.for_cask(cask)
+ def self.for_cask(cask, command: SystemCommand, force: false)
odebug "Determining which artifacts are present in Cask #{cask}"
- artifacts.select do |artifact|
- odebug "Checking for artifact class #{artifact}"
- artifact.me?(cask)
- end
+
+ artifacts
+ .select { |klass| klass.me?(cask) }
+ .map { |klass| klass.new(cask, command: command, force: force) }
end
end
end
diff --git a/Library/Homebrew/cask/lib/hbc/cli/list.rb b/Library/Homebrew/cask/lib/hbc/cli/list.rb
index 4094b3d38c..e100fbd833 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/list.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/list.rb
@@ -55,7 +55,7 @@ module Hbc
def self.list_artifacts(cask)
Artifact.for_cask(cask).each do |artifact|
- summary = artifact.new(cask).summary
+ summary = artifact.summary
ohai summary[:english_description], summary[:contents] unless summary.empty?
end
end
diff --git a/Library/Homebrew/cask/lib/hbc/installer.rb b/Library/Homebrew/cask/lib/hbc/installer.rb
index 28f67e5fd0..776a3acd28 100644
--- a/Library/Homebrew/cask/lib/hbc/installer.rb
+++ b/Library/Homebrew/cask/lib/hbc/installer.rb
@@ -133,16 +133,14 @@ module Hbc
def install_artifacts
already_installed_artifacts = []
- options = { command: @command, force: force }
odebug "Installing artifacts"
- artifacts = Artifact.for_cask(@cask)
+ artifacts = Artifact.for_cask(@cask, command: @command, force: force)
odebug "#{artifacts.length} artifact/s defined", artifacts
artifacts.each do |artifact|
- artifact = artifact.new(@cask, options)
next unless artifact.respond_to?(:install_phase)
- odebug "Installing artifact of class #{artifact}"
+ odebug "Installing artifact of class #{artifact.class}"
artifact.install_phase
already_installed_artifacts.unshift(artifact)
end
@@ -150,7 +148,7 @@ module Hbc
begin
already_installed_artifacts.each do |artifact|
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
end
ensure
@@ -319,13 +317,11 @@ module Hbc
def uninstall_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
artifacts.each do |artifact|
- options = { command: @command, force: force }
- artifact = artifact.new(@cask, options)
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
end
end
--
GitLab