licensee 9.13.0 → 9.15.0

data/spec/licensee/license_meta_spec.rb

@@ -115,17 +115,11 @@ RSpec.describe Licensee::LicenseMeta do
   context 'to_h' do
     let(:hash) { subject.to_h }
     let(:using) do
-      [
-        {
-          'Babel' => 'https://github.com/babel/babel/blob/master/LICENSE'
-        },
-        {
-          '.NET Core' => 'https://github.com/dotnet/corefx/blob/master/LICENSE.TXT'
-        },
-        {
-          'Rails' => 'https://github.com/rails/rails/blob/master/MIT-LICENSE'
-        }
-      ]
+      {
+        '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'
+      }
     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) { 40 }
-  let(:hidden_license_count) { 27 }
+  let(:license_count) { 42 }
+  let(:hidden_license_count) { 29 }
   let(:featured_license_count) { 3 }
   let(:pseudo_license_count) { 2 }
   let(:non_featured_license_count) do
@@ -345,7 +345,7 @@ RSpec.describe Licensee::License do
     context 'muscache' do
       let(:license) do
         license = described_class.new 'MIT'
-        content = license.content + '[foo] [bar]'
+        content = "#{license.content}[foo] [bar]"
         license.instance_variable_set(:@content, content)
         license
       end
@@ -365,9 +365,10 @@ RSpec.describe Licensee::License do
   end
 
   context 'License.title_regex' do
+    namey = %i[title nickname key]
     described_class.all(hidden: true, pseudo: false).each do |license|
       context "the #{license.title} license" do
-        %i[title nickname key].each do |variation|
+        namey.each do |variation|
           next if license.send(variation).nil?
 
           context "the license #{variation}" do
@@ -382,7 +383,7 @@ RSpec.describe Licensee::License do
               expect(described_class.find_by_title(text)).to eql(license)
             end
 
-            if license.title =~ /\bGNU\b/
+            if /\bGNU\b/.match?(license.title)
               context "without 'GNU'" do
                 let(:text) { license_variation.sub(/GNU /i, '') }
 
@@ -475,26 +476,29 @@ RSpec.describe Licensee::License do
   end
 
   context 'source regex' do
+    schemes = %w[http https]
+    prefixes = ['www.', '']
+    suffixes = ['.html', '.htm', '.txt', '']
     described_class.all(hidden: true, pseudo: false).each do |license|
       context "the #{license.title} license" do
         let(:source) { URI.parse(license.source) }
 
-        %w[http https].each do |scheme|
+        schemes.each do |scheme|
           context "with a #{scheme}:// scheme" do
             before { source.scheme = scheme }
 
-            ['www.', ''].each do |prefix|
+            prefixes.each do |prefix|
               context "with '#{prefix}' before the host" do
                 before do
-                  source.host = "#{prefix}#{source.host.sub(/\Awww\./, '')}"
+                  source.host = "#{prefix}#{source.host.delete_prefix('www.')}"
                 end
 
-                ['.html', '.htm', '.txt', ''].each do |suffix|
+                suffixes.each do |suffix|
                   context "with '#{suffix}' after the path" do
                     before do
                       next if license.key == 'wtfpl'
 
-                      regex = /#{Licensee::License::SOURCE_SUFFIX}\z/
+                      regex = /#{Licensee::License::SOURCE_SUFFIX}\z/o
                       source.path = source.path.sub(regex, '')
                       source.path = "#{source.path}#{suffix}"
                     end

data/spec/licensee/matchers/dice_matcher_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe Licensee::Matchers::Dice do
   let(:mit) { Licensee::License.find('mit') }
   let(:gpl) { Licensee::License.find('gpl-3.0') }
   let(:agpl) { Licensee::License.find('agpl-3.0') }
+  let(:lgpl) { Licensee::License.find('lgpl-2.1') }
   let(:cc_by) { Licensee::License.find('cc-by-4.0') }
   let(:cc_by_sa) { Licensee::License.find('cc-by-sa-4.0') }
   let(:content) { sub_copyright_info(gpl) }
@@ -19,18 +20,10 @@ RSpec.describe Licensee::Matchers::Dice do
     expect(subject.match).to eql(gpl)
   end
 
-  it 'builds a list of potential licenses' do
-    expect(subject.potential_matches).to eql([agpl, gpl])
-  end
-
   it 'sorts licenses by similarity' do
     expect(subject.matches_by_similarity[0]).to eql([gpl, 100.0])
