Skip to content

Commit

Permalink
Merge pull request #16244 from abitrolly/depath-create
Browse files Browse the repository at this point in the history
formula_creator: Remove `path` attr to reduce code complexity
  • Loading branch information
MikeMcQuaid committed Nov 23, 2023
2 parents 1b8207b + 4063675 commit 942e77d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Library/Homebrew/dev-cmd/create.rb
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,15 @@ def create_formula(args:)
end
end

fc.generate!
path = fc.write_formula!

formula = Homebrew.with_no_api_env do
Formula[fc.name]
end
PyPI.update_python_resources! formula, ignore_non_pypi_packages: true if args.python?

puts "Please run `brew audit --new #{fc.name}` before submitting, thanks."
fc.path
path
end

def __gets
Expand Down
16 changes: 7 additions & 9 deletions Library/Homebrew/formula_creator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module Homebrew
# @api private
class FormulaCreator
attr_reader :args, :url, :sha256, :desc, :homepage
attr_accessor :name, :version, :tap, :path, :mode, :license
attr_accessor :name, :version, :tap, :mode, :license

def initialize(args)
@args = args
Expand All @@ -34,20 +34,13 @@ def url=(url)
@name = path.basename.to_s[/(.*?)[-_.]?#{Regexp.escape(path.version.to_s)}/, 1]
end
end
update_path
@version = if @version
Version.new(@version)
else
Version.detect(url)
end
end

def update_path
return if @name.nil? || @tap.nil?

@path = @tap.new_formula_path(@name)
end

def fetch?
!args.no_fetch?
end
Expand All @@ -56,7 +49,11 @@ def head?
@head || args.HEAD?
end

def generate!
def write_formula!
raise ArgumentError, "name is blank!" if @name.blank?
raise ArgumentError, "tap is blank!" if @tap.blank?

path = @tap.new_formula_path(@name)
raise "#{path} already exists" if path.exist?

if version.nil? || version.null?
Expand Down Expand Up @@ -86,6 +83,7 @@ def generate!

path.dirname.mkpath
path.write ERB.new(template, trim_mode: ">").result(binding)
path
end

sig { returns(String) }
Expand Down

0 comments on commit 942e77d

Please sign in to comment.