language stringclasses 1
value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2
classes |
|---|---|---|---|---|---|---|---|
Other | Homebrew | brew | 06d91520981df7950fcc44dc1f3af31cd8a68bbc.json | bump-formula-pr: check duplicate PRs as early as possible | Library/Homebrew/dev-cmd/bump-formula-pr.rb | @@ -127,6 +127,10 @@ def bump_formula_pr
raise FormulaUnspecifiedError unless formula
tap_full_name, origin_branch, previous_branch = use_correct_linux_tap(formula)
+ check_open_pull_requests(formula, tap_full_name)
+
+ new_version = args.version
+ check_all_pull_requests(formula, tap_full_name, version: new_version) if new_version
requested_spec, formula_spec = if args.devel?
devel_message = " (devel)"
@@ -155,15 +159,16 @@ def bump_formula_pr
new_url.sub "mirrors.ocf.berkeley.edu/debian", "mirrorservice.org/sites/ftp.debian.org/debian"
end
new_mirrors ||= [new_mirror] unless new_mirror.nil?
- new_version = args.version
old_url = formula_spec.url
old_tag = formula_spec.specs[:tag]
old_formula_version = formula_version(formula, requested_spec)
old_version = old_formula_version.to_s
- forced_version = false
+ forced_version = new_version.present?
new_url_hash = if new_url && new_hash
+ check_all_pull_requests(formula, tap_full_name, url: new_url) unless new_version
true
elsif new_tag && new_revision
+ check_all_pull_requests(formula, tap_full_name, url: old_url, tag: new_tag) unless new_version
false
elsif !hash_type
odie "#{formula}: no --tag= or --version= argument specified!" if !new_tag && !new_version
@@ -174,6 +179,7 @@ def bump_formula_pr
and old tag are both #{new_tag}.
EOS
end
+ check_all_pull_requests(formula, tap_full_name, url: old_url, tag: new_tag) unless new_version
resource_path, forced_version = fetch_resource(formula, new_version, old_url, tag: new_tag)
new_revision = Utils.popen_read("git -C \"#{resource_path}\" rev-parse -q --verify HEAD")
new_revision = new_revision.strip
@@ -189,6 +195,7 @@ def bump_formula_pr
#{new_url}
EOS
end
+ check_all_pull_requests(formula, tap_full_name, url: new_url) unless new_version
resource_path, forced_version = fetch_resource(formula, new_version, new_url)
tar_file_extensions = %w[.tar .tb2 .tbz .tbz2 .tgz .tlz .txz .tZ]
if tar_file_extensions.any? { |extension| new_url.include? extension }
@@ -244,7 +251,7 @@ def bump_formula_pr
]
end
- backup_file = File.read(formula.path) unless args.dry_run?
+ old_contents = File.read(formula.path) unless args.dry_run?
if new_mirrors
replacement_pairs << [
@@ -307,8 +314,6 @@ def bump_formula_pr
new_formula_version = formula_version(formula, requested_spec, new_contents)
- check_for_duplicate_pull_requests(formula, backup_file, tap_full_name, new_formula_version.to_s)
-
if !new_mirrors && !formula_spec.mirrors.empty?
if args.force?
opoo "#{formula}: Removing all mirrors because a --mirror= argument was not specified."
@@ -321,13 +326,13 @@ def bump_formula_pr
end
if new_formula_version < old_formula_version
- formula.path.atomic_write(backup_file) unless args.dry_run?
+ formula.path.atomic_write(old_contents) unless args.dry_run?
odie <<~EOS
You probably need to bump this formula manually since changing the
version from #{old_formula_version} to #{new_formula_version} would be a downgrade.
EOS
elsif new_formula_version == old_formula_version
- formula.path.atomic_write(backup_file) unless args.dry_run?
+ formula.path.atomic_write(old_contents) unless args.dry_run?
odie <<~EOS
You probably need to bump this formula manually since the new version
and old version are both #{new_formula_version}.
@@ -340,7 +345,7 @@ def bump_formula_pr
alias_rename.map! { |a| formula.tap.alias_dir/a }
end
- run_audit(formula, alias_rename, backup_file)
+ run_audit(formula, alias_rename, old_contents)
formula.path.parent.cd do
branch = "#{formula.name}-#{new_formula_version}"
@@ -365,7 +370,7 @@ def bump_formula_pr
remote_url = Utils.popen_read("git remote get-url --push origin").chomp
username = formula.tap.user
else
- remote_url, username = forked_repo_info(formula, tap_full_name, backup_file)
+ remote_url, username = forked_repo_info(formula, tap_full_name, old_contents)
end
safe_system "git", "fetch", "--unshallow", "origin" if shallow
@@ -438,10 +443,10 @@ def fetch_resource(formula, new_version, url, **specs)
[resource.fetch, forced_version]
end
- def forked_repo_info(formula, tap_full_name, backup_file)
+ def forked_repo_info(formula, tap_full_name, old_contents)
response = GitHub.create_fork(tap_full_name)
rescue GitHub::AuthenticationFailedError, *GitHub.api_errors => e
- formula.path.atomic_write(backup_file)
+ formula.path.atomic_write(old_contents)
odie "Unable to fork: #{e.message}!"
else
# GitHub API responds immediately but fork takes a few seconds to be ready.
@@ -506,12 +511,20 @@ def fetch_pull_requests(query, tap_full_name, state: nil)
[]
end
- def check_for_duplicate_pull_requests(formula, backup_file, tap_full_name, version)
+ def check_open_pull_requests(formula, tap_full_name)
# check for open requests
pull_requests = fetch_pull_requests(formula.name, tap_full_name, state: "open")
+ check_for_duplicate_pull_requests(pull_requests)
+ end
+ def check_all_pull_requests(formula, tap_full_name, version: nil, url: nil, tag: nil)
+ version ||= Version.detect(url, tag ? { tag: tag } : {})
# if we haven't already found open requests, try for an exact match across all requests
pull_requests = fetch_pull_requests("#{formula.name} #{version}", tap_full_name) if pull_requests.blank?
+ check_for_duplicate_pull_requests(pull_requests)
+ end
+
+ def check_for_duplicate_pull_requests(pull_requests)
return if pull_requests.blank?
duplicates_message = <<~EOS
@@ -522,10 +535,8 @@ def check_for_duplicate_pull_requests(formula, backup_file, tap_full_name, versi
if args.force? && !args.quiet?
opoo duplicates_message
elsif !args.force? && args.quiet?
- formula.path.atomic_write(backup_file) unless args.dry_run?
odie error_message
elsif !args.force?
- formula.path.atomic_write(backup_file) unless args.dry_run?
odie <<~EOS
#{duplicates_message.chomp}
#{error_message}
@@ -545,7 +556,7 @@ def alias_update_pair(formula, new_formula_version)
[versioned_alias, "#{name}@#{new_alias_version}"]
end
- def run_audit(formula, alias_rename, backup_file)
+ def run_audit(formula, alias_rename, old_contents)
if args.dry_run?
if args.no_audit?
ohai "Skipping `brew audit`"
@@ -569,7 +580,7 @@ def run_audit(formula, alias_rename, backup_file)
end
return unless failed_audit
- formula.path.atomic_write(backup_file)
+ formula.path.atomic_write(old_contents)
FileUtils.mv alias_rename.last, alias_rename.first if alias_rename.present?
odie "`brew audit` failed!"
end | false |
Other | Homebrew | brew | a2bd24efa78bf794c060af6c962683da67994841.json | sorbet: set multiple files to true
Set the following files to true in sorbet/files.yaml:
- ./cleaner.rb
- ./compilers.rb
- ./dependency_collector.rb
- ./description_cache_store.rb
- ./descriptions.rb
- ./env_config.rb | Library/Homebrew/sorbet/files.yaml | @@ -81,7 +81,6 @@ false:
- ./cask/utils.rb
- ./cask/verify.rb
- ./caveats.rb
- - ./cleaner.rb
- ./cleanup.rb
- ./cli/args.rb
- ./cli/parser.rb
@@ -129,15 +128,11 @@ false:
- ./cmd/uses.rb
- ./commands.rb
- ./compat/language/python.rb
- - ./compilers.rb
- ./cxxstdlib.rb
- ./debrew.rb
- ./debrew/irb.rb
- ./dependencies.rb
- ./dependency.rb
- - ./dependency_collector.rb
- - ./description_cache_store.rb
- - ./descriptions.rb
- ./dev-cmd/audit.rb
- ./dev-cmd/bottle.rb
- ./dev-cmd/bump-formula-pr.rb
@@ -175,7 +170,6 @@ false:
- ./development_tools.rb
- ./diagnostic.rb
- ./download_strategy.rb
- - ./env_config.rb
- ./exceptions.rb
- ./extend/ENV.rb
- ./extend/ENV/shared.rb
@@ -858,7 +852,13 @@ true:
- ./cask/macos.rb
- ./cask/url.rb
- ./checksum.rb
+ - ./cleaner.rb
+ - ./compilers.rb
- ./config.rb
+ - ./dependency_collector.rb
+ - ./description_cache_store.rb
+ - ./descriptions.rb
+ - ./env_config.rb
- ./extend/cachable.rb
- ./extend/os/linux/development_tools.rb
- ./extend/os/linux/formula.rb | false |
Other | Homebrew | brew | 03857319c97d596630c8b27a3b6868a9b1029d83.json | outdated: Update documentation about json versions | Library/Homebrew/cmd/outdated.rb | @@ -22,11 +22,9 @@ def outdated_args
switch :verbose,
description: "Include detailed version information."
flag "--json",
- description: "Print output in JSON format. Currently the default and only accepted "\
- "value for <version> is `v1`. See the docs for examples of using the JSON "\
- "output: <https://docs.brew.sh/Querying-Brew>. "\
- "By default, this option treats all arguments as formulae. "\
- "To treat arguments as casks, use the --cask option."
+ description: "Print output in JSON format. There are two versions: v1 and v2. " \
+ "v1 is deprecated and is currently the default if no version is specified. " \
+ "v2 prints outdated formulae and casks. "
switch "--fetch-HEAD",
description: "Fetch the upstream repository to detect if the HEAD installation of the "\
"formula is outdated. Otherwise, the repository's HEAD will only be checked for "\
@@ -48,6 +46,8 @@ def outdated
case json_version
when :v1
+ opoo "JSON v1 has been deprecated. Please use --json=v2"
+
outdated = if args.formula? || !args.cask?
outdated_formulae
else | true |
Other | Homebrew | brew | 03857319c97d596630c8b27a3b6868a9b1029d83.json | outdated: Update documentation about json versions | docs/Manpage.md | @@ -356,7 +356,7 @@ otherwise.
* `-v`, `--verbose`:
Include detailed version information.
* `--json`:
- Print output in JSON format. Currently the default and only accepted value for *`version`* is `v1`. See the docs for examples of using the JSON output: <https://docs.brew.sh/Querying-Brew>. By default, this option treats all arguments as formulae. To treat arguments as casks, use the --cask option.
+ Print output in JSON format. There are two versions: v1 and v2. v1 is deprecated and is currently the default if no version is specified. v2 prints outdated formulae and casks.
* `--fetch-HEAD`:
Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository's HEAD will only be checked for updates when a new stable or development version has been released.
* `--greedy`: | true |
Other | Homebrew | brew | 03857319c97d596630c8b27a3b6868a9b1029d83.json | outdated: Update documentation about json versions | manpages/brew.1 | @@ -477,7 +477,7 @@ Include detailed version information\.
.
.TP
\fB\-\-json\fR
-Print output in JSON format\. Currently the default and only accepted value for \fIversion\fR is \fBv1\fR\. See the docs for examples of using the JSON output: \fIhttps://docs\.brew\.sh/Querying\-Brew\fR\. By default, this option treats all arguments as formulae\. To treat arguments as casks, use the \-\-cask option\.
+Print output in JSON format\. There are two versions: v1 and v2\. v1 is deprecated and is currently the default if no version is specified\. v2 prints outdated formulae and casks\.
.
.TP
\fB\-\-fetch\-HEAD\fR | true |
Other | Homebrew | brew | 8c5140f6e6dddcd979ad7c388252199796e4917a.json | outdated: Implement json v2 | Library/Homebrew/cmd/outdated.rb | @@ -46,47 +46,55 @@ def outdated_args
def outdated
outdated_args.parse
- formula_only = args.formula?
- if args.json
- raise UsageError, "invalid JSON version: #{args.json}" unless ["v1", true].include? args.json
+ case json_version
+ when :v1
+ outdated = if args.formula? || !args.cask?
+ outdated_formulae
+ else
+ outdated_casks
+ end
- # When user asks for json, print json for formula only unless the user explicitly asks for casks
- formula_only = !args.cask?
- end
+ puts JSON.generate(json_info(outdated))
+
+ when :v2
+ formulae, casks = if args.formula?
+ [outdated_formulae, []]
+ elsif args.cask?
+ [[], outdated_casks]
+ else
+ outdated_formulae_casks
+ end
- outdated = if formula_only
- formulae = args.resolved_formulae.presence || Formula.installed
+ puts JSON.generate({
+ "formulae" => json_info(formulae),
+ "casks" => json_info(casks),
+ })
- print_outdated_formulae(formulae)
- elsif args.cask?
- casks = args.named.presence || Cask::Caskroom.casks.presence
+ outdated = formulae + casks
- print_outdated_casks(casks)
else
- formulae, casks = args.resolved_formulae_casks
-
- if formulae.blank? && casks.blank?
- formulae = Formula.installed
- casks = Cask::Caskroom.casks
+ outdated = if args.formula?
+ outdated_formulae
+ elsif args.cask?
+ outdated_casks
+ else
+ outdated_formulae_casks.flatten
end
- print_outdated_formulae(formulae) + print_outdated_casks(casks)
+ print_outdated(outdated)
end
Homebrew.failed = args.named.present? && outdated.present?
end
- def print_outdated_formulae(formulae)
- return print_outdated_formulae_json(formulae) if args.json
+ def print_outdated(formula_or_cask)
+ return formula_or_cask.each { |f_or_c| print_outdated(f_or_c) } if formula_or_cask.is_a? Array
- fetch_head = args.fetch_HEAD?
+ if formula_or_cask.is_a?(Formula)
+ f = formula_or_cask
- outdated_formulae = formulae.select { |f| f.outdated?(fetch_head: fetch_head) }
- .sort
-
- outdated_formulae.each do |f|
if verbose?
- outdated_kegs = f.outdated_kegs(fetch_head: fetch_head)
+ outdated_kegs = f.outdated_kegs(fetch_head: args.fetch_HEAD?)
current_version = if f.alias_changed?
latest = f.latest_formula
@@ -111,46 +119,79 @@ def print_outdated_formulae(formulae)
else
puts f.full_installed_specified_name
end
+ else
+ c = formula_or_cask
+
+ puts c.outdated_info(args.greedy?, verbose?, false)
end
end
- def print_outdated_formulae_json(formulae)
- json = []
- fetch_head = args.fetch_HEAD?
- outdated_formulae = formulae.select { |f| f.outdated?(fetch_head: fetch_head) }
+ def json_info(formula_or_cask)
+ return formula_or_cask.map { |f_or_c| json_info(f_or_c) } if formula_or_cask.is_a? Array
+
+ if formula_or_cask.is_a?(Formula)
+ f = formula_or_cask
- outdated = outdated_formulae.each do |f|
- outdated_versions = f.outdated_kegs(fetch_head: fetch_head).map(&:version)
+ outdated_versions = f.outdated_kegs(fetch_head: args.fetch_HEAD?).map(&:version)
current_version = if f.head? && outdated_versions.any? { |v| v.to_s == f.pkg_version.to_s }
"HEAD"
else
f.pkg_version.to_s
end
- json << { name: f.full_name,
- installed_versions: outdated_versions.map(&:to_s),
- current_version: current_version,
- pinned: f.pinned?,
- pinned_version: f.pinned_version }
+ { name: f.full_name,
+ installed_versions: outdated_versions.map(&:to_s),
+ current_version: current_version,
+ pinned: f.pinned?,
+ pinned_version: f.pinned_version }
+ else
+ c = formula_or_cask
+
+ c.outdated_info(args.greedy?, verbose?, true)
end
- puts JSON.generate(json)
+ end
- outdated
+ def verbose?
+ ($stdout.tty? || args.verbose?) && !args.quiet?
end
- def print_outdated_casks(casks)
- outdated = casks.map { |cask| Cask::CaskLoader.load(cask) }.select do |cask|
- odebug "Checking update info of Cask #{cask}"
- cask.outdated?(args.greedy?)
- end
+ def json_version
+ version_hash = {
+ nil => nil,
+ true => :v1,
+ "v1" => :v1,
+ "v2" => :v2,
+ }
- output = outdated.map { |cask| cask.outdated_info(args.greedy?, verbose?, args.json) }
- puts args.json ? JSON.generate(output) : output
+ raise UsageError, "invalid JSON version: #{args.json}" unless version_hash.include? args.json
- outdated
+ version_hash[args.json]
end
- def verbose?
- ($stdout.tty? || args.verbose?) && !args.quiet?
+ def outdated_formulae
+ select_outdated((args.resolved_formulae.presence || Formula.installed)).sort
+ end
+
+ def outdated_casks
+ select_outdated(
+ args.named.present? ? args.named.uniq.map { |ref| Cask::CaskLoader.load ref } : Cask::Caskroom.casks,
+ )
+ end
+
+ def outdated_formulae_casks
+ formulae, casks = args.resolved_formulae_casks
+
+ if formulae.blank? && casks.blank?
+ formulae = Formula.installed
+ casks = Cask::Caskroom.casks
+ end
+
+ [select_outdated(formulae), select_outdated(casks)]
+ end
+
+ def select_outdated(formulae_or_casks)
+ formulae_or_casks.select do |fc|
+ fc.is_a?(Formula) ? fc.outdated?(fetch_head: args.fetch_HEAD?) : fc.outdated?(args.greedy?)
+ end
end
end | false |
Other | Homebrew | brew | e7b3b8e55985b8e4ab41973dfbd76904d7fd3b91.json | Allow missing libraries | Library/Homebrew/formula.rb | @@ -1131,6 +1131,13 @@ def link_overwrite?(path)
end
end
+ # Whether this {Formula} is allowed to have broken linkage.
+ # Defaults to false.
+ # @return [Boolean]
+ def allow_missing_libs?
+ false
+ end
+
# Whether this {Formula} is deprecated (i.e. warns on installation).
# Defaults to false.
# @method deprecated?
@@ -2596,6 +2603,10 @@ def skip_clean_paths
@skip_clean_paths ||= Set.new
end
+ def allow_missing_libs
+ define_method(:allow_missing_libs?) { true }
+ end
+
# Software that will not be symlinked into the `brew --prefix` will only
# live in its Cellar. Other formulae can depend on it and then brew will
# add the necessary includes and libs (etc.) during the brewing of that | true |
Other | Homebrew | brew | e7b3b8e55985b8e4ab41973dfbd76904d7fd3b91.json | Allow missing libraries | Library/Homebrew/linkage_checker.rb | @@ -59,14 +59,20 @@ def display_test_output(puts_output: true)
display_items "Broken dependencies", @broken_deps, puts_output: puts_output
display_items "Unwanted system libraries", @unwanted_system_dylibs, puts_output: puts_output
display_items "Conflicting libraries", @version_conflict_deps, puts_output: puts_output
- puts "No broken library linkage" unless broken_library_linkage?
+ if got_library_issues?
+ puts "Broken library linkage ignored" if @formula.allow_missing_libs?
+ else
+ puts "No broken library linkage"
+ end
end
def broken_library_linkage?
- !@broken_dylibs.empty? ||
- !@broken_deps.empty? ||
- !@unwanted_system_dylibs.empty? ||
- !@version_conflict_deps.empty?
+ !@formula.allow_missing_libs? && got_library_issues?
+ end
+
+ def got_library_issues?
+ issues = [@broken_dylibs, @broken_deps, @unwanted_system_dylibs, @version_conflict_deps]
+ issues.any?(&:present?)
end
private | true |
Other | Homebrew | brew | 210d22e8199f2482b28f550838a33cca47380ce4.json | Integrate upgrade with cask | Library/Homebrew/cmd/upgrade.rb | @@ -4,6 +4,9 @@
require "formula_installer"
require "install"
require "upgrade"
+require "cask/cmd"
+require "cask/utils"
+require "cask/macos"
module Homebrew
module_function
@@ -50,6 +53,8 @@ def upgrade_args
description: "Print install times for each formula at the end of the run."
switch "-n", "--dry-run",
description: "Show what would be upgraded, but do not actually upgrade anything."
+ switch "--greedy",
+ description: "Upgrade casks with `auto_updates` or `version :latest`"
conflicts "--build-from-source", "--force-bottle"
formula_options
end
@@ -66,14 +71,14 @@ def upgrade
outdated = Formula.installed.select do |f|
f.outdated?(fetch_head: args.fetch_HEAD?)
end
-
- exit 0 if outdated.empty?
+ casks = [] # Upgrade all installed casks
else
- outdated = args.resolved_formulae.select do |f|
+ formulae, casks = args.resolved_formulae_casks
+ outdated, not_outdated = formulae.partition do |f|
f.outdated?(fetch_head: args.fetch_HEAD?)
end
- (args.resolved_formulae - outdated).each do |f|
+ not_outdated.each do |f|
versions = f.installed_kegs.map(&:version)
if versions.empty?
ofail "#{f.full_specified_name} not installed"
@@ -82,9 +87,15 @@ def upgrade
opoo "#{f.full_specified_name} #{version} already installed"
end
end
- return if outdated.empty?
end
+ upgrade_outdated_formulae(outdated)
+ upgrade_outdated_casks(casks)
+ end
+
+ def upgrade_outdated_formulae(outdated)
+ return if outdated.empty?
+
pinned = outdated.select(&:pinned?)
outdated -= pinned
formulae_to_install = outdated.map(&:latest_formula)
@@ -115,4 +126,12 @@ def upgrade
Homebrew.messages.display_messages
end
+
+ def upgrade_outdated_casks(casks)
+ cask_upgrade = Cask::Cmd::Upgrade.new(casks)
+ cask_upgrade.force = args.force?
+ cask_upgrade.dry_run = args.dry_run?
+ cask_upgrade.greedy = args.greedy?
+ cask_upgrade.run
+ end
end | false |
Other | Homebrew | brew | a39c0dc49f632353cf19f688532ca58a5686c1cf.json | Taps.md: Update cloning details
Since shallow cloning is now neither recommended nor the default, I've removed all mentions of cloning type. | docs/Taps.md | @@ -18,23 +18,19 @@ dunn/emacs
<!-- vale Homebrew.Terms = OFF -->
<!-- The `terms` lint suggests changing "repo" to "repository". But we need the abbreviation in the tap syntax and URL example. -->
-* `brew tap <user/repo>` makes a shallow clone of the repository at
+* `brew tap <user/repo>` makes a clone of the repository at
https://github.com/user/homebrew-repo. After that, `brew` will be able to work on
those formulae as if they were in Homebrew's canonical repository. You can
install and uninstall them with `brew [un]install`, and the formulae are
automatically updated when you run `brew update`. (See below for details
about how `brew tap` handles the names of repositories.)
<!-- vale Homebrew.Terms = ON -->
-* `brew tap <user/repo> <URL>` makes a shallow clone of the repository at URL.
+* `brew tap <user/repo> <URL>` makes a clone of the repository at URL.
Unlike the one-argument version, URL is not assumed to be GitHub, and it
doesn't have to be HTTP. Any location and any protocol that Git can handle is
fine.
-* Add `--full` to either the one- or two-argument invocations above to have Git
- make a complete clone rather than a shallow one. Full is the default for
- Homebrew developers.
-
* `brew tap --repair` migrates tapped formulae from a symlink-based to
directory-based structure. (This should only need to be run once.)
| false |
Other | Homebrew | brew | 8eb176f50bb0eee4671c1a24f1f5701a77742eba.json | exceptions: correct safe_system doc link | Library/Homebrew/exceptions.rb | @@ -506,7 +506,7 @@ def initialize(url)
end
end
-# Raised by {#safe_system} in `utils.rb`.
+# Raised by {Kernel#safe_system} in `utils.rb`.
class ErrorDuringExecution < RuntimeError
attr_reader :cmd, :status, :output
| false |
Other | Homebrew | brew | 79d4b27c8645692cc8b0c9014c71ed440c2f20d9.json | bump-formula-pr: restore formula if duplicate PR exists | Library/Homebrew/dev-cmd/bump-formula-pr.rb | @@ -316,7 +316,7 @@ def bump_formula_pr
new_formula_version = formula_version(formula, requested_spec, new_contents)
- check_for_duplicate_pull_requests(formula, tap_full_name, new_formula_version.to_s)
+ check_for_duplicate_pull_requests(formula, backup_file, tap_full_name, new_formula_version.to_s)
if !new_mirrors && !formula_spec.mirrors.empty?
if args.force?
@@ -481,7 +481,7 @@ def fetch_pull_requests(query, tap_full_name, state: nil)
[]
end
- def check_for_duplicate_pull_requests(formula, tap_full_name, version)
+ def check_for_duplicate_pull_requests(formula, backup_file, tap_full_name, version)
# check for open requests
pull_requests = fetch_pull_requests(formula.name, tap_full_name, state: "open")
@@ -497,8 +497,10 @@ def check_for_duplicate_pull_requests(formula, tap_full_name, version)
if args.force? && !args.quiet?
opoo duplicates_message
elsif !args.force? && args.quiet?
+ formula.path.atomic_write(backup_file) unless args.dry_run?
odie error_message
elsif !args.force?
+ formula.path.atomic_write(backup_file) unless args.dry_run?
odie <<~EOS
#{duplicates_message.chomp}
#{error_message} | false |
Other | Homebrew | brew | 3ae261136524d58fb7f153dbfacc03528151a03e.json | bump-formula-pr: determine url/tag from version | Library/Homebrew/dev-cmd/bump-formula-pr.rb | @@ -18,7 +18,11 @@ def bump_formula_pr_args
be made if either or both values are not supplied by the user.
If a <tag> is specified, the Git commit <revision> corresponding to that tag
- must also be specified.
+ should also be specified. A best effort to determine the <revision> will be made
+ if the value is not supplied by the user.
+
+ If a <version> is specified, a best effort to determine the <URL> and <SHA-256> or
+ the <tag> and <revision> will be made if both values are not supplied by the user.
*Note:* this command cannot be used to transition a formula from a
URL-and-SHA-256 style specification into a tag-and-revision style specification,
@@ -58,8 +62,8 @@ def bump_formula_pr_args
flag "--tag=",
description: "Specify the new git commit <tag> for the formula."
flag "--revision=",
- required_for: "--tag=",
- description: "Specify the new git commit <revision> corresponding to the specified <tag>."
+ depends_on: "--tag=",
+ description: "Specify the new git commit <revision> corresponding to the specified <tag>."
switch :force
switch :quiet
switch :verbose
@@ -119,31 +123,7 @@ def bump_formula_pr
formula = args.formulae.first
new_url = args.url
- if new_url && !formula
- # Split the new URL on / and find any formulae that have the same URL
- # except for the last component, but don't try to match any more than the
- # first five components since sometimes the last component isn't the only
- # one to change.
- new_url_split = new_url.split("/")
- maximum_url_components_to_match = 5
- components_to_match = [new_url_split.count - 1, maximum_url_components_to_match].min
- base_url = new_url_split.first(components_to_match).join("/")
- base_url = /#{Regexp.escape(base_url)}/
- is_devel = args.devel?
- guesses = []
- Formula.each do |f|
- if is_devel && f.devel && f.devel.url && f.devel.url.match(base_url)
- guesses << f
- elsif f.stable&.url && f.stable.url.match(base_url)
- guesses << f
- end
- end
- if guesses.count == 1
- formula = guesses.shift
- elsif guesses.count > 1
- odie "Couldn't guess formula for sure; could be one of these:\n#{guesses.map(&:name).join(", ")}"
- end
- end
+ formula ||= determine_formula_from_url(new_url, args.devel?) if new_url
raise FormulaUnspecifiedError unless formula
tap_full_name, origin_branch, previous_branch = use_correct_linux_tap(formula)
@@ -175,28 +155,41 @@ def bump_formula_pr
new_url.sub "mirrors.ocf.berkeley.edu/debian", "mirrorservice.org/sites/ftp.debian.org/debian"
end
new_mirrors ||= [new_mirror] unless new_mirror.nil?
- forced_version = args.version
+ new_version = args.version
+ old_url = formula_spec.url
+ old_tag = formula_spec.specs[:tag]
+ old_formula_version = formula_version(formula, requested_spec)
+ old_version = old_formula_version.to_s
+ forced_version = false
new_url_hash = if new_url && new_hash
true
elsif new_tag && new_revision
false
elsif !hash_type
- odie "#{formula}: no --tag=/--revision= arguments specified!"
- elsif !new_url
- odie "#{formula}: no --url= argument specified!"
+ odie "#{formula}: no --tag= or --version= argument specified!" if !new_tag && !new_version
+ new_tag ||= old_tag.gsub(old_version, new_version)
+ if new_tag == old_tag
+ odie <<~EOS
+ You probably need to bump this formula manually since the new tag
+ and old tag are both #{new_tag}.
+ EOS
+ end
+ resource_path, forced_version = fetch_resource(formula, new_version, old_url, tag: new_tag)
+ new_revision = Utils.popen_read("git -C \"#{resource_path}\" rev-parse -q --verify HEAD")
+ new_revision = new_revision.strip
+ false
+ elsif !new_url && !new_version
+ odie "#{formula}: no --url= or --version= argument specified!"
else
- resource = Resource.new { @url = new_url }
- resource.download_strategy = DownloadStrategyDetector.detect_from_url(new_url)
- resource.owner = Resource.new(formula.name)
- if forced_version
- if forced_version == resource.version
- forced_version = nil
- else
- resource.version = forced_version
- end
+ new_url ||= old_url.gsub(old_version, new_version)
+ if new_url == old_url
+ odie <<~EOS
+ You probably need to bump this formula manually since the new URL
+ and old URL are both:
+ #{new_url}
+ EOS
end
- odie "No --version= argument specified!" unless resource.version
- resource_path = resource.fetch
+ resource_path, forced_version = fetch_resource(formula, new_version, new_url)
tar_file_extensions = %w[.tar .tb2 .tbz .tbz2 .tgz .tlz .txz .tZ]
if tar_file_extensions.any? { |extension| new_url.include? extension }
gnu_tar_gtar_path = HOMEBREW_PREFIX/"opt/gnu-tar/bin/gtar"
@@ -212,8 +205,6 @@ def bump_formula_pr
end
end
- old_formula_version = formula_version(formula, requested_spec)
-
replacement_pairs = []
if requested_spec == :stable && formula.revision.nonzero?
replacement_pairs << [
@@ -273,32 +264,32 @@ def bump_formula_pr
]
end
- if forced_version && forced_version != "0"
+ if forced_version && new_version != "0"
case requested_spec
when :stable
replacement_pairs << if File.read(formula.path).include?("version \"#{old_formula_version}\"")
[
old_formula_version.to_s,
- forced_version,
+ new_version,
]
elsif new_mirrors
[
/^( +)(mirror "#{Regexp.escape(new_mirrors.last)}"\n)/m,
- "\\1\\2\\1version \"#{forced_version}\"\n",
+ "\\1\\2\\1version \"#{new_version}\"\n",
]
else
[
/^( +)(url "#{Regexp.escape(new_url)}"\n)/m,
- "\\1\\2\\1version \"#{forced_version}\"\n",
+ "\\1\\2\\1version \"#{new_version}\"\n",
]
end
when :devel
replacement_pairs << [
/( devel do.+?version ")#{old_formula_version}("\n.+?end\n)/m,
- "\\1#{forced_version}\\2",
+ "\\1#{new_version}\\2",
]
end
- elsif forced_version && forced_version == "0"
+ elsif forced_version && new_version == "0"
case requested_spec
when :stable
replacement_pairs << [
@@ -312,7 +303,7 @@ def bump_formula_pr
]
end
end
- new_contents = inreplace_pairs(formula.path, replacement_pairs)
+ new_contents = inreplace_pairs(formula.path, replacement_pairs.uniq)
new_formula_version = formula_version(formula, requested_spec, new_contents)
@@ -413,6 +404,40 @@ def bump_formula_pr
end
end
+ def determine_formula_from_url(url, is_devel)
+ # Split the new URL on / and find any formulae that have the same URL
+ # except for the last component, but don't try to match any more than the
+ # first five components since sometimes the last component isn't the only
+ # one to change.
+ url_split = url.split("/")
+ maximum_url_components_to_match = 5
+ components_to_match = [url_split.count - 1, maximum_url_components_to_match].min
+ base_url = url_split.first(components_to_match).join("/")
+ base_url = /#{Regexp.escape(base_url)}/
+ guesses = []
+ Formula.each do |f|
+ if is_devel && f.devel && f.devel.url && f.devel.url.match(base_url)
+ guesses << f
+ elsif f.stable&.url && f.stable.url.match(base_url)
+ guesses << f
+ end
+ end
+ return guesses.shift if guesses.count == 1
+ return unless guesses.count > 1
+
+ odie "Couldn't guess formula for sure; could be one of these:\n#{guesses.map(&:name).join(", ")}"
+ end
+
+ def fetch_resource(formula, new_version, url, **specs)
+ resource = Resource.new
+ resource.url(url, specs)
+ resource.owner = Resource.new(formula.name)
+ forced_version = new_version && new_version != resource.version
+ resource.version = new_version if forced_version
+ odie "No --version= argument specified!" unless resource.version
+ [resource.fetch, forced_version]
+ end
+
def forked_repo_info(formula, tap_full_name, backup_file)
response = GitHub.create_fork(tap_full_name)
rescue GitHub::AuthenticationFailedError, *GitHub.api_errors => e | true |
Other | Homebrew | brew | 3ae261136524d58fb7f153dbfacc03528151a03e.json | bump-formula-pr: determine url/tag from version | docs/Manpage.md | @@ -707,7 +707,12 @@ be specified. A best effort to determine the *`SHA-256`* and *`formula`* name wi
be made if either or both values are not supplied by the user.
If a *`tag`* is specified, the Git commit *`revision`* corresponding to that tag
-must also be specified.
+should also be specified. A best effort to determine the *`revision`* will be made
+if the value is not supplied by the user.
+
+If a *`version`* is specified, a best effort to determine the *`URL`* and *`SHA-256`*
+or the *`tag`* and *`revision`* will be made if both values are not supplied by the
+user.
*Note:* this command cannot be used to transition a formula from a
URL-and-SHA-256 style specification into a tag-and-revision style specification, | true |
Other | Homebrew | brew | 3ae261136524d58fb7f153dbfacc03528151a03e.json | bump-formula-pr: determine url/tag from version | manpages/brew.1 | @@ -917,7 +917,10 @@ Create a pull request to update \fIformula\fR with a new URL or a new tag\.
If a \fIURL\fR is specified, the \fISHA\-256\fR checksum of the new download should also be specified\. A best effort to determine the \fISHA\-256\fR and \fIformula\fR name will be made if either or both values are not supplied by the user\.
.
.P
-If a \fItag\fR is specified, the Git commit \fIrevision\fR corresponding to that tag must also be specified\.
+If a \fItag\fR is specified, the Git commit \fIrevision\fR corresponding to that tag should also be specified\. A best effort to determine the \fIrevision\fR will be made if the value is not supplied by the user\.
+.
+.P
+If a \fIversion\fR is specified, a best effort to determine the \fIURL\fR and \fISHA\-256\fR or the \fItag\fR and \fIrevision\fR will be made if both values are not supplied by the user\.
.
.P
\fINote:\fR this command cannot be used to transition a formula from a URL\-and\-SHA\-256 style specification into a tag\-and\-revision style specification, nor vice versa\. It must use whichever style specification the formula already uses\. | true |
Other | Homebrew | brew | 681dafd02838ddd50b7fe8dde02b040aeee3afcc.json | Adjust container checks for GitHub Actions changes | Library/Homebrew/brew.rb | @@ -127,7 +127,7 @@ def output_unsupported_error
ENV.delete("HOMEBREW_HELP") if help_flag
tap_commands = []
cgroup = Utils.popen_read("cat", "/proc/1/cgroup")
- if !cgroup.include?("azpl_job") && !cgroup.include?("docker")
+ if %w[azpl_job actions_job docker garden kubepods].none? { |container| cgroup.include?(container) }
brew_uid = HOMEBREW_BREW_FILE.stat.uid
tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] if Process.uid.zero? && !brew_uid.zero?
end | true |
Other | Homebrew | brew | 681dafd02838ddd50b7fe8dde02b040aeee3afcc.json | Adjust container checks for GitHub Actions changes | Library/Homebrew/brew.sh | @@ -433,8 +433,8 @@ fi
check-run-command-as-root() {
[[ "$(id -u)" = 0 ]] || return
- # Allow Azure Pipelines/Docker/Concourse/Kubernetes to do everything as root (as it's normal there)
- [[ -f /proc/1/cgroup ]] && grep -E "azpl_job|docker|garden|kubepods" -q /proc/1/cgroup && return
+ # Allow Azure Pipelines/GitHub Actions/Docker/Concourse/Kubernetes to do everything as root (as it's normal there)
+ [[ -f /proc/1/cgroup ]] && grep -E "azpl_job|actions_job|docker|garden|kubepods" -q /proc/1/cgroup && return
# Homebrew Services may need `sudo` for system-wide daemons.
[[ "$HOMEBREW_COMMAND" = "services" ]] && return | true |
Other | Homebrew | brew | 567b5a96d6f7f95f36f1010986fb0e390ada6ffc.json | check_user_path_1: Fix message presentation | Library/Homebrew/diagnostic.rb | @@ -392,11 +392,11 @@ def check_user_path_1
message = inject_file_list conflicts, <<~EOS
/usr/bin occurs before #{HOMEBREW_PREFIX}/bin
This means that system-provided programs will be used instead of those
- provided by Homebrew. The following tools exist at both paths:
-
- Consider setting your PATH so that #{HOMEBREW_PREFIX}/bin
- occurs before /usr/bin. Here is a one-liner:
+ provided by Homebrew. Consider setting your PATH so that
+ #{HOMEBREW_PREFIX}/bin occurs before /usr/bin. Here is a one-liner:
#{Utils::Shell.prepend_path_in_profile("#{HOMEBREW_PREFIX}/bin")}
+
+ The following tools exist at both paths:
EOS
end
end | false |
Other | Homebrew | brew | 678dbc19731ca4deb295d64d9288beca5480427c.json | std_meson_args: add release buildtype
By default meson compiles using the debug buildtype, which corresponds
to -O0 -g. The release buildtype changes this to -O3. | Library/Homebrew/formula.rb | @@ -1420,7 +1420,7 @@ def std_cabal_v2_args
# Standard parameters for meson builds.
def std_meson_args
- ["--prefix=#{prefix}", "--libdir=#{lib}"]
+ ["--prefix=#{prefix}", "--libdir=#{lib}", "--buildtype=release"]
end
def shared_library(name, version = nil) | false |
Other | Homebrew | brew | 981726c088b4ceb8af2251ae8f3bf131ceb65103.json | utils/git_spec: Add a test for `last_revision_commit_of_files`
- This method, called from `brew extract` in the case of extraction from
third-party taps, was untested. This led to it breaking when we refactored
some of it to appease Sorbet (see PR 7933). If I make the same
(flawed) change here and run these tests, they fail.
- There's a fair bit going on here, but most of it is setup for
committing changes to more files, as we're testing operations on
multiple files in a Homebrew repo.
- I originally tried to write tests for `brew extract`, but that
required _a lot_ of refactoring because those tests (and their helper
methods) aren't designed for third-party taps - they rely on
`CoreTap`. So testing the underlying method is a better solution. | Library/Homebrew/test/utils/git_spec.rb | @@ -9,35 +9,67 @@
HOMEBREW_CACHE.cd do
system git, "init"
- File.open(file, "w") { |f| f.write("blah") }
- system git, "add", HOMEBREW_CACHE/file
+ File.open("blah.rb", "w") { |f| f.write("blah") }
+ system git, "add", HOMEBREW_CACHE/"blah.rb"
system git, "commit", "-m", "'File added'"
@h1 = `git rev-parse HEAD`
- File.open(file, "w") { |f| f.write("brew") }
- system git, "add", HOMEBREW_CACHE/file
+ File.open("blah.rb", "w") { |f| f.write("brew") }
+ system git, "add", HOMEBREW_CACHE/"blah.rb"
system git, "commit", "-m", "'written to File'"
@h2 = `git rev-parse HEAD`
+
+ File.open("bleh.rb", "w") { |f| f.write("bleh") }
+ system git, "add", HOMEBREW_CACHE/"bleh.rb"
+ system git, "commit", "-m", "'File added'"
+ @h3 = `git rev-parse HEAD`
+
+ File.open("bleh.rb", "w") { |f| f.write("blehbleh") }
+ system git, "add", HOMEBREW_CACHE/"bleh.rb"
+ system git, "commit", "-m", "'written to File'"
end
end
let(:file) { "blah.rb" }
- let(:hash1) { @h1[0..6] }
- let(:hash2) { @h2[0..6] }
+ let(:file_hash1) { @h1[0..6] }
+ let(:file_hash2) { @h2[0..6] }
+ let(:files) { ["blah.rb", "bleh.rb"] }
+ let(:files_hash1) { [@h3[0..6], ["bleh.rb"]] }
+ let(:files_hash2) { [@h2[0..6], ["blah.rb"]] }
describe "#last_revision_commit_of_file" do
it "gives last revision commit when before_commit is nil" do
expect(
described_class.last_revision_commit_of_file(HOMEBREW_CACHE, file),
- ).to eq(hash1)
+ ).to eq(file_hash1)
end
it "gives revision commit based on before_commit when it is not nil" do
expect(
described_class.last_revision_commit_of_file(HOMEBREW_CACHE,
file,
- before_commit: hash2),
- ).to eq(hash2)
+ before_commit: file_hash2),
+ ).to eq(file_hash2)
+ end
+ end
+
+ describe "#last_revision_commit_of_files" do
+ context "when before_commit is nil" do
+ it "gives last revision commit" do
+ expect(
+ described_class.last_revision_commit_of_files(HOMEBREW_CACHE, files),
+ ).to eq(files_hash1)
+ end
+ end
+
+ context "when before_commit is not nil" do
+ it "gives last revision commit" do
+ expect(
+ described_class.last_revision_commit_of_files(HOMEBREW_CACHE,
+ files,
+ before_commit: file_hash2),
+ ).to eq(files_hash2)
+ end
end
end
| false |
Other | Homebrew | brew | 55246d720e9e8408c76741bb5c104f3df0aff789.json | improve style in pattern matcher | Library/Homebrew/rubocops/lines.rb | @@ -173,7 +173,8 @@ def unless_modifier?(node)
# Finds `depends_on "foo" if build.with?("bar")` or `depends_on "foo" if build.without?("bar")`
def_node_search :depends_on_build_with, <<~EOS
- (if $(send (send nil? :build) {:with? :without?} str) (send nil? :depends_on str) nil?)
+ (if $(send (send nil? :build) {:with? :without?} str)
+ (send nil? :depends_on str) nil?)
EOS
end
| false |
Other | Homebrew | brew | c1666676667d474986aa4fcb8b4a72b5cdc828da.json | shellenv: Fix shell detection
It currently switches on `$SHELL`, which points to the user's login shell. However, `shellenv` may be used in contexts where the running shell isn't `$SHELL` (e.g. csh-based `cron` scripts), and Linux desktop environments may set up user sessions in ways that trip up the current algorithm (see #7965 for an example). To work correctly in all circumstances and environments, its output should be determined by the context (calling shell) instead.
Fixes #7965. | Library/Homebrew/cmd/shellenv.sh | @@ -6,16 +6,16 @@
#: Consider adding evaluation of this command's output to your dotfiles (e.g. `~/.profile`, `~/.bash_profile`, or `~/.zprofile`) with: `eval $(brew shellenv)`
homebrew-shellenv() {
- case "$SHELL" in
- */fish|fish)
+ case "$(/bin/ps -p $PPID -o comm=)" in
+ fish|-fish)
echo "set -gx HOMEBREW_PREFIX \"$HOMEBREW_PREFIX\";"
echo "set -gx HOMEBREW_CELLAR \"$HOMEBREW_CELLAR\";"
echo "set -gx HOMEBREW_REPOSITORY \"$HOMEBREW_REPOSITORY\";"
echo "set -q PATH; or set PATH ''; set -gx PATH \"$HOMEBREW_PREFIX/bin\" \"$HOMEBREW_PREFIX/sbin\" \$PATH;"
echo "set -q MANPATH; or set MANPATH ''; set -gx MANPATH \"$HOMEBREW_PREFIX/share/man\" \$MANPATH;"
echo "set -q INFOPATH; or set INFOPATH ''; set -gx INFOPATH \"$HOMEBREW_PREFIX/share/info\" \$INFOPATH;"
;;
- */csh|csh|*/tcsh|tcsh)
+ csh|-csh|tcsh|-tcsh)
echo "setenv HOMEBREW_PREFIX $HOMEBREW_PREFIX;"
echo "setenv HOMEBREW_CELLAR $HOMEBREW_CELLAR;"
echo "setenv HOMEBREW_REPOSITORY $HOMEBREW_REPOSITORY;" | false |
Other | Homebrew | brew | 69e89d7a0159c81cad5b40af3856bd465fa28355.json | add TODOs for future refactoring | Library/Homebrew/rubocops/lines.rb | @@ -118,6 +118,7 @@ def audit_formula(_node, _class_node, _parent_class_node, body_node)
depends_on_build_regex = /depends_on .+ (if build\.with(out)?\?\(["']\w+["']\))/
find_instance_method_call(body_node, :build, :with?) do |n|
+ # TODO: this should be refactored to a direct method match
next unless match = n.parent.source.match(depends_on_build_regex)
problem "Use `:optional` or `:recommended` instead of `#{match[1]}`" | true |
Other | Homebrew | brew | 69e89d7a0159c81cad5b40af3856bd465fa28355.json | add TODOs for future refactoring | Library/Homebrew/rubocops/text.rb | @@ -112,6 +112,7 @@ def audit_formula(node, _class_node, _parent_class_node, body_node)
parent = n.parent
# Only look at keywords that have `prefix` before them
+ # TODO: this should be refactored to a direct method match
prefix_keyword_regex = %r{(prefix\s*\+\s*["'](bin|include|libexec|lib|sbin|share|Frameworks))["'/]}
if match = parent.source.match(prefix_keyword_regex)
offending_node(parent) | true |
Other | Homebrew | brew | 832073a3c7de32346d09409569b48ed672418527.json | cask: add list --json | Library/Homebrew/cask/cmd/list.rb | @@ -3,58 +3,69 @@
module Cask
class Cmd
class List < AbstractCommand
- option "-1", :one, false
- option "--versions", :versions, false
- option "--full-name", :full_name, false
+ option "-1", :one, false
+ option "--versions", :versions, false
+ option "--full-name", :full_name, false
+ option "--json", :json, false
+
+ def self.usage
+ <<~EOS
+ `cask list`, `cask ls` [<options>] [<casks>]
+
+ -1 - Force output to be one entry per line.
+ This is the default when output is not to a terminal.
+ --versions - Show the version number for installed formulae, or only the specified
+ casks if <casks> are provided.
+ --full-name - Print casks with fully-qualified names.
+ --json - Print a JSON representation of <cask>. See the docs for examples of using the JSON
+ output: <https://docs.brew.sh/Querying-Brew>
+
+ List all installed casks.
+
+ If <casks> are provided, limit information to just those casks.
+ EOS
+ end
+
+ def self.help
+ "lists installed Casks or the casks provided in the arguments"
+ end
def run
- args.any? ? list : list_installed
+ output = args.any? ? provided_list : Caskroom.casks
+
+ if json?
+ puts JSON.generate(output.map(&:to_h))
+ elsif one?
+ puts output.map(&:to_s)
+ elsif full_name?
+ puts output.map(&:full_name).sort(&tap_and_name_comparison)
+ elsif versions?
+ puts output.map(&self.class.method(:format_versioned))
+ elsif !output.empty? && args.any?
+ puts output.map(&self.class.method(:list_artifacts))
+ elsif !output.empty?
+ puts Formatter.columns(output.map(&:to_s))
+ end
end
- def list
+ def provided_list
casks.each do |cask|
raise CaskNotInstalledError, cask unless cask.installed?
-
- if one?
- puts cask.token
- elsif versions?
- puts self.class.format_versioned(cask)
- else
- cask = CaskLoader.load(cask.installed_caskfile)
- self.class.list_artifacts(cask)
- end
end
+ casks
end
def self.list_artifacts(cask)
cask.artifacts.group_by(&:class).each do |klass, artifacts|
next unless klass.respond_to?(:english_description)
- ohai klass.english_description, artifacts.map(&:summarize_installed)
- end
- end
-
- def list_installed
- installed_casks = Caskroom.casks
-
- if one?
- puts installed_casks.map(&:to_s)
- elsif versions?
- puts installed_casks.map(&self.class.method(:format_versioned))
- elsif full_name?
- puts installed_casks.map(&:full_name).sort(&tap_and_name_comparison)
- elsif !installed_casks.empty?
- puts Formatter.columns(installed_casks.map(&:to_s))
+ return "==> #{klass.english_description}", artifacts.map(&:summarize_installed)
end
end
def self.format_versioned(cask)
cask.to_s.concat(cask.versions.map(&:to_s).join(" ").prepend(" "))
end
-
- def self.help
- "with no args, lists installed Casks; given installed Casks, lists staged files"
- end
end
end
end | true |
Other | Homebrew | brew | 832073a3c7de32346d09409569b48ed672418527.json | cask: add list --json | Library/Homebrew/test/cask/cmd/list_spec.rb | @@ -20,6 +20,26 @@
EOS
end
+ it "lists oneline" do
+ casks = %w[
+ local-caffeine
+ third-party/tap/third-party-cask
+ local-transmission
+ ].map { |c| Cask::CaskLoader.load(c) }
+
+ casks.each do |c|
+ InstallHelper.install_with_caskfile(c)
+ end
+
+ expect {
+ described_class.run("-1")
+ }.to output(<<~EOS).to_stdout
+ local-caffeine
+ local-transmission
+ third-party-cask
+ EOS
+ end
+
it "lists full names" do
casks = %w[
local-caffeine
@@ -66,6 +86,31 @@
end
end
+ describe "lists json" do
+ let(:casks) { ["local-caffeine", "local-transmission"] }
+ let(:expected_output) {
+ <<~EOS
+ [{"token":"local-caffeine","name":[],"homepage":"https://brew.sh/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/caffeine.zip","appcast":null,"version":"1.2.3","sha256":"67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94","artifacts":[["Caffeine.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null},{"token":"local-transmission","name":["Transmission"],"homepage":"https://brew.sh/","url":"file:///usr/local/Homebrew/Library/Homebrew/test/support/fixtures/cask/transmission-2.61.dmg","appcast":null,"version":"2.61","sha256":"e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68","artifacts":[["Transmission.app"]],"caveats":null,"depends_on":{},"conflicts_with":null,"container":null,"auto_updates":null}]
+ EOS
+ }
+
+ before do
+ casks.map(&Cask::CaskLoader.method(:load)).each(&InstallHelper.method(:install_with_caskfile))
+ end
+
+ it "of all installed Casks" do
+ expect {
+ described_class.run("--json")
+ }.to output(expected_output).to_stdout
+ end
+
+ it "of given Casks" do
+ expect {
+ described_class.run("--json", "local-caffeine", "local-transmission")
+ }.to output(expected_output).to_stdout
+ end
+ end
+
describe "given a set of installed Casks" do
let(:caffeine) { Cask::CaskLoader.load(cask_path("local-caffeine")) }
let(:transmission) { Cask::CaskLoader.load(cask_path("local-transmission")) } | true |
Other | Homebrew | brew | 10feb681282be3cdbe3414739b2d10ef44c25e2c.json | Add support for -march=sandybridge
HHVM's been building with this (or equivalent predecessor patches); it
gets us a 20x speedup on real-world workloads, at the cost of slightly
worse compatibility.
This doesn't change the default, just makes it available as an explicit
choice. | Library/Homebrew/hardware.rb | @@ -14,6 +14,7 @@ def optimization_flags
@optimization_flags ||= {
native: arch_flag("native"),
nehalem: "-march=nehalem",
+ sandybridge: "-march=sandybridge",
core2: "-march=core2",
core: "-march=prescott",
arm_vortex_tempest: "", | false |
Other | Homebrew | brew | 1a703a1234b5ce8bd934899a17fa778e3a38c301.json | regex_match_group: handle non UTF-8 encoded strings | Library/Homebrew/rubocops/extend/formula.rb | @@ -35,7 +35,7 @@ def on_class(node)
# Checks for regex match of pattern in the node and
# sets the appropriate instance variables to report the match
def regex_match_group(node, pattern)
- string_repr = string_content(node)
+ string_repr = string_content(node).encode("UTF-8", invalid: :replace)
match_object = string_repr.match(pattern)
return unless match_object
| false |
Other | Homebrew | brew | b4a9565b8bf370d90dc6b7900f6542998e5665d8.json | style: require java dependency for JAVA_HOME | Library/Homebrew/dev-cmd/audit.rb | @@ -852,13 +852,6 @@ def line_problems(line, _lineno)
)
end
- if line =~ /JAVA_HOME/i &&
- [formula.name, *formula.deps.map(&:name)].none? { |name| name.match?(/^openjdk(@|$)/) } &&
- formula.requirements.none? { |req| req.is_a?(JavaRequirement) }
- # TODO: check could be in RuboCop
- problem "Use `depends_on :java` to set JAVA_HOME"
- end
-
return unless @strict
# TODO: check could be in RuboCop | true |
Other | Homebrew | brew | b4a9565b8bf370d90dc6b7900f6542998e5665d8.json | style: require java dependency for JAVA_HOME | Library/Homebrew/rubocops/text.rb | @@ -78,6 +78,21 @@ def audit_formula(_node, _class_node, _parent_class_node, body_node)
problem "Do not concatenate paths in string interpolation"
end
end
+
+ find_strings(body_node).each do |n|
+ next unless regex_match_group(n, /JAVA_HOME/i)
+
+ next if @formula_name.match?(/^openjdk(@|$)/)
+
+ next if find_every_method_call_by_name(body_node, :depends_on).any? do |dependency|
+ dependency.each_descendant(:str).count.zero? ||
+ regex_match_group(dependency.each_descendant(:str).first, /^openjdk(@|$)/) ||
+ depends_on?(:java)
+ end
+
+ offending_node(n)
+ problem "Use `depends_on :java` to set JAVA_HOME"
+ end
end
end
end | true |
Other | Homebrew | brew | b4a9565b8bf370d90dc6b7900f6542998e5665d8.json | style: require java dependency for JAVA_HOME | Library/Homebrew/test/rubocops/text_spec.rb | @@ -237,6 +237,61 @@ def install
end
RUBY
end
+
+ it "When using JAVA_HOME without a java dependency" do
+ expect_offense(<<~RUBY)
+ class Foo < Formula
+ def install
+ ohai "JAVA_HOME"
+ ^^^^^^^^^^^ Use `depends_on :java` to set JAVA_HOME
+ end
+ end
+ RUBY
+ end
+
+ it "When using JAVA_HOME with an openjdk dependency" do
+ expect_no_offenses(<<~RUBY)
+ class Foo < Formula
+ depends_on "openjdk"
+ def install
+ ohai "JAVA_HOME"
+ end
+ end
+ RUBY
+ end
+
+ it "When using JAVA_HOME with an openjdk build dependency" do
+ expect_no_offenses(<<~RUBY)
+ class Foo < Formula
+ depends_on "openjdk" => :build
+ def install
+ ohai "JAVA_HOME"
+ end
+ end
+ RUBY
+ end
+
+ it "When using JAVA_HOME with a java dependency" do
+ expect_no_offenses(<<~RUBY)
+ class Foo < Formula
+ depends_on :java
+ def install
+ ohai "JAVA_HOME"
+ end
+ end
+ RUBY
+ end
+
+ it "When using JAVA_HOME with a java build dependency" do
+ expect_no_offenses(<<~RUBY)
+ class Foo < Formula
+ depends_on :java => :build
+ def install
+ ohai "JAVA_HOME"
+ end
+ end
+ RUBY
+ end
end
end
| true |
Other | Homebrew | brew | 2afa8497c096ba85489b4f242c64a0cdf1b06214.json | formula: consider aliases in installed_prefixes | Library/Homebrew/formula.rb | @@ -598,7 +598,16 @@ def rack
# All currently installed prefix directories.
# @private
def installed_prefixes
- rack.directory? ? rack.subdirs.sort : []
+ prefixes = rack.directory? ? rack.subdirs : []
+
+ prefixes += (aliases + Array(oldname)).flat_map do |alias_name|
+ rack_alias = HOMEBREW_CELLAR/alias_name
+ next unless rack_alias.directory?
+
+ rack_alias.subdirs
+ end.compact
+
+ prefixes.sort_by(&:basename)
end
# All currently installed kegs. | false |
Other | Homebrew | brew | bdb64aa178c1531661d74f58cd2435c30e029272.json | Apply suggestions from code review
Code review changes
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com> | Library/Homebrew/formula_installer.rb | @@ -1107,7 +1107,7 @@ def puts_requirement_messages
end
def forbidden_license_check
- forbidden_licenses = (Homebrew::EnvConfig.forbidden_licenses || "").split(" ")
+ forbidden_licenses = Homebrew::EnvConfig.forbidden_licenses.to_s.split(" ")
return if forbidden_licenses.blank?
if forbidden_licenses.include? formula.license | false |
Other | Homebrew | brew | 02d6b671e6bc2ad2bb26306966b68d78d5d07696.json | Revert "python_virtualenv_constants: upgrade virtualenv to 20.0.26"
This reverts commit 6dbcf83a21d36a0c03990a923cc07ef4a06e4e7f. | Library/Homebrew/language/python_virtualenv_constants.rb | @@ -1,11 +1,11 @@
# frozen_string_literal: true
PYTHON_VIRTUALENV_URL =
- "https://files.pythonhosted.org/packages/c4/1b" \
- "/09bb751c6e805bf4711bbaead5499c8d8caf92398ba8da92daa8bf19f60e" \
- "/virtualenv-20.0.26.tar.gz"
+ "https://files.pythonhosted.org/packages/11/74" \
+ "/2c151a13ef41ab9fb43b3c4ff9e788e0496ed7923b2078d42cab30622bdf" \
+ "/virtualenv-16.7.4.tar.gz"
PYTHON_VIRTUALENV_SHA256 =
- "e10cc66f40cbda459720dfe1d334c4dc15add0d80f09108224f171006a97a172"
+ "94a6898293d07f84a98add34c4df900f8ec64a570292279f6d91c781d37fd305"
PYTHON_VIRTUALENV_URL_MOJAVE =
"https://files.pythonhosted.org/packages/b1/72" \ | false |
Other | Homebrew | brew | 8f3d230995ed76dcd7c8dc8abd9bf0a27c761bae.json | list: Remove extraneous flag conflicts | Library/Homebrew/cmd/list.rb | @@ -47,7 +47,7 @@ def list_args
description: "Sort by time modified, listing most recently modified first."
switch :verbose
switch :debug
- conflicts "--casks", "--unbrewed", "--multiple", "--pinned", "-l", "-r", "-t"
+ ["--unbrewed", "--multiple", "--pinned", "-l", "-r", "-t"].each { |flag| conflicts "--casks", flag }
end
end
| false |
Other | Homebrew | brew | 28c0962430bb33806bb4870ba394192e606d26f5.json | list: Integrate brew list with brew cask list | Library/Homebrew/cmd/list.rb | @@ -3,6 +3,7 @@
require "metafiles"
require "formula"
require "cli/parser"
+require "cask/cmd"
module Homebrew
module_function
@@ -31,6 +32,8 @@ def list_args
switch "--pinned",
description: "Show the versions of pinned formulae, or only the specified (pinned) "\
"formulae if <formula> are provided. See also `pin`, `unpin`."
+ switch "--casks",
+ description: "List casks"
# passed through to ls
switch "-1",
description: "Force output to be one entry per line. " \
@@ -44,12 +47,15 @@ def list_args
description: "Sort by time modified, listing most recently modified first."
switch :verbose
switch :debug
+ conflicts "--casks", "--unbrewed", "--multiple", "--pinned", "-l", "-r", "-t"
end
end
def list
list_args.parse
+ return list_casks if args.casks?
+
return list_unbrewed if args.unbrewed?
# Unbrewed uses the PREFIX, which will exist
@@ -150,6 +156,14 @@ def filtered_list
end
end
end
+
+ def list_casks
+ cask_list = Cask::Cmd::List.new args.named
+ cask_list.one = ARGV.include? "-1"
+ cask_list.versions = args.versions?
+ cask_list.full_name = args.full_name?
+ cask_list.run
+ end
end
class PrettyListing | false |
Other | Homebrew | brew | 5e99ecfbdb0a33fd4cb831232abfd824b5b5ecb7.json | Apply suggestions from code review
Code review changes
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com> | Library/Homebrew/env_config.rb | @@ -112,7 +112,7 @@ module EnvConfig
default: 15,
},
HOMEBREW_FORBIDDEN_LICENSES: {
- description: "Use this environment variable to define a blacklist of space separated licenses and Homebrew " \
+ description: "Use this environment variable to define a denylist of space separated licenses and Homebrew " \
"will avoid installing the packages with those licenses.",
},
HOMEBREW_FORCE_BREWED_CURL: { | true |
Other | Homebrew | brew | 5e99ecfbdb0a33fd4cb831232abfd824b5b5ecb7.json | Apply suggestions from code review
Code review changes
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com> | Library/Homebrew/formula_installer.rb | @@ -1106,23 +1106,17 @@ def puts_requirement_messages
$stderr.puts @requirement_messages
end
- def env_forbidden_licenses
- Homebrew::EnvConfig.forbidden_licenses.split(" ")
- end
-
- def forbidden_license_check(f)
- return if ENV["HOMEBREW_FORBIDDEN_LICENSES"].blank?
-
- forbidden_licenses = env_forbidden_licenses
+ def forbidden_license_check
+ forbidden_licenses = Homebrew::EnvConfig.forbidden_licenses.split(" ")
+ return if forbidden_licenses.blank?
- if forbidden_licenses.include? f.license
+ if forbidden_licenses.include? formula.license
raise CannotInstallFormulaError, <<~EOS
- #{f.name} has a forbidden license #{f.license}.
+ #{formula.name} has a forbidden license #{formula.license}.
EOS
end
- fi = FormulaInstaller.new(f)
- fi.compute_dependencies.each do |dep, _|
+ compute_dependencies.each do |dep, _|
dep_f = dep.to_formula
next unless forbidden_licenses.include? dep_f.license
| true |
Other | Homebrew | brew | 6dbcf83a21d36a0c03990a923cc07ef4a06e4e7f.json | python_virtualenv_constants: upgrade virtualenv to 20.0.26 | Library/Homebrew/language/python_virtualenv_constants.rb | @@ -1,11 +1,11 @@
# frozen_string_literal: true
PYTHON_VIRTUALENV_URL =
- "https://files.pythonhosted.org/packages/11/74" \
- "/2c151a13ef41ab9fb43b3c4ff9e788e0496ed7923b2078d42cab30622bdf" \
- "/virtualenv-16.7.4.tar.gz"
+ "https://files.pythonhosted.org/packages/c4/1b" \
+ "/09bb751c6e805bf4711bbaead5499c8d8caf92398ba8da92daa8bf19f60e" \
+ "/virtualenv-20.0.26.tar.gz"
PYTHON_VIRTUALENV_SHA256 =
- "94a6898293d07f84a98add34c4df900f8ec64a570292279f6d91c781d37fd305"
+ "e10cc66f40cbda459720dfe1d334c4dc15add0d80f09108224f171006a97a172"
PYTHON_VIRTUALENV_URL_MOJAVE =
"https://files.pythonhosted.org/packages/b1/72" \ | false |
Other | Homebrew | brew | c8c8839ba27007cf166d9108c5986a02a3dbbfc9.json | sorbet: update hidden definitions
srb/tapioca: update rbi of recently bumped gems | Library/Homebrew/sorbet/files.yaml | @@ -163,6 +163,7 @@ false:
- ./dev-cmd/release-notes.rb
- ./dev-cmd/ruby.rb
- ./dev-cmd/sh.rb
+ - ./dev-cmd/sponsors.rb
- ./dev-cmd/style.rb
- ./dev-cmd/tap-new.rb
- ./dev-cmd/test.rb
@@ -603,6 +604,7 @@ false:
- ./test/dev-cmd/release-notes_spec.rb
- ./test/dev-cmd/ruby_spec.rb
- ./test/dev-cmd/sh_spec.rb
+ - ./test/dev-cmd/sponsors_spec.rb
- ./test/dev-cmd/style_spec.rb
- ./test/dev-cmd/tap-new_spec.rb
- ./test/dev-cmd/test_spec.rb
@@ -861,7 +863,6 @@ true:
- ./cask/url.rb
- ./checksum.rb
- ./config.rb
- - ./dev-cmd/sponsers.rb
- ./extend/cachable.rb
- ./extend/os/linux/development_tools.rb
- ./extend/os/linux/formula.rb
@@ -888,7 +889,6 @@ true:
- ./rubocops/cask/extend/string.rb
- ./rubocops/deprecate.rb
- ./tap_constants.rb
- - ./test/dev-cmd/sponsers_spec.rb
- ./test/support/helper/fixtures.rb
- ./test/support/lib/config.rb
- ./utils/bottles.rb | true |
Other | Homebrew | brew | c8c8839ba27007cf166d9108c5986a02a3dbbfc9.json | sorbet: update hidden definitions
srb/tapioca: update rbi of recently bumped gems | Library/Homebrew/sorbet/rbi/gems/rubocop-performance@1.7.0.rbi | @@ -1,5 +1,5 @@
# This file is autogenerated. Do not edit it by hand. Regenerate it with:
-# tapioca sync
+# tapioca sync --exclude json
# typed: true
@@ -12,6 +12,24 @@ end
module RuboCop::Cop::Performance
end
+class RuboCop::Cop::Performance::AncestorsInclude < ::RuboCop::Cop::Cop
+ include(::RuboCop::Cop::RangeHelp)
+
+ def ancestors_include_candidate?(node = _); end
+ def autocorrect(node); end
+ def on_send(node); end
+end
+
+RuboCop::Cop::Performance::AncestorsInclude::MSG = T.let(T.unsafe(nil), String)
+
+class RuboCop::Cop::Performance::BigDecimalWithNumericArgument < ::RuboCop::Cop::Cop
+ def autocorrect(node); end
+ def big_decimal_with_numeric_argument?(node = _); end
+ def on_send(node); end
+end
+
+RuboCop::Cop::Performance::BigDecimalWithNumericArgument::MSG = T.let(T.unsafe(nil), String)
+
class RuboCop::Cop::Performance::BindCall < ::RuboCop::Cop::Cop
include(::RuboCop::Cop::RangeHelp)
extend(::RuboCop::Cop::TargetRubyVersion)
@@ -256,6 +274,29 @@ class RuboCop::Cop::Performance::InefficientHashSearch < ::RuboCop::Cop::Cop
def use_long_method; end
end
+class RuboCop::Cop::Performance::IoReadlines < ::RuboCop::Cop::Cop
+ include(::RuboCop::Cop::RangeHelp)
+
+ def autocorrect(node); end
+ def on_send(node); end
+ def readlines_on_class?(node = _); end
+ def readlines_on_instance?(node = _); end
+
+ private
+
+ def build_bad_method(enumerable_call); end
+ def build_call_args(call_args_node); end
+ def build_good_method(enumerable_call); end
+ def correction_range(enumerable_call, readlines_call); end
+ def enumerable_method?(node); end
+ def offense(node, enumerable_call, readlines_call); end
+ def offense_range(enumerable_call, readlines_call); end
+end
+
+RuboCop::Cop::Performance::IoReadlines::ENUMERABLE_METHODS = T.let(T.unsafe(nil), Array)
+
+RuboCop::Cop::Performance::IoReadlines::MSG = T.let(T.unsafe(nil), String)
+
class RuboCop::Cop::Performance::OpenStruct < ::RuboCop::Cop::Cop
def on_send(node); end
def open_struct(node = _); end
@@ -349,6 +390,42 @@ RuboCop::Cop::Performance::RedundantMerge::MSG = T.let(T.unsafe(nil), String)
RuboCop::Cop::Performance::RedundantMerge::WITH_MODIFIER_CORRECTION = T.let(T.unsafe(nil), String)
+class RuboCop::Cop::Performance::RedundantSortBlock < ::RuboCop::Cop::Cop
+ include(::RuboCop::Cop::RangeHelp)
+ include(::RuboCop::Cop::SortBlock)
+
+ def autocorrect(node); end
+ def on_block(node); end
+
+ private
+
+ def message(var_a, var_b); end
+end
+
+RuboCop::Cop::Performance::RedundantSortBlock::MSG = T.let(T.unsafe(nil), String)
+
+class RuboCop::Cop::Performance::RedundantStringChars < ::RuboCop::Cop::Cop
+ include(::RuboCop::Cop::RangeHelp)
+
+ def autocorrect(node); end
+ def on_send(node); end
+ def redundant_chars_call?(node = _); end
+
+ private
+
+ def build_bad_method(method, args); end
+ def build_call_args(call_args_node); end
+ def build_good_method(method, args); end
+ def build_message(method, args); end
+ def correction_range(receiver, node); end
+ def offense_range(receiver, node); end
+ def replaceable_method?(method_name); end
+end
+
+RuboCop::Cop::Performance::RedundantStringChars::MSG = T.let(T.unsafe(nil), String)
+
+RuboCop::Cop::Performance::RedundantStringChars::REPLACEABLE_METHODS = T.let(T.unsafe(nil), Array)
+
class RuboCop::Cop::Performance::RegexpMatch < ::RuboCop::Cop::Cop
def autocorrect(node); end
def last_matches(node0); end
@@ -398,21 +475,61 @@ RuboCop::Cop::Performance::ReverseEach::MSG = T.let(T.unsafe(nil), String)
RuboCop::Cop::Performance::ReverseEach::UNDERSCORE = T.let(T.unsafe(nil), String)
-class RuboCop::Cop::Performance::Size < ::RuboCop::Cop::Cop
+class RuboCop::Cop::Performance::ReverseFirst < ::RuboCop::Cop::Cop
+ include(::RuboCop::Cop::RangeHelp)
+
def autocorrect(node); end
def on_send(node); end
+ def reverse_first_candidate?(node = _); end
private
- def allowed_parent?(node); end
- def array?(node); end
- def eligible_node?(node); end
- def eligible_receiver?(node); end
- def hash?(node); end
+ def build_bad_method(node); end
+ def build_good_method(node); end
+ def build_message(node); end
+ def correction_range(receiver, node); end
+end
+
+RuboCop::Cop::Performance::ReverseFirst::MSG = T.let(T.unsafe(nil), String)
+
+class RuboCop::Cop::Performance::Size < ::RuboCop::Cop::Cop
+ def array?(node = _); end
+ def autocorrect(node); end
+ def count?(node = _); end
+ def hash?(node = _); end
+ def on_send(node); end
end
RuboCop::Cop::Performance::Size::MSG = T.let(T.unsafe(nil), String)
+class RuboCop::Cop::Performance::SortReverse < ::RuboCop::Cop::Cop
+ include(::RuboCop::Cop::RangeHelp)
+ include(::RuboCop::Cop::SortBlock)
+
+ def autocorrect(node); end
+ def on_block(node); end
+
+ private
+
+ def message(var_a, var_b); end
+end
+
+RuboCop::Cop::Performance::SortReverse::MSG = T.let(T.unsafe(nil), String)
+
+class RuboCop::Cop::Performance::Squeeze < ::RuboCop::Cop::Cop
+ def autocorrect(node); end
+ def on_send(node); end
+ def squeeze_candidate?(node = _); end
+
+ private
+
+ def repeating_literal?(regex_str); end
+end
+
+RuboCop::Cop::Performance::Squeeze::MSG = T.let(T.unsafe(nil), String)
+
+RuboCop::Cop::Performance::Squeeze::PREFERRED_METHODS = T.let(T.unsafe(nil), Hash)
+
class RuboCop::Cop::Performance::StartWith < ::RuboCop::Cop::Cop
include(::RuboCop::Cop::RegexpMetacharacter)
@@ -424,6 +541,19 @@ end
RuboCop::Cop::Performance::StartWith::MSG = T.let(T.unsafe(nil), String)
+class RuboCop::Cop::Performance::StringInclude < ::RuboCop::Cop::Cop
+ def autocorrect(node); end
+ def on_match_with_lvasgn(node); end
+ def on_send(node); end
+ def redundant_regex?(node = _); end
+
+ private
+
+ def literal?(regex_str); end
+end
+
+RuboCop::Cop::Performance::StringInclude::MSG = T.let(T.unsafe(nil), String)
+
class RuboCop::Cop::Performance::StringReplacement < ::RuboCop::Cop::Cop
include(::RuboCop::Cop::RangeHelp)
@@ -504,6 +634,18 @@ module RuboCop::Cop::RegexpMetacharacter
def safe_multiline?; end
end
+module RuboCop::Cop::SortBlock
+ include(::RuboCop::Cop::RangeHelp)
+ extend(::RuboCop::AST::NodePattern::Macros)
+
+ def replaceable_body?(node = _, param1, param2); end
+ def sort_with_block?(node = _); end
+
+ private
+
+ def sort_range(send, node); end
+end
+
RuboCop::NodePattern = RuboCop::AST::NodePattern
module RuboCop::Performance | true |
Other | Homebrew | brew | c8c8839ba27007cf166d9108c5986a02a3dbbfc9.json | sorbet: update hidden definitions
srb/tapioca: update rbi of recently bumped gems | Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi | @@ -5819,6 +5819,10 @@ class Cask::DSL::Container
def nested=(nested); end
+ def pairs(); end
+
+ def pairs=(pairs); end
+
def type(); end
def type=(type); end
@@ -19436,7 +19440,7 @@ module RuboCop::RSpec::ExpectOffense
def expect_no_offenses(source, file=T.unsafe(nil)); end
- def expect_offense(source, file=T.unsafe(nil), **replacements); end
+ def expect_offense(source, file=T.unsafe(nil), severity: T.unsafe(nil), **replacements); end
def format_offense(source, **replacements); end
end
@@ -23216,6 +23220,8 @@ class URL
def scheme=(scheme); end
+ def specs(); end
+
def string(); end
def subdomain(); end
@@ -23234,6 +23240,8 @@ class URL
def trust_cert(); end
+ def uri(); end
+
def user_agent(); end
def using(); end | true |
Other | Homebrew | brew | 0d58d2a46cd76b7cf3d43239b4db551ced92ec87.json | srb/files: add new files. 13 errors => 14 errors. | Library/Homebrew/sorbet/files.yaml | @@ -861,6 +861,7 @@ true:
- ./cask/url.rb
- ./checksum.rb
- ./config.rb
+ - ./dev-cmd/sponsers.rb
- ./extend/cachable.rb
- ./extend/os/linux/development_tools.rb
- ./extend/os/linux/formula.rb
@@ -887,6 +888,7 @@ true:
- ./rubocops/cask/extend/string.rb
- ./rubocops/deprecate.rb
- ./tap_constants.rb
+ - ./test/dev-cmd/sponsers_spec.rb
- ./test/support/helper/fixtures.rb
- ./test/support/lib/config.rb
- ./utils/bottles.rb | false |
Other | Homebrew | brew | 76339916214396e9967b1c6bb8d906b2327b7a98.json | Remove exception handling in formula version vheck | Library/Homebrew/dev-cmd/bump.rb | @@ -71,8 +71,6 @@ def get_formula_details(formula_name)
def current_formula_version(formula)
formula.version.to_s
- rescue
- nil
end
def livecheck_formula(formula) | true |
Other | Homebrew | brew | 76339916214396e9967b1c6bb8d906b2327b7a98.json | Remove exception handling in formula version vheck | Library/Homebrew/utils/repology.rb | @@ -8,8 +8,7 @@ module Repology
MAX_PAGINATION = 15
def query_api(last_package_in_response = "")
- last_package_in_response += "/" unless last_package_in_response.blank?
-
+ last_package_in_response += "/" if last_package_in_response.present?
url = "https://repology.org/api/v1/projects/#{last_package_in_response}?inrepo=homebrew&outdated=1"
output, _errors, _status = curl_output(url.to_s) | true |
Other | Homebrew | brew | 56bde378f3732353be869e7f925002a4b3b2b525.json | remove integration tests | Library/Homebrew/test/cmd/install_spec.rb | @@ -17,26 +17,6 @@
expect(HOMEBREW_CELLAR/"testball1/0.1/foo/test").not_to be_a_file
end
- it "does not install formulae with forbidden license" do
- setup_test_formula "package_license"
-
- expect { brew "install", "package_license", "HOMEBREW_FORBIDDEN_LICENSES" => "0BSD MIT" }
- .to output("Error: package_license has a forbidden license 0BSD.\n").to_stderr
- .and not_to_output.to_stdout
- .and be_a_failure
- expect(HOMEBREW_CELLAR/"testball1/0.1/foo/test").not_to be_a_file
- end
-
- it "installs formulae if formulae license is not forbidden" do
- setup_test_formula "testball1"
-
- expect { brew "install", "testball1", "HOMEBREW_FORBIDDEN_LICENSES" => "AAK ADSL AML" }
- .to output(%r{#{HOMEBREW_CELLAR}/testball1/0\.1}).to_stdout
- .and not_to_output.to_stderr
- .and be_a_success
- expect(HOMEBREW_CELLAR/"testball1/0.1/foo/test").not_to be_a_file
- end
-
it "installs formulae with options" do
setup_test_formula "testball1"
| false |
Other | Homebrew | brew | c8554296125ad858ac1130e0ec5572007d67cb7a.json | Apply suggestions from code review
code review changes
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com> | docs/Manpage.md | @@ -1395,7 +1395,7 @@ Note that environment variables must have a value set to be detected. For exampl
*Default:* `15`.
* `HOMEBREW_FORBIDDEN_LICENSES`:
- Use this environment variable to define a blacklist of space separated licenses and Homebrew will avoid installing the packages with those licenses.
+ Use this environment variable to define a denylist of space separated licenses and Homebrew will refuse to install packages known to have those licenses.
* `HOMEBREW_FORCE_BREWED_CURL`:
If set, always use a Homebrew-installed `curl`(1) rather than the system version. Automatically set if the system version of `curl` is too old. | false |
Other | Homebrew | brew | 720a00e68ead46fe9669dc2fce355dbf2d3a0d09.json | formula_desc: handle `nil` first character. | Library/Homebrew/rubocops/formula_desc.rb | @@ -87,7 +87,7 @@ def autocorrect(node)
first_word = string_content(node).split.first
unless VALID_LOWERCASE_WORDS.include?(first_word)
first_char = first_word.to_s.chars.first
- correction.sub!(/^(['"]?)([a-z])/, "\\1#{first_char.upcase}")
+ correction.sub!(/^(['"]?)([a-z])/, "\\1#{first_char.upcase}") if first_char
end
correction.sub!(/^(['"]?)an?\s/i, "\\1")
correction.gsub!(/(ommand ?line)/i, "ommand-line") | false |
Other | Homebrew | brew | 300d7e4799ebb15eba35ae7e888a0185059df0fe.json | diagnostic: allow some uncommitted gems.
Until these feature flags are fully enabled/removed these will result
in uncommitted gems (which will block CI). | Library/Homebrew/diagnostic.rb | @@ -670,6 +670,11 @@ def check_git_status
end
next if status.blank?
+ # these will result in uncommitted gems.
+ if path == HOMEBREW_REPOSITORY
+ next if ENV["HOMEBREW_SORBET"] || ENV["HOMEBREW_PATCHELF_RB"]
+ end
+
message ||= ""
message += "\n" unless message.empty?
message += <<~EOS | false |
Other | Homebrew | brew | 559d0a91a28b40e6e2c6d2dcf00b14cfdf7989d4.json | Add CPU family ARMv8.3-A
Darwin 20 adds the CPU family `CPUFAMILY_ARM_VORTEX_TEMPEST`
(aka ARMv8.3-A), which is assigned the identifier of `0x07d34b9f`.
This is relevant for `SystemConfig` in Homebrew.
See also:
https://en.wikipedia.org/wiki/Comparison_of_ARMv8-A_cores | Library/Homebrew/extend/os/mac/hardware/cpu.rb | @@ -21,8 +21,6 @@ def type
end
def family
- return :dunno if arm?
-
case sysctl_int("hw.cpufamily")
when 0x73d67300 # Yonah: Core Solo/Duo
:core
@@ -48,6 +46,8 @@ def family
:kabylake
when 0x38435547 # Ice Lake
:icelake
+ when 0x07d34b9f # ARMv8.3-A (Vortex, Tempest)
+ :arm_vortex_tempest
else
:dunno
end | false |
Other | Homebrew | brew | eafc0a3af26ec75f279a92c9d8e459be0fd29011.json | replace each with find for clarity | Library/Homebrew/dev-cmd/bump.rb | @@ -38,12 +38,7 @@ def validate_and_format_packages(outdated_repology_packages)
next if repology_homebrew_repo.blank?
- latest_version = nil
-
- # identify latest version amongst repology repos
- repositories.each do |repo|
- latest_version = repo["version"] if repo["status"] == "newest"
- end
+ latest_version = repositories.find { |repo| repo["status"] == "newest" }["version"]
packages[repology_homebrew_repo["srcname"]] = format_package(repology_homebrew_repo["srcname"], latest_version)
end | false |
Other | Homebrew | brew | 5194d74c2142c5d0bd4671f2c5eddea821d58661.json | Remove versions module | Library/Homebrew/utils/versions.rb | @@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-module Versions
- module_function
-
- def current_formula_version(formula_name)
- Formula[formula_name].version.to_s.to_f
- rescue
- nil
- end
-
- def livecheck_formula(formula)
- ohai "Checking livecheck formula : #{formula}" if Homebrew.args.verbose?
-
- response = Utils.popen_read(HOMEBREW_BREW_FILE, "livecheck", formula, "--quiet").chomp
-
- parse_livecheck_response(response)
- end
-
- def parse_livecheck_response(response)
- output = response.delete(" ").split(/:|==>/)
-
- # eg: ["openclonk", "7.0", "8.1"]
- package_name, brew_version, latest_version = output
-
- {
- name: package_name,
- formula_version: brew_version,
- livecheck_version: latest_version,
- }
- end
-
- def fetch_pull_requests(query, tap_full_name, state: nil)
- GitHub.issues_for_formula(query, tap_full_name: tap_full_name, state: state).select do |pr|
- pr["html_url"].include?("/pull/") &&
- /(^|\s)#{Regexp.quote(query)}(:|\s|$)/i =~ pr["title"]
- end
- rescue GitHub::RateLimitExceededError => e
- opoo e.message
- []
- end
-
- def check_for_duplicate_pull_requests(formula, version)
- formula = Formula[formula]
- tap_full_name = formula.tap&.full_name
-
- # check for open requests
- pull_requests = fetch_pull_requests(formula.name, tap_full_name, state: "open")
-
- # if we haven't already found open requests, try for an exact match across all requests
- pull_requests = fetch_pull_requests("#{formula.name} #{version}", tap_full_name) if pull_requests.blank?
- return if pull_requests.blank?
-
- pull_requests.map { |pr| { title: pr["title"], url: pr["html_url"] } }
- end
-end | false |
Other | Homebrew | brew | 17ca7527f49f6f83ec57563a3f503cc81ea1cc50.json | formula: allow link_overwrite for old name too. | Library/Homebrew/formula.rb | @@ -1118,9 +1118,8 @@ def link_overwrite?(path)
rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
return false # this keg belongs to another formula
else
- # this keg belongs to another formula
- # but it is not an alias
- return false unless f.aliases.include? keg.name
+ # this keg belongs to another unrelated formula
+ return false unless (f.aliases + f.oldname).include?(keg.name)
end
end
to_check = path.relative_path_from(HOMEBREW_PREFIX).to_s | false |
Other | Homebrew | brew | d7149d1f76621ffb301c62292c09be8dbda9566f.json | Fix merge conflicts | Library/Homebrew/.rubocop.yml | @@ -2,12 +2,12 @@ inherit_from: ../.rubocop_rspec.yml
AllCops:
Include:
- - '**/*.rb'
- - 'Library/Homebrew/.simplecov'
+ - "**/*.rb"
+ - "Library/Homebrew/.simplecov"
Exclude:
- - 'bin/*'
- - '**/Casks/**/*'
- - '**/vendor/**/*'
+ - "bin/*"
+ - "**/Casks/**/*"
+ - "**/vendor/**/*"
# messes up system formatting for formulae but good for Homebrew/brew
Layout/ArgumentAlignment:
@@ -16,7 +16,7 @@ Layout/ArgumentAlignment:
# make rspec formatting more flexible
Layout/MultilineMethodCallIndentation:
Exclude:
- - '**/*_spec.rb'
+ - "**/*_spec.rb"
# so many of these in formulae but none in here
Lint/AmbiguousRegexpLiteral:
@@ -29,7 +29,7 @@ Lint/AssignmentInCondition:
# `formula do` uses nested method definitions
Lint/NestedMethodDefinition:
Exclude:
- - 'test/**/*'
+ - "test/**/*"
# so many of these in formulae but none in here
Lint/ParenthesesAsGroupedExpression:
@@ -47,7 +47,7 @@ Metrics/BlockLength:
Enabled: true
Max: 1100
Exclude:
- - 'test/formula_spec.rb'
+ - "test/formula_spec.rb"
Metrics/BlockNesting:
Enabled: true
Max: 5
@@ -70,35 +70,35 @@ Metrics/PerceivedComplexity:
# we won't change backward compatible predicate names
Naming/PredicateName:
Exclude:
- - 'compat/**/*'
+ - "compat/**/*"
# can't rename these
AllowedMethods: is_32_bit?, is_64_bit?
# allow those that are standard
# TODO: try to remove some of these
Naming/MethodParameterName:
AllowedNames:
- - '_'
- - 'a'
- - 'b'
- - 'cc'
- - 'c1'
- - 'c2'
- - 'd'
- - 'e'
- - 'f'
- - 'ff'
- - 'fn'
- - 'id'
- - 'io'
- - 'o'
- - 'p'
- - 'pr'
- - 'r'
- - 'rb'
- - 's'
- - 'to'
- - 'v'
+ - "_"
+ - "a"
+ - "b"
+ - "cc"
+ - "c1"
+ - "c2"
+ - "d"
+ - "e"
+ - "f"
+ - "ff"
+ - "fn"
+ - "id"
+ - "io"
+ - "o"
+ - "p"
+ - "pr"
+ - "r"
+ - "rb"
+ - "s"
+ - "to"
+ - "v"
# Avoid false positives on modifiers used on symbols of methods
# See https://github.com/rubocop-hq/rubocop/issues/5953
@@ -108,18 +108,18 @@ Style/AccessModifierDeclarations:
# make rspec formatting more flexible
Style/BlockDelimiters:
Exclude:
- - '**/*_spec.rb'
- - '**/shared_examples/**/*.rb'
+ - "**/*_spec.rb"
+ - "**/shared_examples/**/*.rb"
# document our public APIs
Style/Documentation:
Enabled: true
Include:
- - 'Library/Homebrew/formula.rb'
+ - "Library/Homebrew/formula.rb"
Style/DocumentationMethod:
Enabled: true
Include:
- - 'Library/Homebrew/formula.rb'
+ - "Library/Homebrew/formula.rb"
# don't want this for formulae but re-enabled for Library/Homebrew
Style/FrozenStringLiteralComment: | true |
Other | Homebrew | brew | d7149d1f76621ffb301c62292c09be8dbda9566f.json | Fix merge conflicts | Library/Homebrew/dev-cmd/bump-formula-pr.rb | @@ -314,7 +314,7 @@ def bump_formula_pr
new_formula_version = formula_version(formula, requested_spec, new_contents)
- check_for_duplicate_pull_requests(formula, tap_full_name, new_formula_version.to_s)
+ GitHub.check_for_duplicate_pull_requests(formula, tap_full_name, new_formula_version.to_s, args)
if !new_mirrors && !formula_spec.mirrors.empty?
if args.force?
@@ -469,41 +469,6 @@ def formula_version(formula, spec, contents = nil)
end
end
- def fetch_pull_requests(query, tap_full_name, state: nil)
- GitHub.issues_for_formula(query, tap_full_name: tap_full_name, state: state).select do |pr|
- pr["html_url"].include?("/pull/") &&
- /(^|\s)#{Regexp.quote(query)}(:|\s|$)/i =~ pr["title"]
- end
- rescue GitHub::RateLimitExceededError => e
- opoo e.message
- []
- end
-
- def check_for_duplicate_pull_requests(formula, tap_full_name, version)
- # check for open requests
- pull_requests = fetch_pull_requests(formula.name, tap_full_name, state: "open")
-
- # if we haven't already found open requests, try for an exact match across all requests
- pull_requests = fetch_pull_requests("#{formula.name} #{version}", tap_full_name) if pull_requests.blank?
- return if pull_requests.blank?
-
- duplicates_message = <<~EOS
- These pull requests may be duplicates:
- #{pull_requests.map { |pr| "#{pr["title"]} #{pr["html_url"]}" }.join("\n")}
- EOS
- error_message = "Duplicate PRs should not be opened. Use --force to override this error."
- if args.force? && !args.quiet?
- opoo duplicates_message
- elsif !args.force? && args.quiet?
- odie error_message
- elsif !args.force?
- odie <<~EOS
- #{duplicates_message.chomp}
- #{error_message}
- EOS
- end
- end
-
def alias_update_pair(formula, new_formula_version)
versioned_alias = formula.aliases.grep(/^.*@\d+(\.\d+)?$/).first
return if versioned_alias.nil? | true |
Other | Homebrew | brew | d7149d1f76621ffb301c62292c09be8dbda9566f.json | Fix merge conflicts | Library/Homebrew/dev-cmd/bump.rb | @@ -12,18 +12,94 @@ def bump_args
Display out-of-date brew formulae, the latest version available, and whether a pull request has been opened.
EOS
+ switch :verbose
+ switch :debug
end
end
def bump
bump_args.parse
- outdated_repology_packages = RepologyParser.parse_api_response
- outdated_packages = RepologyParser.validate_and_format_packages(outdated_repology_packages)
+ outdated_repology_packages = Repology.parse_api_response
+ outdated_packages = validate_and_format_packages(outdated_repology_packages)
display(outdated_packages)
end
+ def validate_and_format_packages(outdated_repology_packages)
+ ohai "Verifying outdated repology packages as Homebrew Formulae"
+
+ packages = {}
+ outdated_repology_packages.each do |_name, repositories|
+ # identify homebrew repo
+ repology_homebrew_repo = repositories.find do |repo|
+ repo["repo"] == "homebrew"
+ end
+
+ next if repology_homebrew_repo.empty?
+
+ latest_version = nil
+
+ # identify latest version amongst repology repos
+ repositories.each do |repo|
+ latest_version = repo["version"] if repo["status"] == "newest"
+ end
+
+ packages[repology_homebrew_repo["srcname"]] = format_package(repology_homebrew_repo["srcname"], latest_version)
+ end
+ packages
+ end
+
+ def format_package(package_name, latest_version)
+ formula = get_formula_details(package_name)
+ return if formula.nil?
+
+ tap_full_name = formula.tap&.full_name
+ current_version = current_formula_version(formula)
+ livecheck_response = livecheck_formula(package_name)
+ pull_requests = GitHub.check_for_duplicate_pull_requests(formula, tap_full_name, latest_version, args, true)
+
+ {
+ repology_latest_version: latest_version,
+ current_formula_version: current_version.to_s,
+ livecheck_latest_version: livecheck_response[:livecheck_version],
+ open_pull_requests: pull_requests,
+ }
+ end
+
+ def get_formula_details(formula_name)
+ Formula[formula_name]
+ rescue
+ nil
+ end
+
+ def current_formula_version(formula)
+ formula.version.to_s
+ rescue
+ nil
+ end
+
+ def livecheck_formula(formula)
+ ohai "Checking livecheck formula: #{formula}" if Homebrew.args.verbose?
+
+ response = Utils.popen_read(HOMEBREW_BREW_FILE, "livecheck", formula, "--quiet").chomp
+
+ parse_livecheck_response(response)
+ end
+
+ def parse_livecheck_response(response)
+ output = response.delete(" ").split(/:|==>/)
+
+ # eg: ["openclonk", "7.0", "8.1"]
+ package_name, brew_version, latest_version = output
+
+ {
+ name: package_name,
+ formula_version: brew_version,
+ livecheck_version: latest_version,
+ }
+ end
+
def display(outdated_packages)
ohai "Outdated Formulae\n"
| true |
Other | Homebrew | brew | d7149d1f76621ffb301c62292c09be8dbda9566f.json | Fix merge conflicts | Library/Homebrew/utils.rb | @@ -10,6 +10,7 @@
require "utils/inreplace"
require "utils/link"
require "utils/popen"
+require "utils/repology"
require "utils/svn"
require "utils/tty"
require "utils/repology" | true |
Other | Homebrew | brew | d7149d1f76621ffb301c62292c09be8dbda9566f.json | Fix merge conflicts | Library/Homebrew/utils/github.rb | @@ -337,6 +337,43 @@ def print_pull_requests_matching(query)
prs.each { |i| puts "#{i["title"]} (#{i["html_url"]})" }
end
+ def fetch_pull_requests(query, tap_full_name, state: nil)
+ issues_for_formula(query, tap_full_name: tap_full_name, state: state).select do |pr|
+ pr["html_url"].include?("/pull/") &&
+ /(^|\s)#{Regexp.quote(query)}(:|\s|$)/i =~ pr["title"]
+ end
+ rescue GitHub::RateLimitExceededError => e
+ opoo e.message
+ []
+ end
+
+ def check_for_duplicate_pull_requests(formula, tap_full_name, version, args, fetch_pr = false)
+ # check for open requests
+ pull_requests = fetch_pull_requests(formula.name, tap_full_name, state: "open")
+
+ # if we haven't already found open requests, try for an exact match across all requests
+ pull_requests = fetch_pull_requests("#{formula.name} #{version}", tap_full_name) if pull_requests.blank?
+ return if pull_requests.blank?
+
+ return pull_requests.map { |pr| { title: pr["title"], url: pr["html_url"] } } if fetch_pr
+
+ duplicates_message = <<~EOS
+ These pull requests may be duplicates:
+ #{pull_requests.map { |pr| "#{pr["title"]} #{pr["html_url"]}" }.join("\n")}
+ EOS
+ error_message = "Duplicate PRs should not be opened. Use --force to override this error."
+ if args.force? && !args.quiet?
+ opoo duplicates_message
+ elsif !args.force? && args.quiet?
+ odie error_message
+ elsif !args.force?
+ odie <<~EOS
+ #{duplicates_message.chomp}
+ #{error_message}
+ EOS
+ end
+ end
+
def create_fork(repo)
url = "#{API_URL}/repos/#{repo}/forks"
data = {} | true |
Other | Homebrew | brew | d7149d1f76621ffb301c62292c09be8dbda9566f.json | Fix merge conflicts | Library/Homebrew/utils/repology.rb | @@ -1,11 +1,8 @@
# frozen_string_literal: true
require "utils/curl"
-require "utils/versions"
-require "formula_info"
-
-module RepologyParser
+module Repology
module_function
MAX_PAGINATION = 15
@@ -14,7 +11,6 @@ def query_api(last_package_in_response = "")
last_package_in_response += "/" unless last_package_in_response.empty?
url = "https://repology.org/api/v1/projects/#{last_package_in_response}?inrepo=homebrew&outdated=1"
- ohai "Calling API #{url}" if Homebrew.args.verbose?
output, _errors, _status = curl_output(url.to_s)
JSON.parse(output)
@@ -29,7 +25,7 @@ def parse_api_response
page_no = 1
while response_size > 1 && page_no <= MAX_PAGINATION
- ohai "Paginating Repology api page: #{page_no}" if Homebrew.args.verbose?
+ ohai "Paginating Repology api page: #{page_no}" if Homebrew.args.debug?
last_package_in_response = outdated_packages.keys[last_package_index]
response = query_api(last_package_in_response)
@@ -44,41 +40,4 @@ def parse_api_response
outdated_packages
end
-
- def validate_and_format_packages(outdated_repology_packages)
- ohai "Verifying outdated repology packages as Homebrew Formulae"
-
- packages = {}
- outdated_repology_packages.each do |_name, repositories|
- # identify homebrew repo
- repology_homebrew_repo = repositories.find do |repo|
- repo["repo"] == "homebrew"
- end
-
- next if repology_homebrew_repo.empty?
-
- latest_version = nil
-
- # identify latest version amongst repology repos
- repositories.each do |repo|
- latest_version = repo["version"] if repo["status"] == "newest"
- end
-
- packages[repology_homebrew_repo["srcname"]] = format_package(repology_homebrew_repo["srcname"], latest_version)
- end
- packages
- end
-
- def format_package(package_name, latest_version)
- current_version = Versions.current_formula_version(package_name)
- livecheck_response = Versions.livecheck_formula(package_name)
- pull_requests = Versions.check_for_duplicate_pull_requests(package_name, latest_version)
-
- {
- repology_latest_version: latest_version,
- current_formula_version: current_version.to_s,
- livecheck_latest_version: livecheck_response[:livecheck_version],
- open_pull_requests: pull_requests,
- }
- end
end | true |
Other | Homebrew | brew | 0786003fe9d3aef49e62b329d2ed7795d5f871cc.json | Add tests for autocorrect | Library/Homebrew/rubocops/lines.rb | @@ -267,7 +267,7 @@ def audit_formula(_node, _class_node, _parent_class_node, body_node)
shell_metacharacters = %w[> < < | ; : & * $ ? : ~ + @ !` ( ) [ ]]
find_every_method_call_by_name(body_node, :system).each do |method|
- # Continue if a shell metacharacter is present
+ # Only separate when no shell metacharacters are present
next if shell_metacharacters.any? { |meta| string_content(parameters(method).first).include?(meta) }
next unless match = regex_match_group(parameters(method).first, shell_cmd_with_spaces_regex)
@@ -281,7 +281,7 @@ def audit_formula(_node, _class_node, _parent_class_node, body_node)
find_instance_method_call(body_node, "Utils", command) do |method|
index = parameters(method).first.hash_type? ? 1 : 0
- # Continue if a shell metacharacter is present
+ # Only separate when no shell metacharacters are present
next if shell_metacharacters.any? { |meta| string_content(parameters(method)[index]).include?(meta) }
next unless match = regex_match_group(parameters(method)[index], shell_cmd_with_spaces_regex) | true |
Other | Homebrew | brew | 0786003fe9d3aef49e62b329d2ed7795d5f871cc.json | Add tests for autocorrect | Library/Homebrew/test/rubocops/lines_spec.rb | @@ -715,6 +715,111 @@ def install
end
RUBY
end
+
+ it "separates shell commands in system" do
+ source = <<~RUBY
+ class Foo < Formula
+ def install
+ system "foo bar"
+ end
+ end
+ RUBY
+
+ corrected_source = <<~RUBY
+ class Foo < Formula
+ def install
+ system "foo", "bar"
+ end
+ end
+ RUBY
+
+ new_source = autocorrect_source(source)
+ expect(new_source).to eq(corrected_source)
+ end
+
+ it "separates shell commands with string interpolation in system" do
+ source = <<~RUBY
+ class Foo < Formula
+ def install
+ system "\#{foo}/bar baz"
+ end
+ end
+ RUBY
+
+ corrected_source = <<~RUBY
+ class Foo < Formula
+ def install
+ system "\#{foo}/bar", "baz"
+ end
+ end
+ RUBY
+
+ new_source = autocorrect_source(source)
+ expect(new_source).to eq(corrected_source)
+ end
+
+ it "separates shell commands in Utils.popen_read" do
+ source = <<~RUBY
+ class Foo < Formula
+ def install
+ Utils.popen_read("foo bar")
+ end
+ end
+ RUBY
+
+ corrected_source = <<~RUBY
+ class Foo < Formula
+ def install
+ Utils.popen_read("foo", "bar")
+ end
+ end
+ RUBY
+
+ new_source = autocorrect_source(source)
+ expect(new_source).to eq(corrected_source)
+ end
+
+ it "separates shell commands with string interpolation in Utils.popen_read" do
+ source = <<~RUBY
+ class Foo < Formula
+ def install
+ Utils.popen_read("\#{foo}/bar baz")
+ end
+ end
+ RUBY
+
+ corrected_source = <<~RUBY
+ class Foo < Formula
+ def install
+ Utils.popen_read("\#{foo}/bar", "baz")
+ end
+ end
+ RUBY
+
+ new_source = autocorrect_source(source)
+ expect(new_source).to eq(corrected_source)
+ end
+
+ it "separates shell commands following a shell variable in Utils.popen_read" do
+ source = <<~RUBY
+ class Foo < Formula
+ def install
+ Utils.popen_read({ "SHELL" => "bash" }, "foo bar")
+ end
+ end
+ RUBY
+
+ corrected_source = <<~RUBY
+ class Foo < Formula
+ def install
+ Utils.popen_read({ "SHELL" => "bash" }, "foo", "bar")
+ end
+ end
+ RUBY
+
+ new_source = autocorrect_source(source)
+ expect(new_source).to eq(corrected_source)
+ end
end
end
| true |
Other | Homebrew | brew | df8d22a29b3dfb4313d0b983e92e6683f5df809f.json | Remove debugging markers (oops) | Library/Homebrew/cli/args.rb | @@ -246,21 +246,16 @@ def resolve_keg(name)
require "formula"
require "missing_formula"
- puts 1
raise UsageError if name.blank?
- puts 2
rack = Formulary.to_rack(name.downcase)
- puts 3
dirs = rack.directory? ? rack.subdirs : []
raise NoSuchKegError, rack.basename if dirs.empty?
- puts 4
linked_keg_ref = HOMEBREW_LINKED_KEGS/rack.basename
opt_prefix = HOMEBREW_PREFIX/"opt/#{rack.basename}"
- puts 5
begin
if opt_prefix.symlink? && opt_prefix.directory?
Keg.new(opt_prefix.resolved_path) | false |
Other | Homebrew | brew | 7f651de7befd2f447e3fdc9a9c13bff49ca4cb2d.json | Add completion configuration for non-Homebrew fish
Tested on Ubuntu 18.04 LTS | docs/Shell-Completion.md | @@ -54,4 +54,16 @@ Additionally, if you receive "zsh compinit: insecure directories" warnings when
## Configuring Completions in `fish`
-No configuration is needed in `fish`. Friendly!
+No configuration is needed if you're using Homebrew's `fish`. Friendly!
+
+If your `fish` is from somewhere else, add the following to your `~/.config/fish/config.fish`:
+
+```sh
+if test -d (brew --prefix)"/share/fish/completions"
+ set -g -x fish_complete_path $fish_complete_path (brew --prefix)/share/fish/completions
+end
+
+if test -d (brew --prefix)"/share/fish/vendor_completions.d"
+ set -g -x fish_complete_path $fish_complete_path (brew --prefix)/share/fish/vendor_completions.d
+end
+``` | false |
Other | Homebrew | brew | 3fb00315e7d15fac496c2922c49bab885f65a521.json | sorbet/files.yaml: add new files | Library/Homebrew/sorbet/files.yaml | @@ -168,6 +168,7 @@ false:
- ./dev-cmd/test.rb
- ./dev-cmd/tests.rb
- ./dev-cmd/unpack.rb
+ - ./dev-cmd/update-license-data.rb
- ./dev-cmd/update-test.rb
- ./dev-cmd/vendor-gems.rb
- ./development_tools.rb
@@ -185,6 +186,7 @@ false:
- ./extend/os/linux/hardware/cpu.rb
- ./extend/os/linux/install.rb
- ./extend/os/linux/keg_relocate.rb
+ - ./extend/os/linux/readall.rb
- ./extend/os/linux/requirements/osxfuse_requirement.rb
- ./extend/os/linux/system_config.rb
- ./extend/os/linux/tap.rb
@@ -348,6 +350,7 @@ false:
- ./test/dev-cmd/audit_spec.rb
- ./test/dev-cmd/create_spec.rb
- ./test/dev-cmd/extract_spec.rb
+ - ./test/dev-cmd/update-license-data_spec.rb
- ./test/diagnostic_checks_spec.rb
- ./test/download_strategies_spec.rb
- ./test/error_during_execution_spec.rb
@@ -443,6 +446,7 @@ false:
- ./unpack_strategy/xar.rb
- ./unpack_strategy/xz.rb
- ./unpack_strategy/zip.rb
+ - ./upgrade.rb
- ./utils.rb
- ./utils/analytics.rb
- ./utils/curl.rb
@@ -920,6 +924,7 @@ strict:
- ./extend/os/mac/formula_support.rb
- ./extend/os/missing_formula.rb
- ./extend/os/pathname.rb
+ - ./extend/os/readall.rb
- ./extend/os/requirements/java_requirement.rb
- ./extend/os/requirements/osxfuse_requirement.rb
- ./extend/os/requirements/x11_requirement.rb | false |
Other | Homebrew | brew | fe71d891538e59df3227fd0b4a5de08dfa80c598.json | replace puts with ohai | Library/Homebrew/dev-cmd/bump.rb | @@ -2,6 +2,7 @@
require "cli/parser"
require "utils/popen"
+require "utils/repology"
module Homebrew
module_function
@@ -26,15 +27,14 @@ def bump
end
def display(outdated_packages)
- ohai "Outdated Formulae"
+ ohai "Outdated Formulae\n"
outdated_packages.each do |formula, package_details|
- puts ""
- puts "Formula: #{formula}"
- puts "Current formula version: #{package_details["current_formula_version"]}"
- puts "Latest repology version: #{package_details["repology_latest_version"]}"
- puts "Latest livecheck version: #{package_details["livecheck_latest_version"]}"
- puts "Open pull requests: #{package_details["open_pull_requests"]}"
+ ohai formula
+ ohai "Current formula version: #{package_details["current_formula_version"]}"
+ ohai "Latest repology version: #{package_details["repology_latest_version"]}"
+ ohai "Latest livecheck version: #{package_details["livecheck_latest_version"]}"
+ ohai "Open pull requests: #{package_details["open_pull_requests"]}"
end
end
end | false |
Other | Homebrew | brew | ea2f4087febd3c9d67cb6013efa5f034a28ee3a2.json | Add livecheck version and duplicate pr check | Library/Homebrew/dev-cmd/bump.rb | @@ -1,6 +1,7 @@
# frozen_string_literal: true
require "cli/parser"
+require "utils/popen"
module Homebrew
module_function
@@ -9,6 +10,7 @@ def bump_args
Homebrew::CLI::Parser.new do
usage_banner <<~EOS
`bump`
+
Display out-of-date brew formulae, the latest version available, and whether a pull request has been opened.
EOS
end
@@ -18,6 +20,21 @@ def bump
bump_args.parse
outdated_repology_packages = RepologyParser.parse_api_response
- ohai RepologyParser.validate__packages(outdated_repology_packages)
+ outdated_packages = RepologyParser.validate_and_format_packages(outdated_repology_packages)
+
+ display(outdated_packages)
+ end
+
+ def display(outdated_packages)
+ ohai "Outdated Formulae"
+
+ outdated_packages.each do |formula, package_details|
+ puts ""
+ puts "Formula: #{formula}"
+ puts "Current formula version: #{package_details["current_formula_version"]}"
+ puts "Latest repology version: #{package_details["repology_latest_version"]}"
+ puts "Latest livecheck version: #{package_details["livecheck_latest_version"]}"
+ puts "Open pull requests: #{package_details["open_pull_requests"]}"
+ end
end
end | true |
Other | Homebrew | brew | ea2f4087febd3c9d67cb6013efa5f034a28ee3a2.json | Add livecheck version and duplicate pr check | Library/Homebrew/utils/livecheck.rb | @@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Livecheck
- def livecheck_formula_response(name)
- ohai "Checking livecheck formula : #{name}"
-
- response = Utils.popen_read("brew", "livecheck", name, "--quiet").chomp
- parse_livecheck_response(response)
- end
-
- def parse_livecheck_response(response)
- output = response.delete(" ").split(/:|==>/)
-
- # eg: ["burp", "2.2.18", "2.2.18"]
- package_name, brew_version, latest_version = output
-
- {
- name: package_name,
- formula_version: brew_version,
- livecheck_version: latest_version,
- }
- end
-end | true |
Other | Homebrew | brew | ea2f4087febd3c9d67cb6013efa5f034a28ee3a2.json | Add livecheck version and duplicate pr check | Library/Homebrew/utils/repology.rb | @@ -1,15 +1,15 @@
# frozen_string_literal: true
require "utils/curl"
+require "utils/versions"
+
require "formula_info"
module RepologyParser
module_function
- MAX_PAGE_LIMIT = 15
-
def query_api(last_package_in_response = "")
- url = "https://repology.org/api/v1/projects/#{last_package_in_response}/?inrepo=homebrew&outdated=1"
+ url = "https://repology.org/api/v1/projects/#{last_package_in_response}?inrepo=homebrew&outdated=1"
ohai "Calling API #{url}" if Homebrew.args.verbose?
output, _errors, _status = curl_output(url.to_s)
@@ -19,31 +19,32 @@ def query_api(last_package_in_response = "")
def parse_api_response
ohai "Querying outdated packages from Repology"
page_no = 1
- ohai "Paginating Repology api page: #{page_no}" if Homebrew.args.verbose?
+ ohai "Paginating repology api page: #{page_no}" if Homebrew.args.verbose?
outdated_packages = query_api
- last_package_index = outdated_packages.size - 1
+ last_pacakge_index = outdated_packages.size - 1
response_size = outdated_packages.size
+ page_limit = 15
- while response_size > 1 && page_no <= MAX_PAGE_LIMIT
+ while response_size > 1 && page_no <= page_limit
page_no += 1
- ohai "Paginating Repology api page: #{page_no}" if Homebrew.args.verbose?
+ ohai "Paginating repology api page: #{page_no}" if Homebrew.args.verbose?
- last_package_in_response = outdated_packages.keys[last_package_index]
- response = query_api(last_package_in_response)
+ last_package_in_response = outdated_packages.keys[last_pacakge_index]
+ response = query_api("#{last_package_in_response}/")
response_size = response.size
outdated_packages.merge!(response)
- last_package_index = outdated_packages.size - 1
+ last_pacakge_index = outdated_packages.size - 1
end
ohai "#{outdated_packages.size} outdated packages identified"
outdated_packages
end
- def validate__packages(outdated_repology_packages)
- ohai "Verifying outdated Repology packages as Homebrew Formulae"
+ def validate_and_format_packages(outdated_repology_packages)
+ ohai "Verifying outdated repology packages as Homebrew Formulae"
packages = {}
outdated_repology_packages.each do |_name, repositories|
@@ -61,18 +62,24 @@ def validate__packages(outdated_repology_packages)
latest_version = repo["version"] if repo["status"] == "newest"
end
- info = FormulaInfo.lookup(repology_homebrew_repo["srcname"])
- next unless info
-
- current_version = info.pkg_version
-
- packages[repology_homebrew_repo["srcname"]] = {
- "repology_latest_version" => latest_version,
- "current_formula_version" => current_version.to_s,
- }
- puts packages
+ packages[repology_homebrew_repo["srcname"]] = format_package(repology_homebrew_repo["srcname"], latest_version)
end
# hash of hashes {"aacgain"=>{"repology_latest_version"=>"1.9", "current_formula_version"=>"1.8"}, ...}
packages
end
+
+ def format_package(package_name, latest_version)
+ current_version = Versions.current_formula_version(package_name)
+ livecheck_response = Versions.livecheck_formula(package_name)
+ pull_requests = Versions.check_for_duplicate_pull_requests(package_name, latest_version)
+
+ formatted_package = {
+ "repology_latest_version" => latest_version,
+ "current_formula_version" => current_version.to_s,
+ "livecheck_latest_version" => livecheck_response["livecheck_latest_version"],
+ "open_pull_requests" => pull_requests,
+ }
+
+ formatted_package
+ end
end | true |
Other | Homebrew | brew | ea2f4087febd3c9d67cb6013efa5f034a28ee3a2.json | Add livecheck version and duplicate pr check | Library/Homebrew/utils/versions.rb | @@ -1,8 +1,8 @@
# frozen_string_literal: true
-require "formula"
-
module Versions
+ module_function
+
def current_formula_version(formula_name)
Formula[formula_name].version.to_s.to_f
end
@@ -12,10 +12,57 @@ def bump_formula_pr(formula_name, url)
formula_name, "--url=#{url}").chomp
end
- def check_for_open_pr(formula_name, download_url)
- ohai "- Checking for open PRs for formula : #{formula_name}"
+ def check_for_open_pr(formula_name)
+ # ohai "- Checking for open PRs for formula : #{formula_name}"
+
+ # response = bump_formula_pr(formula_name, download_url)
+ # !response.include? "Error: These open pull requests may be duplicates"
+
+ # check_for_duplicate_pull_requests(formula, tap_full_name, new_formula_version.to_s)
+ end
+
+ def livecheck_formula(formula)
+ ohai "Checking livecheck formula : #{formula}" if Homebrew.args.verbose?
+
+ response = Utils.popen_read(HOMEBREW_BREW_FILE, "livecheck", formula, "--quiet").chomp
+
+ parse_livecheck_response(response)
+ end
+
+ def parse_livecheck_response(response)
+ output = response.delete(" ").split(/:|==>/)
+
+ # eg: ["openclonk", "7.0", "8.1"]
+ package_name, brew_version, latest_version = output
+
+ {
+ "formula" => package_name,
+ "current_brew_version" => brew_version,
+ "livecheck_latest_version" => latest_version,
+ }
+ end
+
+ def fetch_pull_requests(query, tap_full_name, state: nil)
+ GitHub.issues_for_formula(query, tap_full_name: tap_full_name, state: state).select do |pr|
+ pr["html_url"].include?("/pull/") &&
+ /(^|\s)#{Regexp.quote(query)}(:|\s|$)/i =~ pr["title"]
+ end
+ rescue GitHub::RateLimitExceededError => e
+ opoo e.message
+ []
+ end
+
+ def check_for_duplicate_pull_requests(formula, version)
+ formula = Formula[formula]
+ tap_full_name = formula.tap&.full_name
+
+ # check for open requests
+ pull_requests = fetch_pull_requests(formula.name, tap_full_name, state: "open")
+
+ # if we haven't already found open requests, try for an exact match across all requests
+ pull_requests = fetch_pull_requests("#{formula.name} #{version}", tap_full_name) if pull_requests.blank?
+ return if pull_requests.blank?
- response = bump_formula_pr(formula_name, download_url)
- !response.include? "Error: These open pull requests may be duplicates"
+ pull_requests.map { |pr| { "title" => pr["title"], "url" => pr["html_url"] } }
end
end | true |
Other | Homebrew | brew | 170b38892a4e15cf2fadfd173814954a53c97fb4.json | Use CodeCov for coverage reporting. | .github/workflows/tests.yml | @@ -139,8 +139,7 @@ jobs:
HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# set variables for coverage reporting
- HOMEBREW_CI_NAME: github-actions
- HOMEBREW_COVERALLS_REPO_TOKEN: 3F6U6ZqctoNJwKyREremsqMgpU3qYgxFk
+ HOMEBREW_CODECOV_TOKEN: 3ea0364c-80ce-47a3-9fba-93a940d4b5d7
# These cannot be queried at the macOS level on GitHub Actions.
HOMEBREW_LANGUAGES: en-GB | true |
Other | Homebrew | brew | 170b38892a4e15cf2fadfd173814954a53c97fb4.json | Use CodeCov for coverage reporting. | .gitignore | @@ -86,7 +86,7 @@
**/vendor/bundle/ruby/*/gems/byebug-*/
**/vendor/bundle/ruby/*/gems/coderay-*/
**/vendor/bundle/ruby/*/gems/connection_pool-*/
-**/vendor/bundle/ruby/*/gems/coveralls-*/
+**/vendor/bundle/ruby/*/gems/codecov-*/
**/vendor/bundle/ruby/*/gems/diff-lcs-*/
**/vendor/bundle/ruby/*/gems/docile-*/
**/vendor/bundle/ruby/*/gems/domain_name-*/
@@ -127,11 +127,8 @@
**/vendor/bundle/ruby/*/gems/ruby-prof-*/
**/vendor/bundle/ruby/*/gems/ruby-progressbar-*/
**/vendor/bundle/ruby/*/gems/simplecov-*/
-**/vendor/bundle/ruby/*/gems/simplecov-cobertura-*/
**/vendor/bundle/ruby/*/gems/simplecov-html-*/
-**/vendor/bundle/ruby/*/gems/term-ansicolor-*/
-**/vendor/bundle/ruby/*/gems/thor-*/
-**/vendor/bundle/ruby/*/gems/tins-*/
+**/vendor/bundle/ruby/*/gems/url-*/
**/vendor/bundle/ruby/*/gems/unf_ext-*/
**/vendor/bundle/ruby/*/gems/unf-*/
**/vendor/bundle/ruby/*/gems/unicode-display_width-*/ | true |
Other | Homebrew | brew | 170b38892a4e15cf2fadfd173814954a53c97fb4.json | Use CodeCov for coverage reporting. | Library/Homebrew/.simplecov | @@ -1,4 +1,5 @@
#!/usr/bin/env ruby
+# frozen_string_literal: true
require "English"
@@ -20,7 +21,8 @@ SimpleCov.start do
# Just save result, but don't write formatted output.
coverage_result = Coverage.result
- SimpleCov.add_not_loaded_files(coverage_result)
+ # TODO: this method is private, find a better way.
+ SimpleCov.send(:add_not_loaded_files, coverage_result)
simplecov_result = SimpleCov::Result.new(coverage_result)
SimpleCov::ResultMerger.store_result(simplecov_result)
@@ -50,8 +52,8 @@ SimpleCov.start do
require "rbconfig"
host_os = RbConfig::CONFIG["host_os"]
- add_filter %r{/os/mac} if host_os !~ /darwin/
- add_filter %r{/os/linux} if host_os !~ /linux/
+ add_filter %r{/os/mac} unless /darwin/.match?(host_os)
+ add_filter %r{/os/linux} unless /linux/.match?(host_os)
# Add groups and the proper project name to the output.
project_name "Homebrew" | true |
Other | Homebrew | brew | 170b38892a4e15cf2fadfd173814954a53c97fb4.json | Use CodeCov for coverage reporting. | Library/Homebrew/Gemfile | @@ -4,7 +4,7 @@ source "https://rubygems.org"
# installed gems
gem "byebug"
-gem "coveralls", "~> 0.8", require: false
+gem "codecov", require: false
gem "parallel_tests"
gem "ronn", require: false
gem "rspec" | true |
Other | Homebrew | brew | 170b38892a4e15cf2fadfd173814954a53c97fb4.json | Use CodeCov for coverage reporting. | Library/Homebrew/Gemfile.lock | @@ -9,14 +9,12 @@ GEM
zeitwerk (~> 2.2, >= 2.2.2)
ast (2.4.1)
byebug (11.1.3)
+ codecov (0.1.17)
+ json
+ simplecov
+ url
concurrent-ruby (1.1.6)
connection_pool (2.2.3)
- coveralls (0.8.23)
- json (>= 1.8, < 3)
- simplecov (~> 0.16.1)
- term-ansicolor (~> 1.3)
- thor (>= 0.19.4, < 2.0)
- tins (~> 1.6)
diff-lcs (1.4.4)
docile (1.3.2)
domain_name (0.5.20190701)
@@ -99,24 +97,18 @@ GEM
rubocop (>= 0.68.1)
ruby-macho (2.2.0)
ruby-progressbar (1.10.1)
- simplecov (0.16.1)
+ simplecov (0.18.5)
docile (~> 1.1)
- json (>= 1.8, < 3)
- simplecov-html (~> 0.10.0)
- simplecov-html (0.10.2)
- sync (0.5.0)
- term-ansicolor (1.7.1)
- tins (~> 1.0)
- thor (1.0.1)
+ simplecov-html (~> 0.11)
+ simplecov-html (0.12.2)
thread_safe (0.3.6)
- tins (1.25.0)
- sync
tzinfo (1.2.7)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
+ url (0.3.2)
webrobots (0.1.2)
zeitwerk (2.3.1)
@@ -126,8 +118,8 @@ PLATFORMS
DEPENDENCIES
activesupport
byebug
+ codecov
concurrent-ruby
- coveralls (~> 0.8)
mechanize
parallel_tests
plist
@@ -143,4 +135,4 @@ DEPENDENCIES
simplecov
BUNDLED WITH
- 1.17.2
+ 1.17.3 | true |
Other | Homebrew | brew | 170b38892a4e15cf2fadfd173814954a53c97fb4.json | Use CodeCov for coverage reporting. | Library/Homebrew/test/spec_helper.rb | @@ -4,12 +4,10 @@
require "simplecov"
formatters = [SimpleCov::Formatter::HTMLFormatter]
- if ENV["HOMEBREW_COVERALLS_REPO_TOKEN"] && RUBY_PLATFORM[/darwin/]
- require "coveralls"
+ if ENV["HOMEBREW_CODECOV_TOKEN"] && RUBY_PLATFORM[/darwin/]
+ require "codecov"
- Coveralls::Output.no_color if !ENV["HOMEBREW_COLOR"] && (ENV["HOMEBREW_NO_COLOR"] || !$stdout.tty?)
-
- formatters << Coveralls::SimpleCov::Formatter
+ formatters << SimpleCov::Formatter::Codecov
if ENV["TEST_ENV_NUMBER"]
SimpleCov.at_exit do
@@ -18,16 +16,7 @@
end
end
- ENV["CI_NAME"] = ENV["HOMEBREW_CI_NAME"]
- ENV["COVERALLS_REPO_TOKEN"] = ENV["HOMEBREW_COVERALLS_REPO_TOKEN"]
-
- ENV["CI_BUILD_NUMBER"] = ENV["HOMEBREW_CI_BUILD_NUMBER"]
- ENV["CI_BRANCH"] = ENV["HOMEBREW_CI_BRANCH"]
- %r{refs/pull/(?<pr>\d+)/merge} =~ ENV["HOMEBREW_CI_BUILD_NUMBER"]
- ENV["CI_PULL_REQUEST"] = pr
- ENV["CI_BUILD_URL"] = "https://github.com/#{ENV["HOMEBREW_GITHUB_REPOSITORY"]}/pull/#{pr}/checks"
-
- ENV["CI_JOB_ID"] = ENV["TEST_ENV_NUMBER"] || "1"
+ ENV["CODECOV_TOKEN"] = ENV["HOMEBREW_CODECOV_TOKEN"]
end
SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(formatters) | true |
Other | Homebrew | brew | 433d3a327b60408c1eb1363168a3748deeec9045.json | docs/Common-Issues-for-Core-Contributors: add steps to fix failed bottle publish | docs/Common-Issues-for-Core-Contributors.md | @@ -6,6 +6,13 @@ This is a page for maintainers to diagnose certain build errors.
## Issues
+### Bottle publishes failed but the commits are correct in the git history
+
+Follow these steps to fix this issue:
+* `git reset --hard <SHA>` in homebrew/core to reset to the commit before before all the commits created by `brew pr-pull`.
+* `brew pr-pull <options>` to upload the right bottles. Add the `--warn-on-upload-failure` flag if the bottles have been partially uploaded and you're certain that the bottle checksums will match the checksums already present in the `bottle do` block of the formula.
+* `git reset --hard origin/master` to return to the latest commit and discard the commits made by `brew pr-pull`.
+
### `ld: internal error: atom not found in symbolIndex(__ZN10SQInstance3GetERK11SQObjectPtrRS0_) for architecture x86_64`
The exact atom may be different. | false |
Other | Homebrew | brew | e8f78878cb81c4dec14f7e1498ead71892502072.json | replace capture2e with Utils.popen | Library/Homebrew/utils/livecheck.rb | @@ -1,13 +1,10 @@
# frozen_string_literal: true
-require "open3"
-
module Livecheck
- def livecheck_formula_response(formula_name)
- ohai "Checking livecheck formula : #{formula_name}"
- command_args = ["brew", "livecheck", formula_name, "--quiet"]
+ def livecheck_formula_response(name)
+ ohai "Checking livecheck formula : #{name}"
- response = Open3.capture2e(*command_args)
+ response = Utils.popen_read("brew", "livecheck", name, "--quiet").chomp
parse_livecheck_response(response)
end
| true |
Other | Homebrew | brew | e8f78878cb81c4dec14f7e1498ead71892502072.json | replace capture2e with Utils.popen | Library/Homebrew/utils/versions.rb | @@ -1,6 +1,5 @@
# frozen_string_literal: true
-require "open3"
require "formula"
module Versions
@@ -9,10 +8,9 @@ def current_formula_version(formula_name)
end
def bump_formula_pr(formula_name, url)
- command_args = ["brew", "bump-formula-pr", "--no-browse",
- "--dry-run", formula_name, "--url=#{url}"]
+ response = Utils.popen_read("brew", "bump-formula-pr", "--no-browse",
+ "--dry-run", formula_name, "--url=#{url}").chomp
- response = Open3.capture2e(*command_args)
parse_formula_bump_response(response)
end
| true |
Other | Homebrew | brew | 732c6efa19663f69aad52677cbf41b181061dfd9.json | remove extraneous files | Library/Homebrew/dev-cmd/bump.rb | @@ -9,16 +9,15 @@ def bump_args
Homebrew::CLI::Parser.new do
usage_banner <<~EOS
`bump`
-
Display out-of-date brew formulae, the latest version available, and whether a pull request has been opened.
EOS
end
end
def bump
bump_args.parse
- # puts "command run"
- outdated_repology_pacakges = RepologyParser.parse_api_response()
- puts RepologyParser.validate__packages(outdated_repology_pacakges)
+
+ outdated_repology_packages = RepologyParser.parse_api_response
+ ohai RepologyParser.validate__packages(outdated_repology_packages)
end
end | true |
Other | Homebrew | brew | 732c6efa19663f69aad52677cbf41b181061dfd9.json | remove extraneous files | scripts/bumpFormulae.rb | @@ -1,20 +0,0 @@
-require_relative "helpers/parsed_file"
-require_relative "helpers/brew_commands.rb"
-
-brew_commands = BrewCommands.new
-
-parsed_file = ParsedFile.new
-outdated_pckgs_to_update = parsed_file.get_latest_file("data/outdated_pckgs_to_update")
-
-File.foreach(outdated_pckgs_to_update) do |line|
- line_hash = eval(line)
- puts "\n bumping package: #{line_hash['name']} formula"
-
- begin
- bump_pr_response, bump_pr_status = brew_commands.bump_formula_pr(line_hash["name"], line_hash["download_url"], line_hash["checksum"])
- puts "#{bump_pr_response}"
- rescue
- puts "- An error occured whilst bumping package #{line_hash["name"]} \n"
- return
- end
-end | true |
Other | Homebrew | brew | 732c6efa19663f69aad52677cbf41b181061dfd9.json | remove extraneous files | scripts/helpers/brew_commands.rb | @@ -1,54 +0,0 @@
-require "open3"
-
-class BrewCommands
-
- def livecheck_check_formula(formula_name)
- puts "- livecheck formula : #{formula_name}"
- command_args = [
- "brew",
- "livecheck",
- formula_name,
- "--quiet",
- ]
-
- response = Open3.capture2e(*command_args)
- self.parse_livecheck_response(response)
- end
-
- def parse_livecheck_response(livecheck_output)
- livecheck_output = livecheck_output.first.gsub(" ", "").split(/:|==>|\n/)
-
- # eg: ["burp", "2.2.18", "2.2.18"]
- package_name, brew_version, latest_version = livecheck_output
-
- {"name" => package_name, "current_brew_version" => brew_version, "livecheck_latest_version" => latest_version}
- end
-
- def bump_formula_pr(formula_name, url)
- command_args = [
- "brew",
- "bump-formula-pr",
- "--no-browse",
- "--dry-run",
- formula_name,
- "--url=#{url}",
- ]
-
- response = Open3.capture2e(*command_args)
- self.parse_formula_bump_response(response)
- end
-
- def parse_formula_bump_response(formula_bump_response)
- response, status = formula_bump_response
- response
- end
-
- def check_for_open_pr(formula_name, download_url)
- puts "- Checking for open PRs for formula : #{formula_name}"
-
- response = bump_formula_pr(formula_name, download_url)
-
- !response.include? "Error: These open pull requests may be duplicates"
- end
-
-end | true |
Other | Homebrew | brew | 732c6efa19663f69aad52677cbf41b181061dfd9.json | remove extraneous files | scripts/helpers/homebrew_formula.rb | @@ -1,27 +0,0 @@
-require "net/http"
-require "open-uri"
-
-class HomebrewFormula
-
- def generate_new_download_url(outdated_url, old_version, latest_version)
- if [outdated_url, old_version, latest_version].include? nil
- puts "\n- Could not generate download url"
- nil
- else
- puts "\n- Generating download url"
- outdated_url.gsub(old_version, latest_version)
- end
- end
-
- def generate_checksum(new_url)
- begin
- puts "- Generating checksum for url: #{new_url}"
- tempfile = URI.parse(new_url).open
- tempfile.close
- return Digest::SHA256.file(tempfile.path).hexdigest
- rescue
- puts "- Failed to generate Checksum \n"
- return nil
- end
- end
-end | true |
Other | Homebrew | brew | 732c6efa19663f69aad52677cbf41b181061dfd9.json | remove extraneous files | scripts/printPackageUpdates.rb | @@ -1,10 +0,0 @@
-require_relative "helpers/api_parser"
-
-api_parser = ApiParser.new
-
-outdated_repology_packages = api_parser.parse_repology_api()
-brew_formulas = api_parser.parse_homebrew_formulas()
-
-formatted_outdated_packages = api_parser.validate_packages(outdated_repology_packages, brew_formulas)
-
-api_parser.display_version_data(formatted_outdated_packages) | true |
Other | Homebrew | brew | 98f0d63c9510e930af255ef5e3abb0e7cf53e05f.json | remove unnecessary /scripts; feedback fixes | Library/Homebrew/utils/livecheck.rb | @@ -4,13 +4,8 @@
module Livecheck
def livecheck_formula_response(formula_name)
- ohai "- livecheck formula : #{formula_name}"
- command_args = [
- "brew",
- "livecheck",
- formula_name,
- "--quiet",
- ]
+ ohai "Checking livecheck formula : #{formula_name}"
+ command_args = ["brew", "livecheck", formula_name, "--quiet"]
response = Open3.capture2e(*command_args)
parse_livecheck_response(response)
@@ -22,7 +17,10 @@ def parse_livecheck_response(response)
# eg: ["burp", "2.2.18", "2.2.18"]
package_name, brew_version, latest_version = output
- { "name" => package_name, "current_brew_version" => brew_version,
- "livecheck_latest_version" => latest_version }
+ {
+ name: package_name,
+ formula_version: brew_version,
+ livecheck_version: latest_version,
+ }
end
end | true |
Other | Homebrew | brew | 98f0d63c9510e930af255ef5e3abb0e7cf53e05f.json | remove unnecessary /scripts; feedback fixes | Library/Homebrew/utils/repology.rb | @@ -6,34 +6,35 @@
module RepologyParser
module_function
+ MAX_PAGE_LIMIT = 15
+
def query_api(last_package_in_response = "")
- url = "https://repology.org/api/v1/projects/#{last_package_in_response}?inrepo=homebrew&outdated=1"
+ url = "https://repology.org/api/v1/projects/#{last_package_in_response}/?inrepo=homebrew&outdated=1"
ohai "Calling API #{url}" if Homebrew.args.verbose?
- output, errors, status = curl_output(url.to_s)
- output = JSON.parse(output)
+ output, _errors, _status = curl_output(url.to_s)
+ JSON.parse(output)
end
- def parse_api_response()
+ def parse_api_response
ohai "Querying outdated packages from Repology"
page_no = 1
- ohai "Paginating repology api page: #{page_no}" if Homebrew.args.verbose?
+ ohai "Paginating Repology api page: #{page_no}" if Homebrew.args.verbose?
- outdated_packages = query_api()
- last_pacakge_index = outdated_packages.size - 1
+ outdated_packages = query_api
+ last_package_index = outdated_packages.size - 1
response_size = outdated_packages.size
- page_limit = 15
- while response_size > 1 && page_no <= page_limit
+ while response_size > 1 && page_no <= MAX_PAGE_LIMIT
page_no += 1
- ohai "Paginating repology api page: #{page_no}" if Homebrew.args.verbose?
+ ohai "Paginating Repology api page: #{page_no}" if Homebrew.args.verbose?
- last_package_in_response = outdated_packages.keys[last_pacakge_index]
- response = query_api("#{last_package_in_response}/")
+ last_package_in_response = outdated_packages.keys[last_package_index]
+ response = query_api(last_package_in_response)
response_size = response.size
outdated_packages.merge!(response)
- last_pacakge_index = outdated_packages.size - 1
+ last_package_index = outdated_packages.size - 1
end
ohai "#{outdated_packages.size} outdated packages identified"
@@ -42,7 +43,7 @@ def parse_api_response()
end
def validate__packages(outdated_repology_packages)
- ohai "Verifying outdated repology packages as Homebrew Formulae"
+ ohai "Verifying outdated Repology packages as Homebrew Formulae"
packages = {}
outdated_repology_packages.each do |_name, repositories|
@@ -52,6 +53,7 @@ def validate__packages(outdated_repology_packages)
end
next if repology_homebrew_repo.empty?
+
latest_version = nil
# identify latest version amongst repology repos
@@ -61,13 +63,14 @@ def validate__packages(outdated_repology_packages)
info = FormulaInfo.lookup(repology_homebrew_repo["srcname"])
next unless info
+
current_version = info.pkg_version
-
+
packages[repology_homebrew_repo["srcname"]] = {
"repology_latest_version" => latest_version,
- "current_formula_version" => current_version.to_s
+ "current_formula_version" => current_version.to_s,
}
- puts packages
+ puts packages
end
# hash of hashes {"aacgain"=>{"repology_latest_version"=>"1.9", "current_formula_version"=>"1.8"}, ...}
packages | true |
Other | Homebrew | brew | 98f0d63c9510e930af255ef5e3abb0e7cf53e05f.json | remove unnecessary /scripts; feedback fixes | Library/Homebrew/utils/versions.rb | @@ -9,14 +9,8 @@ def current_formula_version(formula_name)
end
def bump_formula_pr(formula_name, url)
- command_args = [
- "brew",
- "bump-formula-pr",
- "--no-browse",
- "--dry-run",
- formula_name,
- "--url=#{url}",
- ]
+ command_args = ["brew", "bump-formula-pr", "--no-browse",
+ "--dry-run", formula_name, "--url=#{url}"]
response = Open3.capture2e(*command_args)
parse_formula_bump_response(response) | true |
Other | Homebrew | brew | 21c903c133bffca1204766d108d808f34358bb78.json | pr-pull, pr-upload: use safe_system to call brew | Library/Homebrew/dev-cmd/pr-pull.rb | @@ -260,7 +260,7 @@ def pr_pull
upload_args << "--dry-run" if args.dry_run?
upload_args << "--root_url=#{args.root_url}" if args.root_url
upload_args << "--bintray-org=#{bintray_org}"
- system HOMEBREW_BREW_FILE, *upload_args
+ safe_system HOMEBREW_BREW_FILE, *upload_args
end
end
end | true |
Other | Homebrew | brew | 21c903c133bffca1204766d108d808f34358bb78.json | pr-pull, pr-upload: use safe_system to call brew | Library/Homebrew/dev-cmd/pr-upload.rb | @@ -42,7 +42,7 @@ def pr_upload
if args.dry_run?
puts "brew #{bottle_args.join " "}"
else
- system HOMEBREW_BREW_FILE, *bottle_args
+ safe_system HOMEBREW_BREW_FILE, *bottle_args
end
if args.dry_run? | true |
Other | Homebrew | brew | a721d7bc8f3012deff33ec1fb1e59e5574b52540.json | Remove outdated suggestions from Formula#test doc | Library/Homebrew/formula.rb | @@ -2648,9 +2648,13 @@ def needs(*standards)
#
# The block will create, run in and delete a temporary directory.
#
- # We are fine if the executable does not error out, so we know linking
- # and building the software was OK.
- # <pre>system bin/"foobar", "--version"</pre>
+ # We want tests that don't require any user input
+ # and test the basic functionality of the application.
+ # For example foo build-foo input.foo is a good test
+ # and foo --version and foo --help are bad tests.
+ # However, a bad test is better than no test at all.
+ #
+ # See: https://docs.brew.sh/Formula-Cookbook#add-a-test-to-the-formula
#
# <pre>(testpath/"test.file").write <<~EOS
# writing some test file, if you need to | false |
Other | Homebrew | brew | 32656502796910d573b1788ba10ab90187abf231.json | Update Repology parser and bump command | Library/Homebrew/dev-cmd/bump.rb | @@ -17,7 +17,8 @@ def bump_args
def bump
bump_args.parse
- puts "command run"
- # parse_repology_api()
+ # puts "command run"
+ outdated_repology_pacakges = RepologyParser.parse_api_response()
+ puts RepologyParser.validate__packages(outdated_repology_pacakges)
end
end | true |
Other | Homebrew | brew | 32656502796910d573b1788ba10ab90187abf231.json | Update Repology parser and bump command | Library/Homebrew/utils/livecheck.rb | @@ -4,24 +4,25 @@
module Livecheck
def livecheck_formula_response(formula_name)
- puts "- livecheck formula : #{formula_name}"
+ ohai "- livecheck formula : #{formula_name}"
command_args = [
"brew",
"livecheck",
formula_name,
- "--quiet"
+ "--quiet",
]
response = Open3.capture2e(*command_args)
parse_livecheck_response(response)
end
def parse_livecheck_response(response)
- output = response.first.gsub(' ', '').split(/:|==>|\n/)
+ output = response.first.delete(" ").split(/:|==>|\n/)
# eg: ["burp", "2.2.18", "2.2.18"]
package_name, brew_version, latest_version = output
- {'name' => package_name, 'current_brew_version' => brew_version, 'livecheck_latest_version' => latest_version}
+ { "name" => package_name, "current_brew_version" => brew_version,
+ "livecheck_latest_version" => latest_version }
end
end | true |
Other | Homebrew | brew | 32656502796910d573b1788ba10ab90187abf231.json | Update Repology parser and bump command | Library/Homebrew/utils/repology.rb | @@ -1,47 +1,75 @@
# frozen_string_literal: true
-require "net/http"
-require "json"
+require "utils/curl"
+require "formula_info"
module RepologyParser
- def call_api(url)
- puts "- Calling API #{url}"
- uri = URI(url)
- response = Net::HTTP.get(uri)
+ module_function
- puts "- Parsing response"
- JSON.parse(response)
- end
-
- def query_repology_api(last_package_in_response = "")
+ def query_api(last_package_in_response = "")
url = "https://repology.org/api/v1/projects/#{last_package_in_response}?inrepo=homebrew&outdated=1"
+ ohai "Calling API #{url}" if Homebrew.args.verbose?
- call_api(url)
+ output, errors, status = curl_output(url.to_s)
+ output = JSON.parse(output)
end
- def parse_repology_api
- puts "\n-------- Query outdated packages from Repology --------"
+ def parse_api_response()
+ ohai "Querying outdated packages from Repology"
page_no = 1
- puts "\n- Paginating repology api page: #{page_no}"
+ ohai "Paginating repology api page: #{page_no}" if Homebrew.args.verbose?
- outdated_packages = query_repology_api("")
+ outdated_packages = query_api()
last_pacakge_index = outdated_packages.size - 1
response_size = outdated_packages.size
+ page_limit = 15
- while response_size > 1
+ while response_size > 1 && page_no <= page_limit
page_no += 1
- puts "\n- Paginating repology api page: #{page_no}"
+ ohai "Paginating repology api page: #{page_no}" if Homebrew.args.verbose?
last_package_in_response = outdated_packages.keys[last_pacakge_index]
- response = query_repology_api("#{last_package_in_response}/")
+ response = query_api("#{last_package_in_response}/")
response_size = response.size
outdated_packages.merge!(response)
last_pacakge_index = outdated_packages.size - 1
end
- puts "\n- #{outdated_packages.size} outdated packages identified by repology"
+ ohai "#{outdated_packages.size} outdated packages identified"
outdated_packages
end
+
+ def validate__packages(outdated_repology_packages)
+ ohai "Verifying outdated repology packages as Homebrew Formulae"
+
+ packages = {}
+ outdated_repology_packages.each do |_name, repositories|
+ # identify homebrew repo
+ repology_homebrew_repo = repositories.find do |repo|
+ repo["repo"] == "homebrew"
+ end
+
+ next if repology_homebrew_repo.empty?
+ latest_version = nil
+
+ # identify latest version amongst repology repos
+ repositories.each do |repo|
+ latest_version = repo["version"] if repo["status"] == "newest"
+ end
+
+ info = FormulaInfo.lookup(repology_homebrew_repo["srcname"])
+ next unless info
+ current_version = info.pkg_version
+
+ packages[repology_homebrew_repo["srcname"]] = {
+ "repology_latest_version" => latest_version,
+ "current_formula_version" => current_version.to_s
+ }
+ puts packages
+ end
+ # hash of hashes {"aacgain"=>{"repology_latest_version"=>"1.9", "current_formula_version"=>"1.8"}, ...}
+ packages
+ end
end | true |
Other | Homebrew | brew | 32656502796910d573b1788ba10ab90187abf231.json | Update Repology parser and bump command | Library/Homebrew/utils/versions.rb | @@ -22,15 +22,15 @@ def bump_formula_pr(formula_name, url)
parse_formula_bump_response(response)
end
- def parse_formula_bump_response(response)
- response, status = formula_bump_response
+ def parse_formula_bump_response(formula_bump_response)
+ response, _status = formula_bump_response
response
end
def check_for_open_pr(formula_name, download_url)
- puts "- Checking for open PRs for formula : #{formula_name}"
+ ohai "- Checking for open PRs for formula : #{formula_name}"
response = bump_formula_pr(formula_name, download_url)
- !response.include? 'Error: These open pull requests may be duplicates'
+ !response.include? "Error: These open pull requests may be duplicates"
end
end | true |
Other | Homebrew | brew | 32656502796910d573b1788ba10ab90187abf231.json | Update Repology parser and bump command | scripts/README.md | @@ -1,47 +0,0 @@
-# 0.0.1-API-Parser
-
-Parser for fixing this: https://github.com/Homebrew/brew/issues/5725
-
-## Overview
-
-Homebrew is used to install software (packages). Homebrew uses 'formulae' to determine how a package is installed.
-This project will automatically check which packages have had newer versions released, whether the package has an open PR on homebrew, and display the results.
-
-## High-level Solution
-
-- Fetch latest package version information from [repology.org](https://repology.org/) and store on file system.
-- Fetch Homebrew Formulae information from [HomeBrew Formulae](https://formulae.brew.sh)
-- Compare Current Homebrew Formulae version numbers and those coming from Repology's API and Livecheck.
-- Determine whether package has open PR.
-- Display results.
-
-## Details
-
-- This project can be run automatically at set intervals via GitHub Actions.
-- Executing `ruby printPackageUpdates.rb` from the command line will query
- both the Repology and Homebrew APIs. Homebrew's current version of each
- package will be compared to the latest version of the package, per Repology's response.
-- Homebrew's livecheck is also queried for each package, and that data is parsed, if available.
-- Checks whether there is open PR for package.
-- Each outdated package will be displayed to the console like so:
-- Note that some packages will not be included in the Livecheck response. Those will have a 'Livecheck latest:' value of 'Not found'.
-
-```
-Package: openclonk
-Brew current: 7.0
-Repology latest: 8.1
-Livecheck latest: 8.1
-Has Open PR?: true
-
-Package: openjdk
-Brew current: 13.0.2+8
-Repology latest: 15.0.0.0~14
-Livecheck latest: Not found.
-Has Open PR?: false
-
-Package: opentsdb
-Brew current: 2.3.1
-Repology latest: 2.4.0
-Livecheck latest: 2.4.0
-Has Open PR?: true
-``` | true |
Other | Homebrew | brew | 32656502796910d573b1788ba10ab90187abf231.json | Update Repology parser and bump command | scripts/bumpFormulae.rb | @@ -1,5 +1,5 @@
-require_relative 'helpers/parsed_file'
-require_relative 'helpers/brew_commands.rb'
+require_relative "helpers/parsed_file"
+require_relative "helpers/brew_commands.rb"
brew_commands = BrewCommands.new
@@ -11,10 +11,10 @@
puts "\n bumping package: #{line_hash['name']} formula"
begin
- bump_pr_response, bump_pr_status = brew_commands.bump_formula_pr(line_hash['name'], line_hash['download_url'], line_hash['checksum'])
+ bump_pr_response, bump_pr_status = brew_commands.bump_formula_pr(line_hash["name"], line_hash["download_url"], line_hash["checksum"])
puts "#{bump_pr_response}"
rescue
- puts "- An error occured whilst bumping package #{line_hash['name']} \n"
+ puts "- An error occured whilst bumping package #{line_hash["name"]} \n"
return
end
end | true |
Other | Homebrew | brew | 32656502796910d573b1788ba10ab90187abf231.json | Update Repology parser and bump command | scripts/helpers/api_parser.rb | @@ -1,133 +0,0 @@
-require 'net/http'
-require 'json'
-
-require_relative 'brew_commands'
-require_relative 'homebrew_formula'
-
-class ApiParser
- def call_api(url)
- puts "- Calling API #{url}"
- uri = URI(url)
- response = Net::HTTP.get(uri)
-
- puts "- Parsing response"
- JSON.parse(response)
- end
-
- def query_repology_api(last_package_in_response = '')
- url = 'https://repology.org/api/v1/projects/' + last_package_in_response + '?inrepo=homebrew&outdated=1'
-
- self.call_api(url)
- end
-
- def parse_repology_api()
- puts "\n-------- Query outdated packages from Repology --------"
- page_no = 1
- puts "\n- Paginating repology api page: #{page_no}"
-
- outdated_packages = self.query_repology_api('')
- last_pacakge_index = outdated_packages.size - 1
- response_size = outdated_packages.size
-
- while response_size > 1 do
- page_no += 1
- puts "\n- Paginating repology api page: #{page_no}"
-
- last_package_in_response = outdated_packages.keys[last_pacakge_index]
- response = self.query_repology_api("#{last_package_in_response}/")
-
- response_size = response.size
- outdated_packages.merge!(response)
- last_pacakge_index = outdated_packages.size - 1
- end
-
- puts "\n- #{outdated_packages.size} outdated pacakges identified by repology"
- outdated_packages
- end
-
- def query_homebrew
- puts "\n-------- Get Homebrew Formulas --------"
- self.call_api('https://formulae.brew.sh/api/formula.json')
- end
-
- def parse_homebrew_formulas()
- formulas = self.query_homebrew()
- parsed_homebrew_formulas = {}
-
- formulas.each do |formula|
- parsed_homebrew_formulas[formula['name']] = {
- "fullname" => formula["full_name"],
- "oldname" => formula["oldname"],
- "version" => formula["versions"]['stable'],
- "download_url" => formula["urls"]['stable']['url'],
- }
- end
-
- parsed_homebrew_formulas
- end
-
- def validate_packages(outdated_repology_packages, brew_formulas)
- puts "\n-------- Verify Outdated Repology packages as Homebrew Formulas --------"
- packages = {}
-
- outdated_repology_packages.each do |package_name, repo_using_package|
- # Identify homebrew repo
- repology_homebrew_repo = repo_using_package.select { |repo| repo['repo'] == 'homebrew' }[0]
- next if repology_homebrew_repo.empty?
-
- latest_version = nil
-
- # Identify latest version amongst repos
- repo_using_package.each do |repo|
- latest_version = repo['version'] if repo['status'] == 'newest'
- end
-
- repology_homebrew_repo['latest_version'] = latest_version if latest_version
- homebrew_package_details = brew_formulas[repology_homebrew_repo['srcname']]
-
- # Format package
- packages[repology_homebrew_repo['srcname']] = format_package(homebrew_package_details, repology_homebrew_repo)
- end
-
- packages
- end
-
-
- def format_package(homebrew_details, repology_details)
- puts "- Formatting package: #{repology_details['srcname']}"
-
- homebrew_formula = HomebrewFormula.new
- new_download_url = homebrew_formula.generate_new_download_url(homebrew_details['download_url'], homebrew_details['version'], repology_details['latest_version'])
-
- brew_commands = BrewCommands.new
- livecheck_response = brew_commands.livecheck_check_formula(repology_details['srcname'])
- has_open_pr = brew_commands.check_for_open_pr(repology_details['srcname'], new_download_url)
-
- formatted_package = {
- 'fullname'=> homebrew_details['fullname'],
- 'repology_version' => repology_details['latest_version'],
- 'homebrew_version' => homebrew_details['version'],
- 'livecheck_latest_version' => livecheck_response['livecheck_latest_version'],
- 'current_download_url' => homebrew_details['download_url'],
- 'latest_download_url' => new_download_url,
- 'repology_latest_version' => repology_details['latest_version'],
- 'has_open_pr' => has_open_pr
- }
-
- formatted_package
- end
-
- def display_version_data(outdated_packages)
- puts "==============Formatted outdated packages============\n"
-
- outdated_packages.each do |package_name, package_details|
- puts ""
- puts "Package: #{package_name}"
- puts "Brew current: #{package_details['homebrew_version']}"
- puts "Repology latest: #{package_details['repology_version']}"
- puts "Livecheck latest: #{package_details['livecheck_latest_version']}"
- puts "Has Open PR?: #{package_details['has_open_pr']}"
- end
- end
-
-end | true |
Other | Homebrew | brew | 32656502796910d573b1788ba10ab90187abf231.json | Update Repology parser and bump command | scripts/helpers/brew_commands.rb | @@ -16,12 +16,12 @@ def livecheck_check_formula(formula_name)
end
def parse_livecheck_response(livecheck_output)
- livecheck_output = livecheck_output.first.gsub(' ', '').split(/:|==>|\n/)
+ livecheck_output = livecheck_output.first.gsub(" ", "").split(/:|==>|\n/)
# eg: ["burp", "2.2.18", "2.2.18"]
package_name, brew_version, latest_version = livecheck_output
- {'name' => package_name, 'current_brew_version' => brew_version, 'livecheck_latest_version' => latest_version}
+ {"name" => package_name, "current_brew_version" => brew_version, "livecheck_latest_version" => latest_version}
end
def bump_formula_pr(formula_name, url)
@@ -48,7 +48,7 @@ def check_for_open_pr(formula_name, download_url)
response = bump_formula_pr(formula_name, download_url)
- !response.include? 'Error: These open pull requests may be duplicates'
+ !response.include? "Error: These open pull requests may be duplicates"
end
end | true |
Other | Homebrew | brew | 32656502796910d573b1788ba10ab90187abf231.json | Update Repology parser and bump command | scripts/helpers/homebrew_formula.rb | @@ -1,5 +1,5 @@
-require 'net/http'
-require 'open-uri'
+require "net/http"
+require "open-uri"
class HomebrewFormula
| true |
Other | Homebrew | brew | 32656502796910d573b1788ba10ab90187abf231.json | Update Repology parser and bump command | scripts/helpers/parsed_file.rb | @@ -1,23 +0,0 @@
-require 'fileutils'
-
-class ParsedFile
-
- def get_latest_file(directory)
- puts "- retrieving latest file in directory: #{directory}"
- Dir.glob("#{directory}/*").max_by(1) {|f| File.mtime(f)}[0]
- end
-
- def save_to(directory, data)
- # Create directory if does not exist
- FileUtils.mkdir_p directory unless Dir.exists?(directory)
-
- puts "- Generating datetime stamp"
- #Include time to the filename for uniqueness when fetching multiple times a day
- date_time = Time.new.strftime("%Y-%m-%dT%H_%M_%S")
-
- # Writing parsed data to file
- puts "- Writing data to file"
- File.write("#{directory}/#{date_time}.txt", data)
- end
-
-end
\ No newline at end of file | true |
Other | Homebrew | brew | 32656502796910d573b1788ba10ab90187abf231.json | Update Repology parser and bump command | scripts/printPackageUpdates.rb | @@ -1,4 +1,4 @@
-require_relative 'helpers/api_parser'
+require_relative "helpers/api_parser"
api_parser = ApiParser.new
| true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.