-    expect(subject.matches_by_similarity[1]).to eql([agpl, 95.67966280295047])
-  end
-
-  it 'returns a list of licenses above the confidence threshold' do
-    expect(subject.matches_by_similarity[0]).to eql([gpl, 100.0])
-    expect(subject.matches_by_similarity[1]).to eql([agpl, 95.67966280295047])
+    expect(subject.matches_by_similarity[1]).to eql([agpl, 94.56967213114754])
+    expect(subject.matches_by_similarity[2]).to eql([lgpl, 26.821370750134918])
   end
 
   it 'returns the match confidence' do
@@ -49,7 +42,7 @@ RSpec.describe Licensee::Matchers::Dice do
 
   context 'stacked licenses' do
     let(:content) do
-      sub_copyright_info(mit) + "\n\n" + sub_copyright_info(gpl)
+      "#{sub_copyright_info(mit)}\n\n#{sub_copyright_info(gpl)}"
     end
 
     it "doesn't match" do

data/spec/licensee/matchers/matcher_spec.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+class MatcherSpecFixture < Licensee::Matchers::Matcher
+  def confidence
+    0
+  end
+end
+
 RSpec.describe Licensee::Matchers::Matcher do
   subject { described_class.new(file) }
 
@@ -16,12 +22,6 @@ RSpec.describe Licensee::Matchers::Matcher do
   end
 
   context 'to_h' do
-    class MatcherSpecFixture < Licensee::Matchers::Matcher
-      def confidence
-        0
-      end
-    end
-
     subject { MatcherSpecFixture.new(file) }
 
     let(:hash) { subject.to_h }

