licensee 9.15.2 → 9.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 334874469d14f16839113e4311ba232c18a8bc8d0ee0c618034ec30e16497f47
-  data.tar.gz: aaca8fc841545017ee7dc58e02a8ce41845d3253a281153b599f187218c6fc6a
+  metadata.gz: a971ca02733f55d37c599851a056742f8c40d758744c252c778c245082db6b3c
+  data.tar.gz: 5cd7c9da75de50b045a68510cb9ab9442029f4a5ce3ae7011438686161de1c03
 SHA512:
-  metadata.gz: 7cd4ba6ef792da1ca97536e14b78d92c2fddf01dd14405fb859ad74db0f30018af62ea67af39a754f4a568f83f14a932d501772d83f1b5d19d22833fd8937e20
-  data.tar.gz: 9fa7c61dde8ce35d2003c1119206047c3a35179e17484d0d5528e145f99bab29882c3da004a22214c777f758ade7607289a0d73a696135cc3a9c49467ed24238
+  metadata.gz: be105dd2fee2e5e81d340be6692deb0119d3fa478732f0802b70a36f1e93994922c2c3b2567dee6518b53be75af4f7bc520addd472c791786337332bed386cd9
+  data.tar.gz: f53af3d80fd536f46767ae2316df97411b4aa4483dd3bf80f5bb3ee3ba39f5334e4c9b5276338b9d00f378347ba503ea8f804102573a32b73699ac98a1c5ec8f

data/bin/licensee

@@ -12,6 +12,10 @@ class LicenseeCLI < Thor
   class_option :remote, type: :boolean, desc: 'Assume PATH is a GitHub owner/repo path'
   default_task :detect
 
+  def self.exit_on_failure?
+    true
+  end
+
   private
 
   def path

data/lib/licensee/content_helper.rb

@@ -32,11 +32,12 @@ module Licensee
       mit_optional:        /\(including the next paragraph\)/i
     }.freeze
     NORMALIZATIONS = {
-      lists:      { from: /^\s*(?:\d\.|\*)\s+([^\n])/, to: '- \1' },
+      lists:      { from: /^\s*(?:\d\.|[*-])(?: [*_]{0,2}\(?[\da-z]\)[*_]{0,2})?\s+([^\n])/, to: '- \1' },
       https:      { from: /http:/, to: 'https:' },
       ampersands: { from: '&', to: 'and' },
       dashes:     { from: /(?<!^)([—–-]+)(?!$)/, to: '-' },
-      quote:      { from: /[`'"‘“’”]/, to: "'" }
+      quote:      { from: /[`'"‘“’”]/, to: "'" },
+      hyphenated: { from: /(\w+)-\s*\n\s*(\w+)/, to: '\1-\2' }
     }.freeze
 
     # Legally equivalent words that schould be ignored for comparison
@@ -82,8 +83,8 @@ module Licensee
       'whilst'          => 'while',
       'wilful'          => 'wilfull',
       'non-commercial'  => 'noncommercial',
-      'cent'            => 'percent',
-      'owner'           => 'holder'
+      'per cent'        => 'percent',
+      'copyright owner' => 'copyright holder'
     }.freeze
     STRIP_METHODS = %i[
       bom
@@ -341,7 +342,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 * 5)
       adjusted_delta.positive? ? adjusted_delta : 0
     end
   end

data/lib/licensee/license.rb

@@ -74,7 +74,7 @@ module Licensee
       end
 
       def keys_licenses(options = {})
-        @keys_licenses[options] ||= all(options).map { |l| [l.key, l] }.to_h
+        @keys_licenses[options] ||= all(options).to_h { |l| [l.key, l] }
       end
     end
 
@@ -151,7 +151,15 @@ module Licensee
       string.sub!(/v(\d+\.\d+)/, '\1')
       string = Regexp.escape(string)
       string = string.sub(/\\ licen[sc]e/i, '(?:\ licen[sc]e)?')
-      string = string.sub(/\\ (\d+\\.\d+)/, ',?\s+(?:version\ |v(?:\. )?)?\1')
+      version_match = string.match(/\d+\\.(\d+)/)
+      if version_match
+        vsub = if version_match[1] == '0'
+                 ',?\s+(?:version\ |v(?:\. )?)?\1(\2)?'
+               else
+                 ',?\s+(?:version\ |v(?:\. )?)?\1\2'
+               end
+        string = string.sub(/\\ (\d+)(\\.\d+)/, vsub)
+      end
       string = string.sub(/\bgnu\\ /, '(?:GNU )?')
       title_regex = Regexp.new string, 'i'
 
@@ -216,7 +224,7 @@ module Licensee
     end
 
     def ==(other)
-      !other.nil? && key == other.key
+      other.is_a?(self.class) && key == other.key
     end
 
     def pseudo_license?

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}([_*\-\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/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/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/version.rb

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

data/licensee.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |gem|
   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')
 
@@ -37,7 +37,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('simplecov', '~> 0.16')
   gem.add_development_dependency('webmock', '~> 3.1')
 
-  gem.required_ruby_version = '>= 2.5'
+  gem.required_ruby_version = '>= 2.6'
 
   # ensure the gem is built out of versioned files
   gem.files = Dir[

data/spec/fixture_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe 'fixture test' do
       end
 
       it 'returns the expected hash' do
-        hash = license_file ? license_file.content_hash : nil
+        hash = license_file&.content_hash
         expect(hash).to eql(expectations['hash'])
       end