license_finder 6.3.0 → 6.6.2

data/lib/license_finder/packages/nuget_package.rb

@@ -5,5 +5,9 @@ module LicenseFinder
     def package_manager
       'Nuget'
     end
+
+    def package_url
+      "https://www.nuget.org/packages/#{CGI.escape(name)}/#{CGI.escape(version)}"
+    end
   end
 end

data/lib/license_finder/packages/pip_package.rb

@@ -8,9 +8,16 @@ module LicenseFinder
     INVALID_LICENSES = ['', 'UNKNOWN'].to_set
 
     def self.license_names_from_spec(spec)
-      license = spec['license'].to_s.strip
+      license_names = spec['license'].to_s.strip.split(' or ')
+      has_unrecognized_license = false
 
-      return [license] unless INVALID_LICENSES.include?(license)
+      license_names.each do |license_name|
+        license = License.find_by_name(license_name.strip)
+
+        has_unrecognized_license ||= license.unrecognized_matcher?
+      end
+
+      return license_names if !license_names.empty? && !has_unrecognized_license
 
       spec
         .fetch('classifiers', [])
@@ -35,5 +42,9 @@ module LicenseFinder
     def package_manager
       'Pip'
     end
+
+    def package_url
+      "https://pypi.org/project/#{CGI.escape(name)}/#{CGI.escape(version)}/"
+    end
   end
 end

data/lib/license_finder/packages/rebar_package.rb

@@ -5,5 +5,9 @@ module LicenseFinder
     def package_manager
       'Rebar'
     end
+
+    def package_url
+      "https://hex.pm/packages/#{CGI.escape(name)}/#{CGI.escape(version)}"
+    end
   end
 end

data/lib/license_finder/packages/yarn_package.rb

@@ -5,5 +5,9 @@ module LicenseFinder
     def package_manager
       'Yarn'
     end
+
+    def package_url
+      "https://yarn.pm/#{CGI.escape(name)}"
+    end
   end
 end

data/lib/license_finder/reports/csv_report.rb

@@ -3,6 +3,7 @@ require 'csv'
 module LicenseFinder
   class CsvReport < Report
     COMMA_SEP = ','.freeze
+    NEWLINE_SEP = '\@NL'.freeze
     AVAILABLE_COLUMNS = %w[name version authors licenses license_links approved summary description homepage install_path package_manager groups texts notice].freeze
     MISSING_DEPENDENCY_TEXT = 'This package is not installed. Please install to determine licenses.'.freeze
 
@@ -10,10 +11,11 @@ module LicenseFinder
       super
       options[:columns] ||= %w[name version licenses]
       @columns = Array(options[:columns]) & self.class::AVAILABLE_COLUMNS
+      @write_headers = options[:write_headers] || false
     end
 
     def to_s
-      CSV.generate(col_sep: self.class::COMMA_SEP) do |csv|
+      CSV.generate(col_sep: self.class::COMMA_SEP, headers: @columns, write_headers: @write_headers) do |csv|
         sorted_dependencies.each do |s|
           csv << format_dependency(s)
         end
@@ -29,11 +31,13 @@ module LicenseFinder
     end
 
     def format_texts(dep)
-      dep.license_files.map { |file| file.text.split(/[\n\r]+/).join("\\@NL") }.join("\\@NL").force_encoding("ISO-8859-1").encode("UTF-8")
+      dep.license_files.map { |file| file.text.split(/[\n\r]+/).join(self.class::NEWLINE_SEP) }
+          .join(self.class::NEWLINE_SEP).force_encoding("ISO-8859-1").encode("UTF-8")
     end
 
     def format_notice(dep)
-      dep.notice_files.map { |file| file.text.split(/[\n\r]+/).join("\\@NL") }.join("\\@NL").force_encoding("ISO-8859-1").encode("UTF-8")
+      dep.notice_files.map { |file| file.text.split(/[\n\r]+/).join(self.class::NEWLINE_SEP) }
+          .join(self.class::NEWLINE_SEP).force_encoding("ISO-8859-1").encode("UTF-8")
     end
 
     def format_name(dep)

data/lib/license_finder/reports/json_report.rb

@@ -2,6 +2,8 @@ require 'csv'
 
 module LicenseFinder
   class JsonReport < CsvReport
+    NEWLINE_SEP = "\n".freeze
+
     def initialize(dependencies, options)
       super(dependencies, options)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.6.2
 platform: ruby
 authors:
 - Ryan Collins
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -358,6 +358,7 @@ files:
 - lib/license_finder/cli/dependencies.rb
 - lib/license_finder/cli/ignored_dependencies.rb
 - lib/license_finder/cli/ignored_groups.rb
+- lib/license_finder/cli/inherited_decisions.rb
 - lib/license_finder/cli/licenses.rb
 - lib/license_finder/cli/main.rb
 - lib/license_finder/cli/makes_decisions.rb
@@ -378,6 +379,7 @@ files:
 - lib/license_finder/license/matcher.rb
 - lib/license_finder/license/none_matcher.rb
 - lib/license_finder/license/template.rb
+- lib/license_finder/license/templates/0BSD.txt
 - lib/license_finder/license/templates/Apache1_1.txt
 - lib/license_finder/license/templates/Apache2.txt
 - lib/license_finder/license/templates/BSD.txt
@@ -500,7 +502,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Audit the OSS licenses of your application's dependencies.