licensee 9.14.1 → 9.15.0

data/spec/fixtures/license-hashes.json

@@ -1,41 +1,42 @@
 {
-  "0bsd": "7a6d7180345f015f6aaf49fac3154ed18b7db9ee",
-  "afl-3.0": "b991770683c71abd5c8cd8c8f10a03fedcdc76ec",
-  "agpl-3.0": "d445855a1f169b12cbee97d320c2e3522d053016",
-  "apache-2.0": "ab3901051663cb8ee5dea9ebdff406ad136910e3",
-  "artistic-2.0": "a2ff6e7fb76e51bda9a5350c759a824f206049d1",
-  "bsd-2-clause": "59f0099ff04225daf184db3fe55e478256133b1a",
-  "bsd-3-clause": "fa22c672927af9c7334874561198799cbf4bdf31",
-  "bsd-3-clause-clear": "251d4599b622d2a87b2c4bb21dfacd438c048466",
-  "bsd-4-clause": "c31a46c2b8764b63d73332c5e9e11f109dadee45",
-  "bsl-1.0": "ca8f916d00c234719956e932061f192abb2d5bf9",
-  "cc-by-4.0": "25b636566bb4cee96f8e917e6382b7c4a6858a90",
-  "cc-by-sa-4.0": "0b36f96c5df2aebaf4c5a9c2209d73ed0700a677",
-  "cc0-1.0": "c07f7fdd02072b9b9ddafb29c7fe556ed4d31f6a",
-  "cecill-2.1": "c996e4f8246fddc4fb083f72a70a85f36dffd288",
-  "ecl-2.0": "b24f240cd556a7764b9ace1bd763ad70c510d92a",
-  "epl-1.0": "e306464a81ab0e6688653c6509245b451637172c",
-  "epl-2.0": "b57663bc9c3f41446a8cd3f0050149221a58fe66",
-  "eupl-1.1": "873e30dbc5f75d076d7aecb6ceb84fb6bb765452",
-  "eupl-1.2": "f122f96b9f1a56e4806a89cb1cc6ca2bb956f3e5",
-  "gpl-2.0": "3becd209e8ed8039656c1debe01dd17b9a79208f",
-  "gpl-3.0": "b22f1b1f953a38a8a11686587b98831858d6468b",
-  "isc": "d168f98624be864548b2bbf4f198fdbf702d6743",
-  "lgpl-2.1": "91e779a787786276618f58d6e396a5e64a981805",
-  "lgpl-3.0": "bdb3c042bd84f914eacfbe4977c5e58352745809",
-  "lppl-1.3c": "60961652297042d28bb689c17fac47eca7348d16",
-  "mit": "d64f3bb4282a97b37454b5bb96a8a264a3363dc3",
-  "mpl-2.0": "b4db668fa7573bfdcae74eb51eafc961034f0a61",
-  "ms-pl": "c900293d66a241e54f7817367a8f32f7f94e12ff",
-  "ms-rl": "402bf344e506a8d10175c1e516b396c060ffd823",
-  "ncsa": "da965ab8e2094b0f0ac97a8502272b5400c29508",
-  "odbl-1.0": "6246137f1527f9a90b77e05bd5061bee83bb33ae",
-  "ofl-1.1": "1fb0563aa1250e18a6948afde286edc95761f461",
-  "osl-3.0": "ab241ef932d3ac038e8ed62c860e9eba051ae7a0",
-  "postgresql": "87550a6bb3409db00d8552b2ac07d373ea56a024",
-  "unlicense": "853b375edc61b9e823da0fa5fead97c9460c3e45",
-  "upl-1.0": "af9efb6f7b29f8c2d486ccb28223db0aa8372c29",
-  "vim": "76268065cdc78dd7f3677df936cb24aa93aa14b0",
+  "0bsd": "c8c3d65fb228583b10cc531f5ddb3cf4fc095508",
+  "afl-3.0": "dbc79db278e7bef9cff16168ac32d4e281542eeb",
+  "agpl-3.0": "10486392ac9e730ec8f77bd1233edfc2d47dd23c",
+  "apache-2.0": "bec905d850e7f5dc2e2db78a950d4a9db560a0b8",
+  "artistic-2.0": "707698f0c53ab48d54b7fd2dc4a6f40533e8ebb3",
+  "bsd-2-clause": "a307ca750c21f262c95d2bce55e69c05e6c3dee9",
+  "bsd-3-clause": "a961b19cc6921d510e29a13b0ba1a826fcffe41c",
+  "bsd-3-clause-clear": "0fcdb12c4060ce8f406e17bc67787e50a9b36a61",
+  "bsd-4-clause": "3b2917580b2b6f13efaaea37546b8b7a53716a30",
+  "bsl-1.0": "27e28f20b57048cf04be07e1532b6fb501a0753b",
+  "cc-by-4.0": "b2089be110aca4cf4a562a88f0ecfd082ce32167",
+  "cc-by-sa-4.0": "20e2ae68f7dd2125beb70f732cd52d376687597f",
+  "cc0-1.0": "94c8187ec82b2b4a69fb990f80833fbe6e3c95e7",
+  "cecill-2.1": "edb804827a40bcdcf3e82b6bab3bd1f5b923ac74",
+  "ecl-2.0": "296976ce9e84ba380866e4519b68a779c2059b3a",
+  "epl-1.0": "5e3cb10996b4ba2821d04d5c99a912c924b3bdcb",
+  "epl-2.0": "e2f3e266432478d9248422228a75a404cce1c43c",
+  "eupl-1.1": "b35810b4113910f5f85af75f24e2538ba64c8876",
+  "eupl-1.2": "2098182069695981c6dc71093888f6204c7bbdae",
+  "gpl-2.0": "32108116603c30687d8d0d2f77f140fb6ecea082",
+  "gpl-3.0": "7d4cdf499d39e2e1ce27b2878e22872f0f5a74dd",
+  "isc": "7fcb74e2084b361556b8285d6f800495d0d5e36a",
+  "lgpl-2.1": "82420393a49840ea66ed4df4c550a2ff3955e70e",
+  "lgpl-3.0": "2f434698bab479f8f6c5043f2796767287f40495",
+  "lppl-1.3c": "cd1336cb08b1b97bcbe32119cdd8f518d8b340a3",
+  "mit": "4c2c763d64bbc7ef2e58b0ec6d06d90cee9755c9",
+  "mit-0": "b19f2d3e3e0cbba6ccd5808dd7be60a19172824b",
+  "mpl-2.0": "820048a1dbef5dfac65547bd9eb935beb76b2257",
+  "ms-pl": "1a7eb02101924998c296c8ede182005d2f77ae4a",
+  "ms-rl": "9f0c4c8be853cf1836a619cd0abaf0e0235d76ad",
+  "ncsa": "0d481a7ff9345e19cfdd9b7fea46caea1ebd08ee",
+  "odbl-1.0": "72a4e9321a871bca3c5dd0f06ffe498d340e8d76",
+  "ofl-1.1": "f92ca13e3976f94f20b49a007f7592631b4f8e96",
+  "osl-3.0": "bdde11f936b834bd06451d1ad8aad790d4a7c72c",
+  "postgresql": "6bddd8a2425baa88ee240b1c54b532d6208028bd",
+  "unlicense": "859a7d829d402dd6e047293d87979dacc1b88f37",
+  "upl-1.0": "f9a6bb39f54539ff3084ee4d754fc30cbba34d40",
+  "vim": "10e72ceebb7ab0a34ff1ed90241953b3756fd938",
   "wtfpl": "f8544c074f203d86cdcb24082fedfb2cf2fe411a",
-  "zlib": "576139d1f785b8f3539099b9702fc68005ee2213"
+  "zlib": "d75cdaa2dd3ceb3f0db609005a32f825b37d1a8c"
 }

