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

Merge pull request #3953 from MikeMcQuaid/cleanup-formula-hash

Browse Source 
Formula#to_hash: cleanup method.
This commit is contained in:
Mike McQuaid 2018-03-21 15:37:01 +00:00 committed by GitHub
commit d9a51d924e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/formula.rb
View File

@ -1517,6 +1517,8 @@ class Formula
# @private # @private
def to_hash def to_hash
dependencies = deps
hsh = { hsh = {
"name" => name, "name" => name,
"full_name" => full_name, "full_name" => full_name,
@ -1526,21 +1528,21 @@ class Formula
"aliases" => aliases, "aliases" => aliases,
"versions" => { "versions" => {
"stable" => stable&.version&.to_s, "stable" => stable&.version&.to_s,
"bottle" => bottle ? true : false, "bottle" => !bottle.nil?,
"devel" => devel&.version&.to_s, "devel" => devel&.version&.to_s,
"head" => head&.version&.to_s, "head" => head&.version&.to_s,
}, },
"revision" => revision, "revision" => revision,
"version_scheme" => version_scheme, "version_scheme" => version_scheme,
"installed" => [], "installed" => [],
"linked_keg" => (linked_version.to_s if linked_keg.exist?), "linked_keg" => linked_version&.to_s,
"pinned" => pinned?, "pinned" => pinned?,
"outdated" => outdated?, "outdated" => outdated?,
"keg_only" => keg_only?, "keg_only" => keg_only?,
"dependencies" => deps.map(&:name).uniq, "dependencies" => dependencies.map(&:name).uniq,
"recommended_dependencies" => deps.select(&:recommended?).map(&:name).uniq, "recommended_dependencies" => dependencies.select(&:recommended?).map(&:name).uniq,
"optional_dependencies" => deps.select(&:optional?).map(&:name).uniq, "optional_dependencies" => dependencies.select(&:optional?).map(&:name).uniq,
"build_dependencies" => deps.select(&:build?).map(&:name).uniq, "build_dependencies" => dependencies.select(&:build?).map(&:name).uniq,
"conflicts_with" => conflicts.map(&:name), "conflicts_with" => conflicts.map(&:name),
"caveats" => caveats, "caveats" => caveats,
} }
@ -1569,7 +1571,7 @@ class Formula
"root_url" => bottle_spec.root_url, "root_url" => bottle_spec.root_url,
} }
bottle_info["files"] = {} bottle_info["files"] = {}
bottle_spec.collector.keys.each do |os| # rubocop:disable Performance/HashEachMethods bottle_spec.collector.keys.each do |os|
checksum = bottle_spec.collector[os] checksum = bottle_spec.collector[os]
bottle_info["files"][os] = { bottle_info["files"][os] = {
"url" => "#{bottle_spec.root_url}/#{Bottle::Filename.create(self, os, bottle_spec.rebuild)}", "url" => "#{bottle_spec.root_url}/#{Bottle::Filename.create(self, os, bottle_spec.rebuild)}",