license_finder 6.1.2 → 6.6.0

data/lib/license_finder/packages/conan_package.rb

@@ -15,5 +15,9 @@ module LicenseFinder
     def package_manager
       'Conan'
     end
+
+    def package_url
+      "https://conan.io/center/#{CGI.escape(name)}/#{CGI.escape(version)}"
+    end
   end
 end

data/lib/license_finder/packages/go_package.rb

@@ -8,12 +8,16 @@ module LicenseFinder
       'Go'
     end
 
+    def package_url
+      "https://pkg.go.dev/#{CGI.escape(name)}@#{CGI.escape(version)}"
+    end
+
     class << self
       def from_dependency(hash, prefix, full_version)
         name = hash['ImportPath']
         install_path = hash['InstallPath']
         install_path ||= install_path(prefix.join(name))
-        version = full_version ? hash['Rev'] : hash['Rev'][0..6]
+        version = full_version ? hash['Rev'].gsub('+incompatible', '') : hash['Rev'][0..6]
         homepage = hash['Homepage']
         new(name, version, install_path: install_path, package_manager: 'Go', homepage: homepage)
       end

data/lib/license_finder/packages/gradle_package.rb

@@ -22,5 +22,9 @@ module LicenseFinder
     def package_manager
       'Gradle'
     end
+
+    def package_url
+      "https://plugins.gradle.org/plugin/#{CGI.escape(name)}/#{CGI.escape(version)}"
+    end
   end
 end

data/lib/license_finder/packages/maven_package.rb

@@ -10,7 +10,8 @@ module LicenseFinder
         name,
         spec['version'],
         options.merge(
-          spec_licenses: Array(spec['licenses']).map { |l| l['name'] }
+          spec_licenses: Array(spec['licenses']).map { |l| l['name'] },
+          groups: Array(spec['groupId'])
         )
       )
     end
@@ -18,5 +19,9 @@ module LicenseFinder
     def package_manager
       'Maven'
     end
+
+    def package_url
+      "https://search.maven.org/artifact/#{CGI.escape(groups.first)}/#{CGI.escape(name.split(':').last)}/#{CGI.escape(version)}/jar"
+    end
   end
 end

data/lib/license_finder/packages/merged_package.rb

@@ -11,7 +11,7 @@ module LicenseFinder
       super(package.name, package.version)
     end
 
-    def_delegators :@dependency, :name, :version, :authors, :summary, :description, :homepage, :children, :parents,
+    def_delegators :@dependency, :name, :version, :authors, :summary, :description, :homepage, :package_url, :children, :parents,
                    :groups, :permitted, :restricted, :manual_approval, :install_path, :licenses, :approved_manually?,
                    :approved_manually!, :approved?, :permitted!, :permitted?, :restricted!, :restricted?, :hash,
                    :activations, :missing, :license_names_from_spec, :decided_licenses, :licensing, :decide_on_license,

data/lib/license_finder/packages/mix_package.rb

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

data/lib/license_finder/packages/npm_package.rb

@@ -89,6 +89,10 @@ module LicenseFinder
       'Npm'
     end
 
+    def package_url
+      "https://www.npmjs.com/package/#{CGI.escape(name)}/v/#{CGI.escape(version)}"
+    end
+
     private
 
     def deps_from_json

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

@@ -35,5 +35,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

data/license_finder.gemspec

@@ -46,24 +46,24 @@ Gem::Specification.new do |s|
   s.add_dependency 'bundler'
   s.add_dependency 'rubyzip', '>=1', '<3'
   s.add_dependency 'thor', '~> 1.0.1'
-  s.add_dependency 'toml', '0.2.0'
+  s.add_dependency 'tomlrb', '~> 1.3.0'
   s.add_dependency 'with_env', '1.1.0'
   s.add_dependency 'xml-simple', '~> 1.1.5'
 
   s.add_development_dependency 'addressable', '2.7.0'
   s.add_development_dependency 'capybara', '~> 3.15.0'
   s.add_development_dependency 'cocoapods', '>= 1.0.0' if RUBY_PLATFORM =~ /darwin/
-  s.add_development_dependency 'fakefs', '~> 1.0.0'
+  s.add_development_dependency 'fakefs', '~> 1.2.0'
   s.add_development_dependency 'mime-types', '3.3.1'
-  s.add_development_dependency 'pry', '~> 0.12.2'
+  s.add_development_dependency 'pry', '~> 0.13.0'
   s.add_development_dependency 'rake', '~> 13.0.1'
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'rspec-its', '~> 1.3.0'
-  s.add_development_dependency 'rubocop', '~> 0.79.0'
+  s.add_development_dependency 'rubocop', '~> 0.81.0'
   s.add_development_dependency 'rubocop-performance', '~> 1.5.0'
   s.add_development_dependency 'webmock', '~> 3.5'
 
-  s.add_development_dependency 'rack', '~> 2.0.7', '> 1.6'
+  s.add_development_dependency 'rack', '~> 2.2.2'
   s.add_development_dependency 'rack-test', '~> 1.1.0', '> 0.7'
 
   s.files         = `git ls-files`.split("\n").reject { |f| f.start_with?('spec', 'features') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.6.0
 platform: ruby
 authors:
 - Ryan Collins
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,19 +78,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: toml
+  name: tomlrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: with_env
   requirement: !ruby/object:Gem::Requirement
@@ -153,14 +153,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -181,14 +181,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -237,14 +237,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -279,20 +279,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -364,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
@@ -384,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
@@ -398,9 +394,11 @@ files:
 - lib/license_finder/license/templates/MIT.txt
 - lib/license_finder/license/templates/MPL2.txt
 - lib/license_finder/license/templates/NewBSD.txt
+- lib/license_finder/license/templates/OFL.txt
 - lib/license_finder/license/templates/Python.txt
 - lib/license_finder/license/templates/Ruby.txt
 - lib/license_finder/license/templates/SimplifiedBSD.txt
+- lib/license_finder/license/templates/WTFPL.txt
 - lib/license_finder/license/text.rb
 - lib/license_finder/license_aggregator.rb
 - lib/license_finder/logger.rb
@@ -504,7 +502,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Audit the OSS licenses of your application's dependencies.