licensee 9.15.1 → 9.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dff748195c8e0488eee7b7a9d15b90c1683059c0d52a30721f36250cdeac8935
-  data.tar.gz: 30f85a2b7d664c4b1345a8a76d98e8c059ef550b5b4ce878484f47f296d70a33
+  metadata.gz: e6b54db113cb4f1c4933826886afe3ed5e4b66d757a97df74dc43dbb2f8d6bc7
+  data.tar.gz: 72fa1baf7073bfb9132823d1953977ab49618d03320694647d6947b66aee311f
 SHA512:
-  metadata.gz: 3dfa1f6ece5593ef76abf731cf3787b4e616803735f4c241c462f7081c333cee0d88da6854dcbe4bb43a6aefcd35414340f45a2cb3057ddb7d434a27acc0b461
-  data.tar.gz: 2444b1b8e714a4385baaeb8863bd8af26fb62b9bf31dd810e62b189158459cc0fcd23056adbdcc670df1c690f916e2f8cc3f62953704eae8b7651a624ea14613
+  metadata.gz: 461a7ed0479855f6e2c08353ee902b2b8f53661d24161ef22f6c7dbb0f9db1ee375f6fc4e196d1c266cd5830221525af471c9158b64891fa4b0b0b7b373e6eac
+  data.tar.gz: '09bfdd2cb1d12bd2b4a32bad1de90c65058d9ab1f3ed98ccb94ed9657b8965e236d4be84ce32e7801edf071de3ca7154d34455bfa749d29b1d89d9030c9a0ca4'

data/lib/licensee/commands/detect.rb

@@ -95,7 +95,7 @@ class LicenseeCLI < Thor
   def licenses_by_similarity(matched_file)
     matcher = Licensee::Matchers::Dice.new(matched_file)
     potential_licenses = Licensee.licenses(hidden: true).select(&:wordset)
-    matcher.instance_variable_set('@potential_licenses', potential_licenses)
+    matcher.instance_variable_set(:@potential_licenses, potential_licenses)
     matcher.licenses_by_similarity
   end
 

data/lib/licensee/commands/diff.rb

@@ -41,11 +41,9 @@ class LicenseeCLI < Thor
 
   def license_to_diff
     return options[:license_to_diff] if options[:license_to_diff]
-    return project.license_file if remote? || $stdin.tty? && project.license_file
+    return project.license_file if remote? || ($stdin.tty? && project.license_file)
 
-    @license_to_diff ||= begin
-      Licensee::ProjectFiles::LicenseFile.new($stdin.read, 'LICENSE')
-    end
+    @license_to_diff ||= Licensee::ProjectFiles::LicenseFile.new($stdin.read, 'LICENSE')
   end
 
   def expected_license

data/lib/licensee/content_helper.rb

@@ -7,7 +7,7 @@ module Licensee
   module ContentHelper
     DIGEST = Digest::SHA1
     START_REGEX = /\A\s*/.freeze
