license_scout 1.0.29 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98affa41f1e7d2f49e16775cae3fd695483356468d82a1582af56ae3fe954cda
-  data.tar.gz: 24d62cf2471af0eeef5f3d80dc374390e482489ce5bac596a4f0767719d03ddc
+  metadata.gz: d9c5e321c74710d7d89511951ef0c8ded06a81ed6c9d2084fc27f63628520963
+  data.tar.gz: d70c4aa848283c9335a896cbdfc5ac376dba45c37beaafe3c423f6dd9ee30b78
 SHA512:
-  metadata.gz: 9dbadf051bf66fd9c9eb26872cb4ddf1ced77c21aaec10912bf5f06be3a7faa15bbf4cceca9d8ae9a82e147229a8f70bab3113e1cdc6e53973cb69a28aeff40a
-  data.tar.gz: 5d68473b3aaf6ac1e6fa668e46faabb1ca69936883dd8e46596dd9840a2b1cc90c2b3631234cb2372f63316e283442c59ad278a77939c5d5d34c0311a8acacc1
+  metadata.gz: a5e20c76b3f00a65c3e429beb824068c0c4f3dfa4ebf41cab677fa5c0221d8fa5846fb333fc6fc09d0e73252b50cfdba1c78e2634e4ed46f7bb979d760173e7a
+  data.tar.gz: 0e3f7b9f1415b2b3e7aa8c7132e7edf1d1444bb0563fae1c293e00e33b4869859667bc174b528a428dfe184f770593d193de5653865f0cd58969f8cb047035d8

data/bin/license_scout

@@ -41,38 +41,38 @@ report = collector.issue_report
 unless report.empty?
   puts report
 
-  puts <<-EXPLANATION
-
-How to fix this depends on what information license_scout was unable to
-determine:
-
-* If the package is missing license information, that means license_scout was
-  unable to determine which license the package was released under. Depending
-  on the package manager, this is usually specified in the package's metadata,
-  for example, in the gemspec file for rubygems or in the package.json for npm.
-  If you know which license a package was released under, MIT for example, you
-  can add an override in license_scout's overrides.rb file in the section for
-  the appropriate package manager like this:
-    ["package-name", "MIT", nil]
-
-* If the package is missing the license file, that means license_scout could not
-  find the license text in any of the places the license is typically found, for
-  example, in a file named LICENSE in the root of the package. If the package
-  includes the license text in a non standard location or in its source repo,
-  you can indicate this by adding an override in license_scout's overrides.rb
-  file in the section for the appropriate package manager like this:
-    ["package-name", nil, ["https://example.com/foocorp/package-name/master/LICENSE"]],
-
-  If you know that the package was released under one of the common software
-  licenses, MIT for example, but does not include the license text in packaged
-  releases or in its source repo, you can add an override in license_scout's
-  overrides.rb file in the section for the appropriate package manager like
-  this:
-    ["package-name", nil, [canonical("MIT")]]
-
-See the closed pull requests on the license_scout repo for examples of how to
-do this:
-https://github.com/chef/license_scout/pulls?q=is%3Apr+is%3Aclosed
+  puts <<~EXPLANATION
+
+    How to fix this depends on what information license_scout was unable to
+    determine:
+
+    * If the package is missing license information, that means license_scout was
+      unable to determine which license the package was released under. Depending
+      on the package manager, this is usually specified in the package's metadata,
+      for example, in the gemspec file for rubygems or in the package.json for npm.
+      If you know which license a package was released under, MIT for example, you
+      can add an override in license_scout's overrides.rb file in the section for
+      the appropriate package manager like this:
+        ["package-name", "MIT", nil]
+
+    * If the package is missing the license file, that means license_scout could not
+      find the license text in any of the places the license is typically found, for
+      example, in a file named LICENSE in the root of the package. If the package
+      includes the license text in a non standard location or in its source repo,
+      you can indicate this by adding an override in license_scout's overrides.rb
+      file in the section for the appropriate package manager like this:
+        ["package-name", nil, ["https://example.com/foocorp/package-name/master/LICENSE"]],
+
+      If you know that the package was released under one of the common software
+      licenses, MIT for example, but does not include the license text in packaged
+      releases or in its source repo, you can add an override in license_scout's
+      overrides.rb file in the section for the appropriate package manager like
+      this:
+        ["package-name", nil, [canonical("MIT")]]
+
+    See the closed pull requests on the license_scout repo for examples of how to
+    do this:
+    https://github.com/chef/license_scout/pulls?q=is%3Apr+is%3Aclosed
   EXPLANATION
 
   exit 2

