mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix code review requests

Browse Source
This commit is contained in:
Caleb Xu 2018-08-20 09:20:45 -04:00
parent 260867627b
commit 713aedb6ed
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Library/Homebrew/dev-cmd/extract.rb
View File

@ -16,37 +16,21 @@ require "formulary"
require "tap" require "tap"
class BottleSpecification class BottleSpecification
def method_missing(m, *_args, &_block) def method_missing(*)
# no-op
end end
end end
class Module class Module
def method_missing(m, *_args, &_block) def method_missing(*)
# no-op
end end
end end
class DependencyCollector class DependencyCollector
def parse_symbol_spec(spec, tags) def parse_symbol_spec(spec, tags)
case spec
when :x11 then X11Requirement.new(spec.to_s, tags)
when :xcode then XcodeRequirement.new(tags)
when :linux then LinuxRequirement.new(tags)
when :macos then MacOSRequirement.new(tags)
when :arch then ArchRequirement.new(tags)
when :java then JavaRequirement.new(tags)
when :osxfuse then OsxfuseRequirement.new(tags)
when :tuntap then TuntapRequirement.new(tags)
when :ld64 then ld64_dep_if_needed(tags)
else
# no-op
end
end end
module Compat module Compat
def parse_string_spec(spec, tags) def parse_string_spec(spec, tags)
opoo "'depends_on ... => :run' is disabled. There is no replacement." if tags.include?(:run) && ARGV.debug?
super super
end end
end end
@ -71,10 +55,12 @@ module Homebrew
odie "Cannot extract formula to homebrew/core!" if destination_tap.core_tap? odie "Cannot extract formula to homebrew/core!" if destination_tap.core_tap?
destination_tap.install unless destination_tap.installed? destination_tap.install unless destination_tap.installed?
core = CoreTap.instance
name = ARGV.named.first.downcase name = ARGV.named.first.downcase
repo = core.path repo = CoreTap.instance.path
file = core.path/"Formula/#{name}.rb" # Formulae can technically live in "<repo>/<formula>.rb" or
# "<repo>/Formula/<formula>.rb", but explicitly use the latter for now
# since that is now core tap is structured.
file = repo/"Formula/#{name}.rb"
if args.version if args.version
version = args.version version = args.version
@ -100,7 +86,8 @@ module Homebrew
result = Git.last_revision_of_file(repo, file) result = Git.last_revision_of_file(repo, file)
end end
# The class name has to be renamed to match the new filename, e.g. Foo version 1.2.3 becomes FooAT123 and resides in Foo@1.2.3.rb. # The class name has to be renamed to match the new filename,
# e.g. Foo version 1.2.3 becomes FooAT123 and resides in Foo@1.2.3.rb.
class_name = name.capitalize class_name = name.capitalize
versioned_name = Formulary.class_s("#{class_name}@#{version}") versioned_name = Formulary.class_s("#{class_name}@#{version}")
result.gsub!("class #{class_name} < Formula", "class #{versioned_name} < Formula") result.gsub!("class #{class_name} < Formula", "class #{versioned_name} < Formula")