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

Remove unnecessary Hbc::Locations aliases.

Browse Source
This commit is contained in:
Markus Reiter 2016-11-10 14:48:53 +01:00
parent 0f673cc27f
commit 8dd8273d5e
8 changed files with 17 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cask/Rakefile
View File

@ -1,8 +1,7 @@
require "rake/testtask"
require "rspec/core/rake_task"
homebrew_repo = `brew --repository`.chomp
$LOAD_PATH.unshift(File.expand_path("#{homebrew_repo}/Library/Homebrew"))
$LOAD_PATH.unshift(File.expand_path("#{ENV["HOMEBREW_REPOSITORY"]}/Library/Homebrew"))
$LOAD_PATH.unshift(File.expand_path("../lib", __FILE__))
namespace :test do

2
Library/Homebrew/cask/lib/hbc/caskroom.rb
View File

@ -3,7 +3,7 @@ module Hbc
module_function
def migrate_caskroom_from_repo_to_prefix
repo_caskroom = Hbc.homebrew_repository.join("Caskroom")
repo_caskroom = HOMEBREW_REPOSITORY.join("Caskroom")
return if Hbc.caskroom.exist?
return unless repo_caskroom.directory?

16
Library/Homebrew/cask/lib/hbc/cli/doctor.rb
View File

@ -8,9 +8,9 @@ module Hbc
ohai "Ruby Path:", render_with_none_as_error(RbConfig.ruby)
# 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(Hbc.homebrew_executable)
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 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(Hbc.full_version)
ohai "Homebrew-Cask Install Location:", render_install_location
@ -48,7 +48,7 @@ module Hbc
def self.homebrew_origin
homebrew_origin = notfound_string
begin
Dir.chdir(homebrew_repository) do
Dir.chdir(HOMEBREW_REPOSITORY) do
homebrew_origin = SystemCommand.run("/usr/bin/git",
args: %w[config --get remote.origin.url],
print_stderr: false).stdout.strip
@ -64,10 +64,6 @@ module Hbc
homebrew_origin
end
def self.homebrew_repository
homebrew_constants("repository")
end
def self.homebrew_cellar
homebrew_constants("cellar")
end
@ -77,9 +73,7 @@ module Hbc
end
def self.homebrew_taps
@homebrew_taps ||= if homebrew_repository.respond_to?(:join)
homebrew_repository.join("Library", "Taps")
end
Tap::TAP_DIRECTORY
end
def self.homebrew_constants(name)
@ -87,7 +81,7 @@ module Hbc
return @homebrew_constants[name] if @homebrew_constants.key?(name)
@homebrew_constants[name] = notfound_string
begin
@homebrew_constants[name] = SystemCommand.run!(Hbc.homebrew_executable,
@homebrew_constants[name] = SystemCommand.run!(HOMEBREW_BREW_FILE,
args: ["--#{name}"],
print_stderr: false)
.stdout

4
Library/Homebrew/cask/lib/hbc/cli/update.rb
View File

@ -2,8 +2,8 @@ module Hbc
class CLI
class Update < Base
def self.run(*_ignored)
result = SystemCommand.run(Hbc.homebrew_executable,
args: %w[update])
result = SystemCommand.run(HOMEBREW_BREW_FILE,
args: ["update"])
# TODO: separating stderr/stdout is undesirable here.
# Hbc::SystemCommand should have an option for plain
# unbuffered output.

2
Library/Homebrew/cask/lib/hbc/dsl/caveats.rb
View File

@ -31,7 +31,7 @@ module Hbc
def files_in_usr_local
localpath = "/usr/local"
return unless Hbc.homebrew_prefix.to_s.downcase.start_with?(localpath)
return unless HOMEBREW_PREFIX.to_s.downcase.start_with?(localpath)
puts <<-EOS.undent
Cask #{@cask} installs files under "#{localpath}". The presence of such
files can cause warnings when running "brew doctor", which is considered

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

@ -188,13 +188,13 @@ module Hbc
ohai "Installing Formula dependencies from Homebrew"
@cask.depends_on.formula.each do |dep_name|
print "#{dep_name} ... "
installed = @command.run(Hbc.homebrew_executable,
installed = @command.run(HOMEBREW_BREW_FILE,
args: ["list", "--versions", dep_name],
print_stderr: false).stdout.include?(dep_name)
if installed
puts "already installed"
else
@command.run!(Hbc.homebrew_executable,
@command.run!(HOMEBREW_BREW_FILE,
args: ["install", dep_name])
puts "done"
end

38
Library/Homebrew/cask/lib/hbc/locations.rb
View File

@ -10,7 +10,7 @@ module Hbc
end
def default_caskroom
@default_caskroom ||= homebrew_prefix.join("Caskroom")
@default_caskroom ||= HOMEBREW_PREFIX.join("Caskroom")
end
def caskroom
@ -39,11 +39,11 @@ module Hbc
end
def legacy_cache
@legacy_cache ||= homebrew_cache.join("Casks")
@legacy_cache ||= HOMEBREW_CACHE.join("Casks")
end
def cache
@cache ||= homebrew_cache.join("Cask")
@cache ||= HOMEBREW_CACHE.join("Cask")
end
attr_writer :appdir
@ -91,7 +91,7 @@ module Hbc
attr_writer :binarydir
def binarydir
@binarydir ||= homebrew_prefix.join("bin")
@binarydir ||= HOMEBREW_PREFIX.join("bin")
end
attr_writer :input_methoddir
@ -179,36 +179,6 @@ module Hbc
def x11_libpng
@x11_libpng ||= [Pathname.new("/opt/X11/lib/libpng.dylib"), Pathname.new("/usr/X11/lib/libpng.dylib")]
end
def homebrew_cache
@homebrew_cache ||= HOMEBREW_CACHE
end
def homebrew_cache=(path)
@homebrew_cache = path ? Pathname.new(path) : path
end
def homebrew_executable
@homebrew_executable ||= HOMEBREW_BREW_FILE
end
def homebrew_prefix
# where Homebrew links
@homebrew_prefix ||= HOMEBREW_PREFIX
end
def homebrew_prefix=(path)
@homebrew_prefix = path ? Pathname.new(path) : path
end
def homebrew_repository
# where Homebrew's .git dir is found
@homebrew_repository ||= HOMEBREW_REPOSITORY
end
def homebrew_repository=(path)
@homebrew_repository = path ? Pathname.new(path) : path
end
end
end
end

2
Library/Homebrew/cask/test/support/fake_dirs.rb
View File

@ -8,7 +8,7 @@ module FakeDirHooks
@canned_dirs = {}
DIRS.each do |dir_name|
dir = Hbc.homebrew_prefix.join("#{dir_name}-#{Time.now.to_i}-#{rand(1024)}")
dir = HOMEBREW_PREFIX.join("#{dir_name}-#{Time.now.to_i}-#{rand(1024)}")
dir.mkpath
Hbc.send("#{dir_name}=", dir)
@canned_dirs[:dir_name] = dir