data/lib/license_scout/collector.rb

@@ -38,20 +38,22 @@ module LicenseScout
     end
 
     def dependency_managers
-      @dependency_managers ||= all_dependency_managers.select { |m| m.detected? }
+      @dependency_managers ||= all_dependency_managers.select(&:detected?)
     end
 
     def run
       reset_license_manifest
 
-      if !File.exist?(project_dir)
+      unless File.exist?(project_dir)
         raise LicenseScout::Exceptions::ProjectDirectoryMissing.new(project_dir)
       end
+
       FileUtils.mkdir_p(output_dir) unless File.exist?(output_dir)
 
       if dependency_managers.empty?
         raise LicenseScout::Exceptions::UnsupportedProjectType.new(project_dir)
       end
+
       dependency_managers.each { |d| collect_licenses_from(d) }
 
       File.open(license_manifest_path, "w+") do |file|

data/lib/license_scout/dependency.rb

@@ -19,7 +19,7 @@ module LicenseScout
   Dependency = Struct.new(:name, :version, :license, :license_files, :dep_mgr_name) do
 
     def eql?(other)
-      other.kind_of?(self.class) && other.hash == hash
+      other.is_a?(self.class) && other.hash == hash
     end
 
     # hash code for when Dependency is used as a key in a Hash or member of a

data/lib/license_scout/dependency_manager/berkshelf.rb

@@ -40,7 +40,7 @@ module LicenseScout
       end
 
       def dependencies
-        if !berkshelf_available?
+        unless berkshelf_available?
           raise LicenseScout::Exceptions::Error.new "Project at '#{project_dir}' is a Berkshelf project but berkshelf gem is not available in your bundle. Add berkshelf to your bundle in order to collect licenses for this project."
         end
 

data/lib/license_scout/dependency_manager/cpanm.rb

@@ -30,11 +30,11 @@ module LicenseScout
       class CpanmDependency
 
         LICENSE_TYPE_MAP = {
-          "perl_5"      => "Perl-5",
-          "perl"        => "Perl-5",
-          "apache_2_0"  => "Apache-2.0",
-          "artistic_2"  => "Artistic-2.0",
-          "gpl_3"       => "GPL-3.0",
+          "perl_5" => "Perl-5",
+          "perl" => "Perl-5",
+          "apache_2_0" => "Apache-2.0",
+          "artistic_2" => "Artistic-2.0",
+          "gpl_3" => "GPL-3.0",
         }.freeze
 
         attr_reader :unpack_path

data/lib/license_scout/dependency_manager/dep.rb

@@ -38,6 +38,7 @@ module LicenseScout
           TomlRB.parse(f)
         end
         return [] unless deps.key?("projects")
+
         deps["projects"].map do |pkg_info|
           pkg_import_name = pkg_info["name"]
           pkg_file_name = pkg_import_name.tr("/", "_")
@@ -71,7 +72,7 @@ module LicenseScout
       end
 
       def gopath(pkg)
-        "#{ENV['GOPATH']}/src/#{pkg}"
+        "#{ENV["GOPATH"]}/src/#{pkg}"
       end
 
       def vendor_dir(pkg = nil)

data/lib/license_scout/dependency_manager/glide.rb

@@ -67,7 +67,7 @@ module LicenseScout
       end
 
       def gopath(pkg)