data/spec/licensee/matchers/npm_bower_matcher_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe Licensee::Matchers::NpmBower do
   let(:file) { Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE.txt') }
   let(:mit) { Licensee::License.find('mit') }
   let(:other) { Licensee::License.find('other') }
+  let(:no_license) { Licensee::License.find('no-license') }
 
   it 'matches' do
     expect(subject.match).to eql(mit)
@@ -56,4 +57,12 @@ RSpec.describe Licensee::Matchers::NpmBower do
       expect(subject.match).to eql(other)
     end
   end
+
+  context 'UNLICENSED' do
+    let(:content) { "'license': 'UNLICENSED'" }
+
+    it 'returns none' do
+      expect(subject.match).to eql(no_license)
+    end
+  end
 end

data/spec/licensee/matchers/nu_get_matcher_spec.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+RSpec.describe Licensee::Matchers::NuGet do
+  subject { described_class.new(file) }
+
+  let(:content) { '<license type="expression">mit</license>' }
+  let(:file) { Licensee::ProjectFiles::LicenseFile.new(content, 'foo.nuspec') }
+  let(:mit) { Licensee::License.find('mit') }
+  let(:apache2) { Licensee::License.find('apache-2.0') }
+  let(:other) { Licensee::License.find('other') }
+
+  it 'matches' do
+    expect(subject.match).to eql(mit)
+  end
+
+  it 'has a confidence' do
+    expect(subject.confidence).to be(90)
+  end
+
+  {
+    'double quotes'      => '<license type="expression">mit</license>',
+    'single quotes'      => "<license type='expression'>mit</license>",
+    'whitespace'         => '<license  type = "expression" >mit</license >',
+    'leading whitespace' => ' <license type="expression">mit</license>'
+  }.each do |description, license_declaration|
+    context "with a #{description} license element" do
+      let(:content) { license_declaration }
+
+      it 'matches' do
+        expect(subject.match).to eql(mit)
+      end
+    end
+  end
+
+  context 'no license field' do
+    let(:content) { '<file>wrongelement</file>' }
+
+    it 'returns nil' do
+      expect(subject.match).to be_nil
+    end
+  end
+
+  context 'an unknown license' do
+    let(:content) { '<license type="expression">foo</license>' }
+
+    it 'returns other' do
+      expect(subject.match).to eql(other)
+    end
+  end
+
+  context 'a license expression' do
+    let(:content) { '<license type="expression">BSD-2-Clause OR MIT</license>' }
+
+    it 'returns other' do
+      expect(subject.match).to eql(other)
+    end
+  end
+
+  {
+    'nuget'            => '<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>',
+    'nuget (http)'     => '<licenseUrl>http://licenses.nuget.org/Apache-2.0</licenseUrl>',
+    'opensource'       => '<licenseUrl>https://opensource.org/licenses/Apache-2.0</licenseUrl>',
+    'opensource (www)' => '<licenseUrl>http://www.opensource.org/licenses/Apache-2.0</licenseUrl>',
+    'spdx'             => '<licenseUrl>https://spdx.org/licenses/Apache-2.0</licenseUrl>',
+    'spdx (www)'       => '<licenseUrl>http://www.spdx.org/licenses/Apache-2.0</licenseUrl>',
+    'spdx (html)'      => '<licenseUrl>https://spdx.org/licenses/Apache-2.0.html</licenseUrl>',
+    'spdx (txt)'       => '<licenseUrl>https://spdx.org/licenses/Apache-2.0.txt</licenseUrl>'
+  }.each do |description, license_declaration|
+    context "with a #{description} licenseUrl element containing SPDX" do
+      let(:content) { license_declaration }
+
+      it 'matches' do
+        expect(subject.match).to eql(apache2)
+      end
+    end
+  end
+
+  {
+    '2.0 (https)'    => '<licenseUrl>https://apache.org/licenses/LICENSE-2.0</licenseUrl>',
+    '2.0 (http/www)' => '<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>',
+    '2.0 (txt)'      => '<licenseUrl>https://apache.org/licenses/LICENSE-2.0.txt</licenseUrl>'
+  }.each do |description, license_declaration|
+    context "with an apache.org #{description} licenseUrl element" do
+      let(:content) { license_declaration }
+
+      it 'matches' do
+        expect(subject.match).to eql(apache2)
+      end
+    end
+  end
+end

data/spec/licensee/project_files/license_file_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe Licensee::ProjectFiles::LicenseFile do
   end
 
   it 'creates the wordset' do
-    expect(subject.wordset.count).to be(91)
+    expect(subject.wordset.count).to be(93)
     expect(subject.wordset.first).to eql('permission')
   end
 
@@ -57,32 +57,39 @@ RSpec.describe Licensee::ProjectFiles::LicenseFile do
 
   context 'filename scoring' do
     {
-      'license'            => 1.00,
-      'LICENCE'            => 1.00,
-      'unLICENSE'          => 1.00,
-      'unlicence'          => 1.00,
-      'license.md'         => 0.95,
-      'LICENSE.md'         => 0.95,
-      'license.txt'        => 0.95,
-      'COPYING'            => 0.90,
-      'copyRIGHT'          => 0.90,
-      'COPYRIGHT.txt'      => 0.85,
-      'copying.txt'        => 0.85,
-      'LICENSE.php'        => 0.80,
-      'LICENCE.docs'       => 0.80,
-      'copying.image'      => 0.75,
-      'COPYRIGHT.go'       => 0.75,
-      'LICENSE-MIT'        => 0.70,
-      'LICENSE_1_0.txt'    => 0.70,
-      'COPYING-GPL'        => 0.65,
-      'COPYRIGHT-BSD'      => 0.65,
-      'MIT-LICENSE.txt'    => 0.60,
-      'mit-license-foo.md' => 0.60,
-      'OFL.md'             => 0.50,
-      'ofl.textile'        => 0.45,
-      'ofl'                => 0.40,
-      'not-the-ofl'        => 0.00,
-      'README.txt'         => 0.00
+      'license'             => 1.00,
+      'LICENCE'             => 1.00,
+      'unLICENSE'           => 1.00,
+      'unlicence'           => 1.00,
+      'license.md'          => 0.95,
+      'LICENSE.md'          => 0.95,
+      'license.txt'         => 0.95,
+      'COPYING'             => 0.90,
+      'copyRIGHT'           => 0.90,
+      'COPYRIGHT.txt'       => 0.85,
+      'copying.txt'         => 0.85,
+      'LICENSE.php'         => 0.80,
+      'LICENCE.docs'        => 0.80,
+      'license.xml'         => 0.80,
+      'copying.image'       => 0.75,
+      'COPYRIGHT.go'        => 0.75,
+      'LICENSE-MIT'         => 0.70,
+      'LICENSE_1_0.txt'     => 0.70,
+      'COPYING-GPL'         => 0.65,
+      'COPYRIGHT-BSD'       => 0.65,
+      'MIT-LICENSE.txt'     => 0.60,
+      'mit-license-foo.md'  => 0.60,
+      'OFL.md'              => 0.50,
+      'ofl.textile'         => 0.45,
+      'ofl'                 => 0.40,
+      'not-the-ofl'         => 0.00,
+      'README.txt'          => 0.00,
+      '.pip-license-ignore' => 0.00,
+      'license-checks.xml'  => 0.00,
+      'license_test.go'     => 0.00,
+      'licensee.gemspec'    => 0.00,
+      'LICENSE.spdx'        => 0.00
+
     }.each do |filename, expected|
       context "a file named #{filename}" do
         let(:score) { described_class.name_score(filename) }
@@ -162,7 +169,7 @@ RSpec.describe Licensee::ProjectFiles::LicenseFile do
       expect(subject).not_to be_a_potential_false_positive
     end
 
-    context 'a CC false positive without creative commons in the title' do
+    context 'a CC false positive with creative commons in the title' do
       let(:content) { 'Creative Commons Attribution-NonCommercial 4.0' }
 
       it "knows it's a potential false positive" do

data/spec/licensee/project_files/package_info_spec.rb

@@ -71,5 +71,13 @@ RSpec.describe Licensee::ProjectFiles::PackageManagerFile do
         expect(possible_matchers).to eql([Licensee::Matchers::Cran])
       end
     end
+
+    context 'with nuspec file' do
+      let(:filename) { 'foo.nuspec' }
+
+      it 'returns the NuGet matcher' do
+        expect(possible_matchers).to eql([Licensee::Matchers::NuGet])
+      end
+    end
   end
 end

data/spec/licensee/project_spec.rb

@@ -106,9 +106,7 @@
         license = files.find { |f| f[:name] == 'LICENSE.txt' }
         expect(license).not_to be_nil
 
-        if described_class == Licensee::Projects::GitProject
-          expect(files.first).to have_key(:oid)
-        end
+        expect(files.first).to have_key(:oid) if described_class == Licensee::Projects::GitProject
       end
 
       it "returns a file's content" do

data/spec/licensee/rule_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe Licensee::Rule do
   context 'to_h' do
     let(:hash) { described_class.all.first.to_h }
     let(:description) do
-      'This software and derivatives may be used for commercial purposes.'
+      'The licensed material and derivatives may be used for commercial purposes.'
     end
     let(:expected) 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) { 40 }
