diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/license/management/versions/v1.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/license/management/versions/v1.rb b/lib/license/management/versions/v1.rb index 6eb3f36..f7de2e6 100644 --- a/lib/license/management/versions/v1.rb +++ b/lib/license/management/versions/v1.rb @@ -14,14 +14,14 @@ module License private # when a dependency has multiple licenses, this will join the licenses into a single name - # this defect was backported from the htmltojson version of this script. + # this defect was backported from the html2json version of this script. def license_summary dependencies - .map { |x| x.licenses.map { |y| best_name_for(y) }.sort.reverse.join(', ') } + .map { |dependency| join_license_names(dependency.licenses) } .flatten .group_by { |name| name } .map { |license, items| { count: items.count, name: license } } - .sort_by { |x| [-x[:count], x[:name]] } + .sort_by { |hash| [-hash[:count], hash[:name]] } end # when a dependency has more than one license @@ -32,14 +32,14 @@ module License urls = dependency.licenses.map(&:url).reject { |x| blank?(x) }.uniq.sort log_info("multiple urls detected: #{urls.inspect}") if urls.size > 1 - url = urls[0] || data_for(dependency.licenses.first)['url'] + url = urls[0] || license_data(dependency.licenses.first)['url'] license.merge(url: url) if present?(url) license end def join_license_names(licenses) - licenses.map { |x| best_name_for(x) }.join(', ') + licenses.map { |x| best_name_for(x) }.sort.reverse.join(', ') end def map_from_dependency(dependency) @@ -63,10 +63,10 @@ module License end def best_name_for(license) - data_for(license)['name'] + license_data(license)['name'] end - def data_for(license) + def license_data(license) repository.item_for(license) end end |