-        "#{ENV['GOPATH']}/src/#{pkg}"
+        "#{ENV["GOPATH"]}/src/#{pkg}"
       end
 
       def find_license_files_for_package_in_gopath(pkg)

data/lib/license_scout/dependency_manager/godep.rb

@@ -59,7 +59,7 @@ module LicenseScout
       end
 
       def gopath(pkg)
-        "#{ENV['GOPATH']}/src/#{pkg}"
+        "#{ENV["GOPATH"]}/src/#{pkg}"
       end
 
       def find_license_files_for_package_in_gopath(pkg)

data/lib/license_scout/dependency_manager/manual.rb

@@ -50,13 +50,13 @@ module LicenseScout
       end
 
       def validate_input!
-        if !options.manual_licenses.is_a?(Array)
+        unless options.manual_licenses.is_a?(Array)
           raise LicenseScout::Exceptions::InvalidManualDependency.new("Invalid manual dependency is specified. :manual_licenses should be an Array in options.")
         end
 
         options.manual_licenses.each do |l|
           l.keys.each do |k|
-            if ![:name, :version, :license, :license_files, :dependency_manager].include?(k)
+            unless %i{name version license license_files dependency_manager}.include?(k)
               raise LicenseScout::Exceptions::InvalidManualDependency.new("Invalid manual dependency is specified. Key '#{k}' is not supported.")
             end
           end

data/lib/license_scout/dependency_manager/npm.rb

@@ -113,7 +113,7 @@ module LicenseScout
           when Hash
             license_metadata["type"]
           when Array
-            if (map = license_metadata.first) && map.kind_of?(Hash) && (type = map["type"])
+            if (map = license_metadata.first) && map.is_a?(Hash) && (type = map["type"])
               type
             else
               nil
@@ -129,6 +129,7 @@ module LicenseScout
       # If there are multiple options, we want to pick just one to keep it simple.
       def select_best_license(license_string)
         return nil if license_string.nil?
+
         options = license_string.tr("(", "").tr(")", "").split(" OR ")
         options.inject do |selected_license, license|
           if license_rank(selected_license) < license_rank(license)

data/lib/license_scout/license_file_analyzer/text.rb

@@ -25,14 +25,14 @@
 module LicenseScout
   module LicenseFileAnalyzer
     module Text
-      SPACES = /[[:space:]]+/
-      QUOTES = /['`"]{1,2}/
-      PLACEHOLDERS = /<[^<>]+>/
+      SPACES = /[[:space:]]+/.freeze
+      QUOTES = /['`"]{1,2}/.freeze
+      PLACEHOLDERS = /<[^<>]+>/.freeze
 
       def self.normalize_punctuation(text)
         text.gsub(SPACES, " ")
-            .gsub(QUOTES, '"')
-            .strip
+          .gsub(QUOTES, '"')
+          .strip
       end
 
       def self.compile_to_regex(text)

data/lib/license_scout/options.rb

@@ -19,7 +19,7 @@ require "license_scout/overrides"
 
 module LicenseScout
   class Options
-    SUPPORTED_OPTIONS = [:overrides, :environment, :ruby_bin, :cpan_cache, :manual_licenses].freeze
+    SUPPORTED_OPTIONS = %i{overrides environment ruby_bin cpan_cache manual_licenses}.freeze
 
     SUPPORTED_OPTIONS.each do |o|
       send(:attr_reader, o)

data/lib/license_scout/overrides.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2016, Chef Software Inc.
+# Copyright:: Copyright 2016-2020, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -87,6 +87,7 @@ module LicenseScout
 
     def license_data_for(dependency_manager, dependency_name, dependency_version)
       return nil unless have_override_for?(dependency_manager, dependency_name, dependency_version)
+
       override_rules[dependency_manager][dependency_name].call(dependency_version)
     end
 
@@ -416,6 +417,7 @@ module LicenseScout
         ["word-salad", "MIT", ["https://raw.githubusercontent.com/alexvollmer/word_salad/master/README.txt"]],
         ["xml-simple", "Ruby", ["https://raw.githubusercontent.com/maik/xml-simple/master/README.md"]],
         ["zonefile", "MIT", ["https://raw.githubusercontent.com/boesemar/zonefile/master/LICENSE"]],
+        ["sync", "BSD-2-Clause", ["https://raw.githubusercontent.com/ruby/sync/blob/master/LICENSE.txt"]],
       ]
       (aws_sdk_gems + other_gems).each do |override_data|
         override_license "ruby_bundler", override_data[0] do |version|
@@ -521,7 +523,7 @@ module LicenseScout
         ["Variable-Magic", nil, ["README"]],
         ["Class-Data-Inheritable", nil, ["https://raw.githubusercontent.com/tmtmtmtm/class-data-inheritable/master/README"]],
         ["File-ShareDir", "Perl-5", ["lib/File/ShareDir.pm"]],
-        ["TermReadKey", "nil", ["README"]]
+        ["TermReadKey", "nil", ["README"]],
       ].each do |override_data|
         override_license "perl_cpanm", override_data[0] do |version|
           {}.tap do |d|