-    END_OF_TERMS_REGEX = /^[\s#*_]*end of terms and conditions[\s#*_]*$/i.freeze
+    END_OF_TERMS_REGEX = /^[\s#*_]*end of (the )?terms and conditions[\s#*_]*$/i.freeze
     REGEXES = {
       bom:                 /#{START_REGEX}\xEF\xBB\xBF/,
       hrs:                 /^\s*[=\-*]{3,}\s*$/,
@@ -128,7 +128,7 @@ module Licensee
       overlap = (wordset_fieldless & other.wordset).size
       total = wordset_fieldless.size + other.wordset.size -
               fields_normalized_set.size
-      (overlap * 200.0) / (total + variation_adjusted_length_delta(other) / 4)
+      (overlap * 200.0) / (total + (variation_adjusted_length_delta(other) / 4))
     end
 
     # SHA1 of the normalized content
@@ -341,7 +341,7 @@ module Licensee
       # Use that if it's present, otherwise, just return the simple delta.
       return delta unless respond_to?(:spdx_alt_segments, true)
 
-      adjusted_delta = delta - [fields_normalized.size, spdx_alt_segments].max * 4
+      adjusted_delta = delta - ([fields_normalized.size, spdx_alt_segments].max * 4)
       adjusted_delta.positive? ? adjusted_delta : 0
     end
   end

data/lib/licensee/license.rb

@@ -145,6 +145,7 @@ module Licensee
       return @title_regex if defined? @title_regex
 
       string = name.downcase.sub('*', 'u')
+      simple_title_regex = Regexp.new string, 'i'
       string.sub!(/\Athe /i, '')
       string.sub!(/,? version /, ' ')
       string.sub!(/v(\d+\.\d+)/, '\1')
@@ -159,7 +160,7 @@ module Licensee
       string << '(?:\ licen[sc]e)?'
       key_regex = Regexp.new string, 'i'
 
-      parts = [title_regex, key_regex]
+      parts = [simple_title_regex, title_regex, key_regex]
       parts.push Regexp.new meta.nickname.sub(/\bGNU /i, '(?:GNU )?') if meta.nickname
 
       @title_regex = Regexp.union parts
@@ -215,7 +216,7 @@ module Licensee
     end
 
     def ==(other)
-      !other.nil? && key == other.key
+      other.is_a?(self.class) && key == other.key
     end
 
     def pseudo_license?
@@ -238,9 +239,7 @@ module Licensee
     # Returns a string with `[fields]` replaced by `{{{fields}}}`
     # Does not mangle non-supported fields in the form of `[field]`
     def content_for_mustache
-      @content_for_mustache ||= begin
-        content.gsub(LicenseField::FIELD_REGEX, '{{{\1}}}')
-      end
+      @content_for_mustache ||= content.gsub(LicenseField::FIELD_REGEX, '{{{\1}}}')
     end
 
     private

data/lib/licensee/matchers/copyright.rb

@@ -6,7 +6,9 @@ module Licensee
       attr_reader :file
 
       COPYRIGHT_SYMBOLS = Regexp.union([/copyright/i, /\(c\)/i, "\u00A9", "\xC2\xA9"])
-      REGEX = /#{ContentHelper::START_REGEX}(?:portions )?([_*\-\s]*#{COPYRIGHT_SYMBOLS}.*$)+$/i.freeze
+      MAIN_LINE_REGEX = /[_*\-\s]*#{COPYRIGHT_SYMBOLS}.*$/i.freeze
+      OPTIONAL_LINE_REGEX = /[_*\-\s]*with Reserved Font Name.*$/i.freeze
+      REGEX = /#{ContentHelper::START_REGEX}(#{MAIN_LINE_REGEX}#{OPTIONAL_LINE_REGEX}*)+$/i.freeze
       def match
         # NOTE: must use content, and not content_normalized here
         Licensee::License.find('no-license') if /#{REGEX}+\z/io.match?(file.content.strip)

data/lib/licensee/matchers/dice.rb

@@ -21,13 +21,11 @@ module Licensee
       # 2. The percentage change in file length may not exceed the inverse
       #    of the confidence threshold
       def potential_matches
-        @potential_matches ||= begin
-          super.select do |license|
-            if license.creative_commons? && file.potential_false_positive?
-              false
-            else
-              license.wordset
-            end
+        @potential_matches ||= super.select do |license|
+          if license.creative_commons? && file.potential_false_positive?
+            false
+          else
+            license.wordset
           end
         end
       end

data/lib/licensee/matchers/dist_zilla.rb

@@ -19,6 +19,7 @@ module Licensee
                  .sub('_', '.')
                  .sub('Mozilla', 'MPL')
                  .sub(/^GPL-(\d)$/, 'GPL-\1.0')
+                 .sub(/^AGPL-(\d)$/, 'AGPL-\1.0')
       end
     end
   end

data/lib/licensee/project_files/license_file.rb

@@ -62,13 +62,11 @@ module Licensee
       end
 
       def attribution
-        @attribution ||= begin
-          if copyright? || license.content&.include?('[fullname]')
-            matches = Matchers::Copyright::REGEX
-                      .match(content_without_title_and_version)
-            matches[0] if matches
-          end
-        end
+        @attribution ||= if copyright? || license.content&.include?('[fullname]')
+                           matches = Matchers::Copyright::REGEX
+                                     .match(content_without_title_and_version)
+                           matches[0] if matches
+                         end
       end
 
       # Is this file likely to result in a creative commons false positive?

data/lib/licensee/projects/git_project.rb

@@ -27,13 +27,11 @@ module Licensee
       end
 
       def repository
-        @repository ||= begin
-          if @raw_repo.is_a? Rugged::Repository
-            @raw_repo
-          else
-            Rugged::Repository.new(@raw_repo)
-          end
-        end
+        @repository ||= if @raw_repo.is_a? Rugged::Repository
+                          @raw_repo
+                        else
+                          Rugged::Repository.new(@raw_repo)
+                        end
       rescue Rugged::OSError, Rugged::RepositoryError
         raise InvalidRepository
       end

data/lib/licensee/projects/github_project.rb

@@ -60,7 +60,7 @@ module Licensee
       end
 
       def access_token
-        ENV['OCTOKIT_ACCESS_TOKEN']
+        ENV.fetch('OCTOKIT_ACCESS_TOKEN', nil)
       end
     end
   end

data/lib/licensee/projects/project.rb

@@ -43,9 +43,7 @@ module Licensee
 
       # Returns an array of matches LicenseFiles
       def matched_files
-        @matched_files ||= begin
-          project_files.select(&:license)
-        end
+        @matched_files ||= project_files.select(&:license)
       end
 
       # Returns the LicenseFile used to determine the License
@@ -54,19 +52,17 @@ module Licensee
       end
 
       def license_files
-        @license_files ||= begin
-          if files.empty? || files.nil?
-            []
-          else
-            files = find_files do |n|
-              Licensee::ProjectFiles::LicenseFile.name_score(n)
-            end
-            files = files.map do |file|
-              Licensee::ProjectFiles::LicenseFile.new(load_file(file), file)
-            end
-            prioritize_lgpl(files)
-          end
-        end
+        @license_files ||= if files.empty? || files.nil?
+                             []
+                           else
+                             files = find_files do |n|
+                               Licensee::ProjectFiles::LicenseFile.name_score(n)
+                             end
+                             files = files.map do |file|
+                               Licensee::ProjectFiles::LicenseFile.new(load_file(file), file)
+                             end
+                             prioritize_lgpl(files)
+                           end
       end
 
       def readme_file
@@ -155,9 +151,7 @@ module Licensee
       # Returns an array of matches licenses, excluding the COPYRIGHT file
       # which can often be ignored for purposes of determing dual licensing
       def licenses_without_copyright
-        @licenses_without_copyright ||= begin
-          matched_files.reject(&:copyright?).map(&:license).uniq
-        end
+        @licenses_without_copyright ||= matched_files.reject(&:copyright?).map(&:license).uniq
       end
 
       def files

data/lib/licensee/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Licensee
-  VERSION = '9.15.1'
+  VERSION = '9.15.3'
 end

data/lib/licensee.rb

@@ -24,8 +24,6 @@ module Licensee
   DOMAIN = 'http://choosealicense.com'
 
   class << self
-    attr_writer :confidence_threshold
-
     # Returns an array of Licensee::License instances
     def licenses(options = {})
       Licensee::License.all(options)
@@ -50,11 +48,16 @@ module Licensee
       @confidence_threshold ||= CONFIDENCE_THRESHOLD
     end
 
+    def confidence_threshold=(value)
+      @confidence_threshold = value
+      @inverse_confidence_threshold = nil
+    end
+
     # Inverse of the confidence threshold, represented as a float
     # By default this will be 0.02
     def inverse_confidence_threshold
       @inverse_confidence_threshold ||=
-        (1 - Licensee.confidence_threshold / 100.0).round(2)
+        (1 - (Licensee.confidence_threshold / 100.0)).round(2)
     end
   end
 end

data/licensee.gemspec

@@ -16,13 +16,14 @@ Gem::Specification.new do |gem|
   gem.email    = 'ben.balter@github.com'
   gem.homepage = 'https://github.com/benbalter/licensee'
   gem.license  = 'MIT'
+  gem.metadata['rubygems_mfa_required'] = 'true'
 
   gem.bindir = 'bin'
   gem.executables << 'licensee'
 
   gem.add_dependency('dotenv', '~> 2.0')
-  gem.add_dependency('octokit', '~> 4.20')
-  gem.add_dependency('reverse_markdown', '~> 1.0')
+  gem.add_dependency('octokit', '>= 4.20', '< 7.0')
+  gem.add_dependency('reverse_markdown', '>= 1', '< 3')
   gem.add_dependency('rugged', '>= 0.24', '<2.0')
   gem.add_dependency('thor', '>= 0.19', '< 2.0')
 

data/spec/fixtures/detect.json

@@ -10,7 +10,7 @@
         "how": "Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders.",
         "using": {
           "Babel": "https://github.com/babel/babel/blob/master/LICENSE",
-          ".NET Core": "https://github.com/dotnet/runtime/blob/master/LICENSE.TXT",
+          ".NET": "https://github.com/dotnet/runtime/blob/main/LICENSE.TXT",
           "Rails": "https://github.com/rails/rails/blob/master/MIT-LICENSE"
         },
         "featured": true,
@@ -93,7 +93,7 @@
     },
     {
       "filename": "licensee.gemspec",
-      "content": "# frozen_string_literal: true\n\nrequire File.expand_path('lib/licensee/version', __dir__)\n\nGem::Specification.new do |gem|\n  gem.name    = 'licensee'\n  gem.version = Licensee::VERSION\n\n  gem.summary = 'A Ruby Gem to detect open source project licenses'\n  gem.description = <<-DESC\n    Licensee automates the process of reading LICENSE files and\n    compares their contents to known licenses using a fancy maths.\n  DESC\n\n  gem.authors  = ['Ben Balter']\n  gem.email    = 'ben.balter@github.com'\n  gem.homepage = 'https://github.com/benbalter/licensee'\n  gem.license  = 'MIT'\n\n  gem.bindir = 'bin'\n  gem.executables << 'licensee'\n\n  gem.add_dependency('dotenv', '~> 2.0')\n  gem.add_dependency('octokit', '~> 4.20')\n  gem.add_dependency('reverse_markdown', '~> 1.0')\n  gem.add_dependency('rugged', '>= 0.24', '<2.0')\n  gem.add_dependency('thor', '>= 0.19', '< 2.0')\n\n  gem.add_development_dependency('gem-release', '~> 2.0')\n  gem.add_development_dependency('mustache', '>= 0.9', '< 2.0')\n  gem.add_development_dependency('pry', '~> 0.9')\n  gem.add_development_dependency('rspec', '~> 3.5')\n  gem.add_development_dependency('rubocop', '~> 1.0')\n  gem.add_development_dependency('rubocop-performance', '~> 1.5')\n  gem.add_development_dependency('rubocop-rspec', '~> 2.0')\n  gem.add_development_dependency('simplecov', '~> 0.16')\n  gem.add_development_dependency('webmock', '~> 3.1')\n\n  gem.required_ruby_version = '>= 2.5'\n\n  # ensure the gem is built out of versioned files\n  gem.files = Dir[\n    '{bin,lib,man,test,vendor,spec}/**/*',\n    'README*', 'LICENSE*'\n  ] & `git ls-files -z`.split(\"\\0\")\nend\n",
+      "content": "# frozen_string_literal: true\n\nrequire File.expand_path('lib/licensee/version', __dir__)\n\nGem::Specification.new do |gem|\n  gem.name    = 'licensee'\n  gem.version = Licensee::VERSION\n\n  gem.summary = 'A Ruby Gem to detect open source project licenses'\n  gem.description = <<-DESC\n    Licensee automates the process of reading LICENSE files and\n    compares their contents to known licenses using a fancy maths.\n  DESC\n\n  gem.authors  = ['Ben Balter']\n  gem.email    = 'ben.balter@github.com'\n  gem.homepage = 'https://github.com/benbalter/licensee'\n  gem.license  = 'MIT'\n  gem.metadata['rubygems_mfa_required'] = 'true'\n\n  gem.bindir = 'bin'\n  gem.executables << 'licensee'\n\n  gem.add_dependency('dotenv', '~> 2.0')\n  gem.add_dependency('octokit', '>= 4.20', '< 6.0')\n  gem.add_dependency('reverse_markdown', '>= 1', '< 3')\n  gem.add_dependency('rugged', '>= 0.24', '<2.0')\n  gem.add_dependency('thor', '>= 0.19', '< 2.0')\n\n  gem.add_development_dependency('gem-release', '~> 2.0')\n  gem.add_development_dependency('mustache', '>= 0.9', '< 2.0')\n  gem.add_development_dependency('pry', '~> 0.9')\n  gem.add_development_dependency('rspec', '~> 3.5')\n  gem.add_development_dependency('rubocop', '~> 1.0')\n  gem.add_development_dependency('rubocop-performance', '~> 1.5')\n  gem.add_development_dependency('rubocop-rspec', '~> 2.0')\n  gem.add_development_dependency('simplecov', '~> 0.16')\n  gem.add_development_dependency('webmock', '~> 3.1')\n\n  gem.required_ruby_version = '>= 2.5'\n\n  # ensure the gem is built out of versioned files\n  gem.files = Dir[\n    '{bin,lib,man,test,vendor,spec}/**/*',\n    'README*', 'LICENSE*'\n  ] & `git ls-files -z`.split(\"\\0\")\nend\n",
       "content_hash": null,
       "content_normalized": null,
       "matcher": {

data/spec/fixtures/license-hashes.json

@@ -10,14 +10,18 @@
   "bsd-4-clause": "3b2917580b2b6f13efaaea37546b8b7a53716a30",
   "bsl-1.0": "27e28f20b57048cf04be07e1532b6fb501a0753b",
   "cc-by-4.0": "b2089be110aca4cf4a562a88f0ecfd082ce32167",
-  "cc-by-sa-4.0": "20e2ae68f7dd2125beb70f732cd52d376687597f",
+  "cc-by-sa-4.0": "0684e2df6671166351097b387abc0d1170d26f2f",
   "cc0-1.0": "94c8187ec82b2b4a69fb990f80833fbe6e3c95e7",
   "cecill-2.1": "edb804827a40bcdcf3e82b6bab3bd1f5b923ac74",
+  "cern-ohl-p-2.0": "f10b4b8d75502ab65a7bdbe1d616e5eb8d157aed",
+  "cern-ohl-s-2.0": "c9a4188fec2c6a98ea9392cf9a26633fe7fd0e42",
+  "cern-ohl-w-2.0": "099c18c653223d137a5ce8331d8a4ebbacaf1623",
   "ecl-2.0": "296976ce9e84ba380866e4519b68a779c2059b3a",
   "epl-1.0": "5e3cb10996b4ba2821d04d5c99a912c924b3bdcb",
   "epl-2.0": "e2f3e266432478d9248422228a75a404cce1c43c",
   "eupl-1.1": "b35810b4113910f5f85af75f24e2538ba64c8876",
   "eupl-1.2": "2098182069695981c6dc71093888f6204c7bbdae",
+  "gfdl-1.3": "164a858691ea0a6fb0dd06c5ca00e5dd7620eef8",
   "gpl-2.0": "32108116603c30687d8d0d2f77f140fb6ecea082",
   "gpl-3.0": "7d4cdf499d39e2e1ce27b2878e22872f0f5a74dd",
   "isc": "7fcb74e2084b361556b8285d6f800495d0d5e36a",
@@ -29,8 +33,9 @@
   "mpl-2.0": "820048a1dbef5dfac65547bd9eb935beb76b2257",
   "ms-pl": "1a7eb02101924998c296c8ede182005d2f77ae4a",
   "ms-rl": "9f0c4c8be853cf1836a619cd0abaf0e0235d76ad",
+  "mulanpsl-2.0": "c9b54da98007cb8baa0a658b34dbe3a55a80baa8",
   "ncsa": "0d481a7ff9345e19cfdd9b7fea46caea1ebd08ee",
-  "odbl-1.0": "72a4e9321a871bca3c5dd0f06ffe498d340e8d76",
+  "odbl-1.0": "e3bb38ce8a932d226829dcb6fd2143e5977d13e7",
   "ofl-1.1": "f92ca13e3976f94f20b49a007f7592631b4f8e96",
   "osl-3.0": "bdde11f936b834bd06451d1ad8aad790d4a7c72c",
   "postgresql": "6bddd8a2425baa88ee240b1c54b532d6208028bd",

data/spec/licensee/commands/detect_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe 'detect command' do
 
   context 'json' do
     let(:arguments) { ['--json'] }
-    let(:expected) { JSON.parse fixture_contents('detect.json') }
+    let(:expected) { JSON.parse(fixture_contents('detect.json')).tap { |h| h['matched_files'][1].delete('content') } }
 
     it 'Returns a zero exit code' do
       expect(status.exitstatus).to be(0)
@@ -72,7 +72,7 @@ RSpec.describe 'detect command' do
     it 'returns the expected output' do
       msg = +'`licensee detect --json` output did not match expectations. '
       msg << 'Run `script/dump-detect-json-fixture` and verify the output.'
-      expect(JSON.parse(stdout)).to eql(expected), msg
+      expect(JSON.parse(stdout).tap { |h| h['matched_files'][1].delete('content') }).to eql(expected), msg
     end
   end
 

data/spec/licensee/content_helper_spec.rb

@@ -67,7 +67,7 @@ RSpec.describe Licensee::ContentHelper do
 
   it 'knows the similarity' do
     expect(mit.similarity(subject)).to be_within(1).of(4)
-    expect(mit.similarity(mit)).to be(100.0)
+    expect(mit.similarity(mit)).to eq(100.0)
   end
 
   it 'calculates simple delta for similarity' do

data/spec/licensee/license_meta_spec.rb

@@ -116,9 +116,9 @@ RSpec.describe Licensee::LicenseMeta do
     let(:hash) { subject.to_h }
     let(:using) do
       {
-        'Babel'     => 'https://github.com/babel/babel/blob/master/LICENSE',
-        '.NET Core' => 'https://github.com/dotnet/runtime/blob/master/LICENSE.TXT',
-        'Rails'     => 'https://github.com/rails/rails/blob/master/MIT-LICENSE'
+        'Babel' => 'https://github.com/babel/babel/blob/master/LICENSE',
+        '.NET'  => 'https://github.com/dotnet/runtime/blob/main/LICENSE.TXT',
+        'Rails' => 'https://github.com/rails/rails/blob/master/MIT-LICENSE'
       }
     end
     let(:expected) do

data/spec/licensee/license_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Licensee::License do
-  let(:license_count) { 42 }
-  let(:hidden_license_count) { 29 }
+  let(:license_count) { 47 }
+  let(:hidden_license_count) { 34 }
   let(:featured_license_count) { 3 }
   let(:pseudo_license_count) { 2 }
   let(:non_featured_license_count) do
@@ -300,10 +300,15 @@ RSpec.describe Licensee::License do
   end
 
   it 'knows equality' do
-    expect(mit).to eql(mit)
+    expect(described_class.find('mit')).to eql(mit)
+    expect(described_class.find('mit')).to eq(mit)
     expect(gpl).not_to eql(mit)
   end
 
+  it 'returns false when compared to a boolean' do
+    expect(described_class.find('mit')).not_to be(true)
+  end
+
   it 'knows if a license is a pseudo license' do
     expect(mit).not_to be_pseudo_license
     expect(other).to be_pseudo_license

data/spec/licensee/matchers/copyright_matcher_spec.rb

@@ -27,10 +27,11 @@ RSpec.describe Licensee::Matchers::Copyright do
     'UTF-8 Encoded'         => 'Copyright (c) 2010-2014 Simon Hürlimann',
     'Comma-separated date'  => 'Copyright (c) 2003, 2004 Ben Balter',
     'Hyphen-separated date' => 'Copyright (c) 2003-2004 Ben Balter',
-    'ASCII-8BIT encoded'    => "Copyright \xC2\xA92015 Ben Balter`",
+    'ASCII-8BIT encoded'    => "Copyright \xC2\xA92015 Ben Balter`"
+      .dup.force_encoding('ASCII-8BIT'),
     'No year'               => 'Copyright Ben Balter',
-    'Multiline'             => "Copyright Ben Balter\nCopyright Another Entity"
-      .dup.force_encoding('ASCII-8BIT')
+    'Multiline'             => "Copyright Ben Balter\nCopyright Another Entity",
+    'OFL font name'         => "Copyright (c) 2016, Ben Balter,\nwith Reserved Font Name \"Ben's Font\"."
   }.each do |description, notice|
     context "with a #{description} notice" do
       let(:content) { notice }
@@ -41,6 +42,14 @@ RSpec.describe Licensee::Matchers::Copyright do
     end
   end
 
+  context 'with arbitrary additional notice line' do
+    let(:content) { "(c) Ben Balter\nwith foo bar baz" }
+
+    it "doesn't match" do
+      expect(subject.match).to be_nil
+    end
+  end
+
   context 'with a license with a copyright notice' do
     let(:content) { sub_copyright_info(mit) }
 

data/spec/licensee/matchers/dice_matcher_spec.rb

@@ -27,14 +27,14 @@ RSpec.describe Licensee::Matchers::Dice do
   end
 
   it 'returns the match confidence' do
-    expect(subject.confidence).to be(100.0)
+    expect(subject.confidence).to eq(100.0)
   end
 
   context 'without a match' do
     let(:content) { 'Not really a license' }
 
     it "doesn't match" do
-      expect(subject.match).to be(nil)
+      expect(subject.match).to be_nil
       expect(subject.matches).to be_empty
       expect(subject.confidence).to be(0)
     end
@@ -47,7 +47,7 @@ RSpec.describe Licensee::Matchers::Dice do
 
     it "doesn't match" do
       expect(content).not_to be_detected_as(gpl)
-      expect(subject.match).to be(nil)
+      expect(subject.match).to be_nil
       expect(subject.matches).to be_empty
       expect(subject.confidence).to be(0)
     end

data/spec/licensee/project_files/license_file_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Licensee::ProjectFiles::LicenseFile do
   context 'with an non-UTF-8-encoded license' do
     let(:content) { "\x91License\x93".dup.force_encoding('windows-1251') }
 
-    it "doesn't blow up " do
+    it "doesn't blow up" do
       expect(subject.attribution).to be_nil
     end
   end

data/spec/licensee/project_files/package_info_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe Licensee::ProjectFiles::PackageManagerFile do
   context 'matchers' do
     let(:possible_matchers) { subject.possible_matchers }
 
-    context 'with a gemspec ' do
+    context 'with a gemspec' do
       let(:filename) { 'project.gemspec' }
 
       it 'returns the gemspec matcher' do
@@ -39,7 +39,7 @@ RSpec.describe Licensee::ProjectFiles::PackageManagerFile do
       end
     end
 
-    context 'with cabal file ' do
+    context 'with cabal file' do
       let(:filename) { 'test.cabal' }
 
       it 'returns the cabal matcher' do

data/spec/licensee/project_spec.rb

@@ -66,7 +66,7 @@
         let(:revision) { subject.repository.last_commit.oid }
 
         before do
-          subject.instance_variable_set('@revision', revision)
+          subject.instance_variable_set(:@revision, revision)
         end
 
         it 'returns the commit' do
@@ -116,11 +116,12 @@
 
       if described_class == Licensee::Projects::FSProject
         context 'with search root argument' do
+          subject { described_class.new(path, search_root: search_root) }
+
           let(:fixture) { 'license-in-parent-folder/license-folder/package' }
           let(:path) { fixture_path(fixture) }
           let(:license_folder) { 'license-in-parent-folder/license-folder' }
           let(:search_root) { fixture_path(license_folder) }
-          let(:subject) { described_class.new(path, search_root: search_root) }
           let(:files) { subject.send(:files) }
 
           it 'looks for licenses in parent directories up to the search root' do

data/spec/licensee_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Licensee do
   let(:project_path) { fixture_path('mit') }
   let(:license_path) { fixture_path('mit/LICENSE.txt') }
   let(:mit_license) { Licensee::License.find('mit') }
-  let(:hidden_license_count) { 42 }
+  let(:hidden_license_count) { 47 }
 
   it 'exposes licenses' do
     expect(described_class.licenses).to be_an(Array)
@@ -43,7 +43,7 @@ RSpec.describe Licensee do
     end
 
     it 'exposes the inverse of the confidence threshold' do
-      expect(described_class.inverse_confidence_threshold).to be(0.02)
+      expect(described_class.inverse_confidence_threshold).to eq(0.02)
     end
 
     context 'user overridden' do
@@ -54,6 +54,12 @@ RSpec.describe Licensee do
       it 'lets the user override the confidence threshold' do
         expect(described_class.confidence_threshold).to be(50)
       end
+
+      it 'resets inverse confidence threshold when confidence threshold changes' do
+        expect(described_class.inverse_confidence_threshold).to be(0.5)
+        described_class.confidence_threshold = Licensee::CONFIDENCE_THRESHOLD
+        expect(described_class.inverse_confidence_threshold).to be(0.02)
+      end
     end
   end
 end

data/spec/vendored_license_spec.rb

@@ -5,8 +5,6 @@ RSpec.describe 'vendored licenses' do
   let(:license_file) do
     Licensee::ProjectFiles::LicenseFile.new(content, filename)
   end
-  let(:detected_license) { license_file&.license }
-  let(:wtfpl) { Licensee::License.find('wtfpl') }
 
   Licensee.licenses(hidden: true).each do |license|
     next if license.pseudo_license?

data/vendor/choosealicense.com/_licenses/0bsd.txt

@@ -7,9 +7,9 @@ description: The BSD Zero Clause license goes further than the BSD 2-Clause lice
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.  Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. You may take the additional step of removing the copyright notice.
 
 using:
-  PickMeUp: https://github.com/nazar-pc/PickMeUp/blob/master/copying.md
-  smoltcp: https://github.com/m-labs/smoltcp/blob/master/LICENSE-0BSD.txt
+  gatsby-starter-default: https://github.com/gatsbyjs/gatsby-starter-default/blob/master/LICENSE
   Toybox: https://github.com/landley/toybox/blob/master/LICENSE
+  PickMeUp: https://github.com/nazar-pc/PickMeUp/blob/master/copying.md
 
 permissions:
   - commercial-use
@@ -25,6 +25,8 @@ limitations:
 
 ---
 
+BSD Zero Clause License
+
 Copyright (c) [year] [fullname]
 
 Permission to use, copy, modify, and/or distribute this software for any