data/spec/fixtures/pixar-modified-apache/LICENSE.txt

@@ -0,0 +1,174 @@
+
+                               Modified Apache 2.0 License
+
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor
+      and its affiliates, except as required to comply with Section 4(c) of
+      the License and to reproduce the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

data/spec/integration_spec.rb

@@ -40,9 +40,7 @@ RSpec.describe 'integration test' do
 
           before do
             File.write(file_path, 'bar')
-            if project_type == Licensee::Projects::GitProject
-              git_init(project_path)
-            end
+            git_init(project_path) if project_type == Licensee::Projects::GitProject
           end
 
           after { FileUtils.rm_rf(project_path) }
@@ -107,6 +105,14 @@ RSpec.describe 'integration test' do
           end
         end
 
+        context 'with Pixar Modified Apache 2.0' do
+          let(:fixture) { 'pixar-modified-apache' }
+
+          it 'matches other' do
+            expect(subject.license).to eql(other_license)
+          end
+        end
+
         context 'with FCPL Modified MPL' do
           let(:fixture) { 'fcpl-modified-mpl' }
 
@@ -197,6 +203,15 @@ RSpec.describe 'integration test' do
           end
         end
 
+        context 'EUPL as published on choosealicense.com 2017-2019' do
+          let(:license) { Licensee::License.find('eupl-1.2') }
+          let(:fixture) { 'eupl-cal2017' }
+
+          it 'returns eupl-1.2' do
+            expect(subject.license).to eql(license)
+          end
+        end
+
         context 'Unlicense without optional line' do
           let(:license) { Licensee::License.find('unlicense') }
           let(:fixture) { 'unlicense-noinfo' }
@@ -271,6 +286,15 @@ RSpec.describe 'integration test' do
           end
         end
 
+        context 'BSD-3-Clause author/owner variant' do
+          let(:license) { Licensee::License.find('bsd-3-clause') }
+          let(:fixture) { 'bsd-3-authorowner' }
+
+          it 'determines the project is BSD-3-Clause' do
+            expect(subject.license).to eql(license)
+          end
+        end
+
         context 'HTML license file' do
           let(:license) { Licensee::License.find('epl-1.0') }
           let(:fixture) { 'html' }
@@ -289,6 +313,24 @@ RSpec.describe 'integration test' do
           end
         end
 
