Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust brew cask doctor for homebrew-fork #8221

Merged
merged 4 commits into from
Dec 18, 2014
Merged

Adjust brew cask doctor for homebrew-fork #8221

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df8835a
doctor: ignore internal HOMEBREW_REPOSITORY const
rolandwalker Dec 18, 2014
58c2f16
doctor: ignore internal HOMEBREW_CELLAR constant
rolandwalker Dec 18, 2014
b1c3a4f
doctor: ignore internal HOMEBREW_VERSION constant
rolandwalker Dec 18, 2014
d76794c
make `render_load_path` understand homebrew-fork
rolandwalker Dec 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 53 additions & 11 deletions lib/cask/cli/doctor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ def self.run
ohai "Hardware Architecture:", render_with_none_as_error( "#{Hardware::CPU.type}-#{Hardware::CPU.bits}" )
ohai 'Ruby Version:', render_with_none_as_error( "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}" )
ohai 'Ruby Path:', render_with_none_as_error( RUBY_PATH )
ohai 'Homebrew Version:', render_with_none_as_error( HOMEBREW_VERSION )
# todo: consider removing most Homebrew constants from doctor output
ohai 'Homebrew Version:', render_with_none_as_error( homebrew_version )
ohai 'Homebrew Executable Path:', render_with_none_as_error( HOMEBREW_BREW_FILE )
ohai 'Homebrew Cellar Path:', render_with_none_as_error( HOMEBREW_CELLAR )
ohai 'Homebrew Repository Path:', render_with_none_as_error( HOMEBREW_REPOSITORY )
ohai 'Homebrew Cellar Path:', render_with_none_as_error( homebrew_cellar )
ohai 'Homebrew Repository Path:', render_with_none_as_error( homebrew_repository )
ohai 'Homebrew Origin:', render_with_none_as_error( homebrew_origin )
ohai 'Homebrew-cask Version:', render_with_none_as_error( HOMEBREW_CASK_VERSION )
ohai 'Homebrew-cask Install Location:', render_install_location( HOMEBREW_CASK_VERSION )
Expand Down Expand Up @@ -35,15 +36,15 @@ def self.fq_default_tap
return @fq_default_tap if @fq_default_tap
@fq_default_tap = notfound_string
begin
@fq_default_tap = HOMEBREW_REPOSITORY.join 'Library', 'Taps', Cask.default_tap
@fq_default_tap = homebrew_repository.join 'Library', 'Taps', Cask.default_tap
rescue StandardError; end
@fq_default_tap
end

def self.alt_taps
alt_taps = notfound_string
begin
alt_taps = Pathname.glob(HOMEBREW_REPOSITORY.join 'Library', 'Taps', '*', '*', 'Casks').map(&:dirname) -
alt_taps = Pathname.glob(homebrew_repository.join 'Library', 'Taps', '*', '*', 'Casks').map(&:dirname) -
[fq_default_tap]
alt_taps = nil unless alt_taps.length > 0
rescue StandardError; end
Expand All @@ -53,7 +54,7 @@ def self.alt_taps
def self.default_cask_count
default_cask_count = notfound_string
begin
default_cask_count = HOMEBREW_REPOSITORY.join(fq_default_tap, 'Casks').children.count(&:file?)
default_cask_count = homebrew_repository.join(fq_default_tap, 'Casks').children.count(&:file?)
rescue StandardError
default_cask_count = "0 #{error_string %Q{Error reading #{fq_default_tap}}}"
end
Expand All @@ -63,7 +64,7 @@ def self.default_cask_count
def self.homebrew_origin
homebrew_origin = notfound_string
begin
HOMEBREW_REPOSITORY.cd do
homebrew_repository.cd do
homebrew_origin = Cask::SystemCommand.run('git',
:args => %w{config --get remote.origin.url},
:print_stderr => false).stdout.strip
Expand All @@ -79,6 +80,43 @@ def self.homebrew_origin
homebrew_origin
end

def self.homebrew_repository
homebrew_constants('repository')
end

def self.homebrew_cellar
homebrew_constants('cellar')
end

def self.homebrew_version
homebrew_constants('version')
end

def self.homebrew_libdir
@homebrew_libdir ||= if homebrew_repository.respond_to?(:join)
homebrew_repository.join('Library', 'Homebrew')
end
end

def self.homebrew_constants(name)
@homebrew_constants ||= {}
return @homebrew_constants[name] if @homebrew_constants.key?(name)
@homebrew_constants[name] = notfound_string
begin
@homebrew_constants[name] = Cask::SystemCommand.run!(HOMEBREW_BREW_FILE,
:args => [ "--#{name}" ],
:print_stderr => false).stdout.strip
if @homebrew_constants[name] !~ %r{\S}
@homebrew_constants[name] = "#{none_string} #{error_string}"
end
path = Pathname.new(@homebrew_constants[name])
@homebrew_constants[name] = path if path.exist?
rescue StandardError
@homebrew_constants[name] = error_string 'Not Found - Error running brew'
end
@homebrew_constants[name]
end

def self.locale_variables
ENV.keys.grep(/^(?:LC_\S+|LANG|LANGUAGE)\Z/).collect { |v| %Q{#{v}="#{ENV[v]}"} }.sort.join("\n")
end
Expand Down Expand Up @@ -144,7 +182,7 @@ def self.render_env_var(var)
# where "doctor" is needed is precisely the situation where such
# things are less dependable.
def self.render_install_location(current_version)
locations = Dir.glob(HOMEBREW_CELLAR.join('brew-cask', '*')).reverse
locations = Dir.glob(homebrew_cellar.join('brew-cask', '*')).reverse
locations.each do |l|
basename = File.basename l
l.concat %Q{ #{error_string %Q{error: old version. Run "brew cleanup".}}} unless basename == current_version
Expand All @@ -167,10 +205,14 @@ def self.render_load_path(paths)
return "#{none_string} #{error_string}"
end
copy = Array.new(paths)
unless Cask::Utils.file_is_descendant(copy[0], HOMEBREW_CELLAR)
copy[0] = "#{copy[0]} #{error_string %Q{error: should be descendant of HOMEBREW_CELLAR}}"
unless Cask::Utils.file_is_descendant(copy[0], homebrew_cellar)
copy[0] = "#{copy[0]} #{error_string %Q{error: should be descendant of Homebrew Cellar}}"
end
copy.map! do |elt|
elt = (homebrew_libdir and Cask::Utils.file_is_descendant(elt, homebrew_libdir)) ?
"#{elt} #{error_string %Q{error: should not be descendant of Homebrew Library dir}}" :
elt
end
copy
end

def self.render_cached_downloads
Expand Down