+  let(:hidden_license_count) { 42 }
 
   it 'exposes licenses' do
     expect(described_class.licenses).to be_an(Array)

data/spec/spec_helper.rb

@@ -80,8 +80,8 @@ end
 
 # Add random words to the end of a license to test similarity tollerances
 def add_random_words(string, count = 5)
-  words = string.dup.split(' ')
-  ipsum = File.read(fixture_path('ipsum.txt')).split(' ')
+  words = string.dup.split
+  ipsum = File.read(fixture_path('ipsum.txt')).split
   count.times do
     word = ipsum[Random.rand(ipsum.length)]
     index = Random.rand(words.length)
@@ -91,7 +91,7 @@ def add_random_words(string, count = 5)
 end
 
 # Init git dir
-# Note: we disable gpgsign and restore it to its original setting to avoid
+# NOTE: we disable gpgsign and restore it to its original setting to avoid
 # Signing commits during tests and slowing down / breaking specs
 def git_init(path)
   Dir.chdir path do

data/spec/vendored_license_spec.rb

@@ -16,8 +16,8 @@ RSpec.describe 'vendored licenses' do
       let(:content) { content_with_copyright }
       let(:expected_hash) { license_hashes[license.key] }
       let(:hash_change_msg) do
-        msg = 'Did you update a vendored license? Run'.dup
-        msg << '    bundle exec script/hash-licenses'
+        msg = +'Did you update a vendored license? Run '
+        msg << '`bundle exec script/hash-licenses`. '
         msg << 'Changes in license hashes must be a MINOR (or MAJOR) bump.'
         msg
       end

data/vendor/choosealicense.com/_data/meta.yml

@@ -30,7 +30,7 @@
   required: true
 
 - name: using
-  description: 'A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`'
+  description: 'A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/licensee/licensee) in the form of `project_name: license_file_url`'
   required: true
 
 # Optional fields