dnrops
/
homebrew-cask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

list/target refactor 

This follows up #2532 and #2392 abstracting out some duplicated
code.  Still not perfect, but better.
This commit is contained in:
Roland Walker 2014-02-12 08:39:11 -05:00
parent 18a92caf57
commit 48accc49c6
3 changed files with 27 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cask/artifact/hardlinked.rb
View File

@ -12,12 +12,8 @@ class Cask::Artifact::Hardlinked < Cask::Artifact::Symlinked
@command.run!('/bin/ln', :args => ['-hf', '--', source, target])
end
def summarize_one_link(artifact_relative_path)
source_string, target_hash = artifact_relative_path
sanity_check source_string, target_hash
source = @cask.destination_path.join(source_string)
target = Cask.send(self.class.artifact_dirmethod).join(target_hash ? target_hash[:target] : source.basename)
linked_path = Cask.send(self.class.artifact_dirmethod).join(Pathname(target).basename)
def summarize_one_link(artifact_spec)
load_specification artifact_spec
if self.class.islink?(linked_path)
printable_linked_path = "'#{linked_path}'"
printable_linked_path.sub!(%r{^'#{ENV['HOME']}/*}, %q{~/'})

69
lib/cask/artifact/symlinked.rb
View File

@ -13,32 +13,39 @@ class Cask::Artifact::Symlinked < Cask::Artifact::Base
def summary
{
:description => "#{self.class.artifact_english_name} #{self.class.link_type_english_name}s managed by brew-cask:",
:english_description => "#{self.class.artifact_english_name} #{self.class.link_type_english_name}s managed by brew-cask:",
:contents => @cask.artifacts[self.class.artifact_dsl_key].map do |artifact|
summarize_one_link(artifact)
end - [nil]
:contents => @cask.artifacts[self.class.artifact_dsl_key].map do |artifact|
summarize_one_link(artifact)
end - [nil]
}
end
def link(artifact_relative_path)
source_string, target_hash = artifact_relative_path
attr_reader :source, :target, :linked_path
sanity_check source_string, target_hash
def load_specification(artifact_spec)
source_string, target_hash = artifact_spec
raise CaskInvalidError if source_string.nil?
@source = @cask.destination_path.join(source_string)
if target_hash
raise CaskInvalidError unless target_hash.respond_to?(:keys)
target_hash.assert_valid_keys(:target)
@target = Cask.send(self.class.artifact_dirmethod).join(target_hash[:target])
else
@target = Cask.send(self.class.artifact_dirmethod).join(source.basename)
end
@linked_path = Cask.send(self.class.artifact_dirmethod).join(Pathname(target).basename)
end
source = @cask.destination_path.join(source_string)
target = Cask.send(self.class.artifact_dirmethod).join(target_hash ? target_hash[:target] : source.basename)
def link(artifact_spec)
load_specification artifact_spec
return unless preflight_checks(source, target)
ohai "#{self.class.link_type_english_name}ing #{self.class.artifact_english_name} '#{source.basename}' to '#{target}'"
create_filesystem_link(source, target)
end
def summarize_one_link(artifact_relative_path)
source_string, target_hash = artifact_relative_path
sanity_check source_string, target_hash
source = @cask.destination_path.join(source_string)
target = Cask.send(self.class.artifact_dirmethod).join(target_hash ? target_hash[:target] : source.basename)
linked_path = Cask.send(self.class.artifact_dirmethod).join(Pathname(target).basename)
def summarize_one_link(artifact_spec)
load_specification artifact_spec
if self.class.islink?(linked_path)
link_description = linked_path.exist? ? '' : "#{Tty.red}Broken Link#{Tty.reset}: "
printable_linked_path = "'#{linked_path}'"
@ -47,14 +54,8 @@ class Cask::Artifact::Symlinked < Cask::Artifact::Base
end
end
def unlink(artifact_relative_path)
source_string, target_hash = artifact_relative_path
sanity_check source_string, target_hash
source = @cask.destination_path.join(source_string)
target = Cask.send(self.class.artifact_dirmethod).join(target_hash ? target_hash[:target] : source.basename)
linked_path = Cask.send(self.class.artifact_dirmethod).join(Pathname(target).basename)
def unlink(artifact_spec)
load_specification artifact_spec
if linked_path.exist? && self.class.islink?(linked_path)
ohai "Removing #{self.class.artifact_english_name} #{self.class.link_type_english_name.downcase}: '#{linked_path}'"
linked_path.delete
@ -79,26 +80,4 @@ class Cask::Artifact::Symlinked < Cask::Artifact::Base
end
true
end
private
def sanity_check source_string, target_hash
if source_string.empty?
raise "Relative path's missing. Running `brew update; brew upgrade brew-cask` will likely fix it.'"
end
if target_hash.nil?
return
end
unless target_hash.respond_to?(:keys)
raise "Unknown arguments. Running `brew update; brew upgrade brew-cask` will likely fix it.'"
end
permitted_keys = [:target]
unknown_keys = target_hash.keys - permitted_keys
unless unknown_keys.empty?
raise "Unknown arguments: :#{unknown_keys.join(", :")} (ignored). Running `brew update; brew upgrade brew-cask` will likely fix it.'"
end
end
end

2
lib/cask/cli/list.rb
View File

@ -33,7 +33,7 @@ class Cask::CLI::List
artifacts = Cask::Artifact.for_cask(cask)
artifacts.each do |artifact|
summary = artifact.new(cask).summary
ohai summary[:description], summary[:contents] unless summary.empty?
ohai summary[:english_description], summary[:contents] unless summary.empty?
end
end