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

pr-pull: fix style

Browse Source 
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Sean Molenaar 2022-04-04 13:24:05 +02:00 committed by GitHub
parent 54e15cf361
commit 0d8a3d8041
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/dev-cmd/pr-pull.rb
View File

@ -110,11 +110,12 @@ module Homebrew
def get_package(tap, subject_name, subject_path, content) def get_package(tap, subject_name, subject_path, content)
if subject_path.dirname == tap.cask_dir if subject_path.dirname == tap.cask_dir
return begin cask = begin
Cask::CaskLoader.load(content.dup) Cask::CaskLoader.load(content.dup)
rescue Cask::CaskUnavailableError rescue Cask::CaskUnavailableError
nil nil
end end
return cask
end end
begin begin
@ -128,7 +129,8 @@ module Homebrew
subject_path = Pathname(subject_path) subject_path = Pathname(subject_path)
tap = Tap.from_path(subject_path) tap = Tap.from_path(subject_path)
subject_name = subject_path.basename.to_s.chomp(".rb") subject_name = subject_path.basename.to_s.chomp(".rb")
name = subject_path.dirname == tap.cask_dir ? "cask" : "formula" is_cask = subject_path.dirname == tap.cask_dir
name = is_cask ? "cask" : "formula"
new_package = get_package(tap, subject_name, subject_path, new_contents) new_package = get_package(tap, subject_name, subject_path, new_contents)
@ -136,11 +138,11 @@ module Homebrew
old_package = get_package(tap, subject_name, subject_path, old_contents) old_package = get_package(tap, subject_name, subject_path, old_contents)
return "#{subject_name} #{new_package.version} (new #{name})" if old_package.blank? if old_package.blank?
"#{subject_name} #{new_package.version} (new #{name})"
if old_package.version != new_package.version elsif old_package.version != new_package.version
"#{subject_name} #{new_package.version}" "#{subject_name} #{new_package.version}"
elsif old_package.respond_to?(:revision) && old_package.revision != new_package.revision elsif !is_cask && old_package.revision != new_package.revision
"#{subject_name}: revision #{reason}".strip "#{subject_name}: revision #{reason}".strip
else else
"#{subject_name}: #{reason || "rebuild"}".strip "#{subject_name}: #{reason || "rebuild"}".strip
@ -209,7 +211,7 @@ module Homebrew
# Determine the bump subject by comparing the original state of the tree to its current state. # Determine the bump subject by comparing the original state of the tree to its current state.
package_file = Pathname.new(path) / file package_file = Pathname.new(path) / file
old_package = Utils::Git.file_at_commit(path, file, "#{commits.first}^") old_package = Utils::Git.file_at_commit(path, file, "#{commits.first}^")
new_package = File.read(package_file) new_package = package_file.read
bump_subject = determine_bump_subject(old_package, new_package, package_file, reason: reason) bump_subject = determine_bump_subject(old_package, new_package, package_file, reason: reason)
# Commit with the new subject, body, and trailers. # Commit with the new subject, body, and trailers.
@ -234,7 +236,8 @@ module Homebrew
files_to_commits[file] ||= [] files_to_commits[file] ||= []
files_to_commits[file] << commit files_to_commits[file] << commit
tap_file = tap.path/file tap_file = tap.path/file
if (tap_file.dirname == tap.formula_dir || tap_file.dirname == tap.cask_dir) && File.extname(file) == ".rb" if (tap_file.dirname == tap.formula_dir || tap_file.dirname == tap.cask_dir) &&
File.extname(file) == ".rb"
next next
end end