@@ -939,7 +941,7 @@ module LicenseScout
         ["minipass", "ISC", ["https://raw.githubusercontent.com/isaacs/minipass/master/LICENSE"]],
         ["npm-bundled", "ISC", ["https://raw.githubusercontent.com/npm/npm-bundled/master/LICENSE"]],
         ["needle", "MIT", ["https://raw.githubusercontent.com/tomas/needle/master/license.txt"]],
-        ["uri-js", "BSD-2-Clause", ["https://raw.githubusercontent.com/garycourt/uri-js/master/README.md"]]
+        ["uri-js", "BSD-2-Clause", ["https://raw.githubusercontent.com/garycourt/uri-js/master/README.md"]],
       ].each do |override_data|
         override_license "js_npm", override_data[0] do |version|
           {}.tap do |d|
@@ -1058,7 +1060,7 @@ module LicenseScout
         ["github.com/spf13/jwalterweatherman", "MIT", ["https://raw.githubusercontent.com/spf13/jWalterWeatherman/master/LICENSE"]],
         ["github.com/spf13/viper", "MIT", ["https://raw.githubusercontent.com/spf13/viper/master/LICENSE"]],
         ["github.com/satori/go.uuid", "MIT", ["https://raw.githubusercontent.com/satori/go.uuid/master/LICENSE"]],
-        ["github.com/teambition/rrule-go", "MIT", ["https://raw.githubusercontent.com/teambition/rrule-go/master/LICENSE"]]
+        ["github.com/teambition/rrule-go", "MIT", ["https://raw.githubusercontent.com/teambition/rrule-go/master/LICENSE"]],
       ].each do |override_data|
         override_license "go", override_data[0] do |version|
           {}.tap do |d|

data/lib/license_scout/reporter.rb

@@ -76,7 +76,7 @@ module LicenseScout
         problems << "Dependency '#{dependency["name"]}' version '#{dependency["version"]}' under '#{dependency_manager}' is missing license files information."
       else
         dependency["license_files"].each do |license_file|
-          if !File.exist?(full_path_for(license_file))
+          unless File.exist?(full_path_for(license_file))
             problems << "License file '#{license_file}' for the dependency '#{dependency["name"]}' version '#{dependency["version"]}' under '#{dependency_manager}' is missing."
           end
         end
@@ -86,7 +86,7 @@ module LicenseScout
     end
 
     def find_license_manifest!
-      if !File.exist?(output_directory)
+      unless File.exist?(output_directory)
         raise LicenseScout::Exceptions::InvalidOutputReport.new("Output directory '#{output_directory}' does not exist.")
       end
 

data/lib/license_scout/version.rb

@@ -16,5 +16,5 @@
 #
 
 module LicenseScout
-  VERSION = "1.0.29".freeze
+  VERSION = "1.1.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: license_scout
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.1.2
 platform: ruby
 authors:
 - Serdar Sutay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
@@ -48,16 +48,22 @@ dependencies:
   name: toml-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -229,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="