+        context 'CC-BY-SA no CC licensor statement license file' do
+          let(:license) { Licensee::License.find('cc-by-sa-4.0') }
+          let(:fixture) { 'cc-by-sa-nocclicensor' }
+
+          it 'matches to CC-BY-SA' do
+            expect(subject.license).to eql(license)
+          end
+        end
+
+        context 'CC-BY-SA markdown links file' do
+          let(:license) { Licensee::License.find('cc-by-sa-4.0') }
+          let(:fixture) { 'cc-by-sa-mdlinks' }
+
+          it 'matches to CC-BY-SA' do
+            expect(subject.license).to eql(license)
+          end
+        end
+
         context 'MIT with byte order mark' do
           let(:license) { Licensee::License.find('mit') }
           let(:fixture) { 'bom' }
@@ -304,9 +346,7 @@ RSpec.describe 'integration test' do
 
         before do
           File.write(license_path, content)
-          if project_type == Licensee::Projects::GitProject
-            git_init(project_path)
-          end
+          git_init(project_path) if project_type == Licensee::Projects::GitProject
         end
 
         after { FileUtils.rm_rf(project_path) }

data/spec/licensee/commands/detect_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe 'detect command' do
       'Matched files'    => 'LICENSE.md, licensee.gemspec',
       'LICENSE.md'       => {
         'Content hash' => hash,
-        'Attribution'  => 'Copyright (c) 2014-2020 Ben Balter and Licensee contributors',
+        'Attribution'  => 'Copyright (c) 2014-2021 Ben Balter and Licensee contributors',
         'Confidence'   => '100.00%',
         'Matcher'      => 'Licensee::Matchers::Exact',
         'License'      => 'MIT'
@@ -70,7 +70,7 @@ RSpec.describe 'detect command' do
     end
 
     it 'returns the expected output' do
-      msg = '`licensee detect --json` output did not match expectations. '.dup
+      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
     end

data/spec/licensee/content_helper_spec.rb

@@ -12,10 +12,14 @@ class ContentHelperTestHelper
   def filename
     @data[:filename]
   end
+
+  def spdx_id
+    @data[:spdx_id]
+  end
 end
 
 RSpec.describe Licensee::ContentHelper do
-  subject { ContentHelperTestHelper.new(content, filename: filename) }
+  subject { ContentHelperTestHelper.new(content, filename: filename, spdx_id: spdx_id) }
 
   let(:content) do
     <<-LICENSE.gsub(/^\s*/, '')
@@ -37,6 +41,7 @@ RSpec.describe Licensee::ContentHelper do
     LICENSE
   end
   let(:filename) { 'license.md' }
+  let(:spdx_id) { 'MIT' }
 
   let(:mit) { Licensee::License.find('mit') }
   let(:normalized_content) { subject.content_normalized }
@@ -44,7 +49,7 @@ RSpec.describe Licensee::ContentHelper do
   it 'creates the wordset' do
     wordset = Set.new(
       %w[
-        the made up license this provided as is please respect
+        the made up license this provided as is' please respect
         contributors' wishes when implementing license's software
       ]
     )
@@ -61,12 +66,12 @@ RSpec.describe Licensee::ContentHelper do
   end
 
   it 'knows the similarity' do
-    expect(subject.similarity(mit)).to be_within(1).of(6)
-    expect(subject.similarity(subject)).to be(100.0)
+    expect(mit.similarity(subject)).to be_within(1).of(4)
+    expect(mit.similarity(mit)).to be(100.0)
   end
 
   it 'calculates the hash' do
-    content_hash = '916b978940ecf8070c96bd3aca9321768e7f4901'
+    content_hash = '9b4bed43726cf39e17b11c2942f37be232f5709a'
     expect(subject.content_hash).to eql(content_hash)
   end
 
@@ -169,7 +174,7 @@ RSpec.describe Licensee::ContentHelper do
     end
 
     it 'normalizes quotes' do
-      expect(normalized_content).not_to match("'as is'")
+      expect(normalized_content).not_to match('"as is"')
     end
 
     it 'preserves possessives' do
@@ -177,18 +182,14 @@ RSpec.describe Licensee::ContentHelper do
       expect(normalized_content).to match("license's")
     end
 
-    it 'preserves double quotes' do
-      expect(normalized_content).to match('"software"')
-    end
-
     it 'strips the title' do
       expect(normalized_content).not_to match('MIT')
     end
 
     it 'normalize the content' do
-      expected = 'the made up license. this license provided "as is". '.dup
+      expected = +"the made up license. this license provided 'as is'. "
       expected << "please respect the contributors' wishes when implementing "
-      expected << "the license's \"software\"."
+      expected << "the license's 'software'."
       expect(normalized_content).to eql(expected)
     end
   end
@@ -230,7 +231,7 @@ RSpec.describe Licensee::ContentHelper do
       let(:content) { "`a` 'b' \"c\" ‘d’ “e”" }
 
       it 'normalizes quotes' do
-        expect(subject.content_normalized).to eql('"a" "b" "c" "d" "e"')
+        expect(subject.content_normalized).to eql("'a' 'b' 'c' 'd' 'e'")
       end
     end