Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vendored licenses and SPDX #717

Merged
merged 2 commits into from Feb 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion spec/fixtures/detect.json
Expand Up @@ -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 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', '< 9.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 = '>= 3.0'\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', '< 4')\n gem.add_dependency('octokit', '>= 4.20', '< 9.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 = '>= 3.0'\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": {
Expand Down
1 change: 1 addition & 0 deletions spec/fixtures/license-hashes.json
Expand Up @@ -6,6 +6,7 @@
"artistic-2.0": "707698f0c53ab48d54b7fd2dc4a6f40533e8ebb3",
"blueoak-1.0.0": "4b1a6751488e0f5ac96e40f26cf4e3fc731b9daf",
"bsd-2-clause": "a307ca750c21f262c95d2bce55e69c05e6c3dee9",
"bsd-2-clause-patent": "4098aa43dc82fbb6da400e2f5b1840d8b9fcea7f",
"bsd-3-clause": "a961b19cc6921d510e29a13b0ba1a826fcffe41c",
"bsd-3-clause-clear": "0fcdb12c4060ce8f406e17bc67787e50a9b36a61",
"bsd-4-clause": "3b2917580b2b6f13efaaea37546b8b7a53716a30",
Expand Down
4 changes: 2 additions & 2 deletions spec/licensee/license_spec.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true

RSpec.describe Licensee::License do
let(:license_count) { 48 }
let(:hidden_license_count) { 35 }
let(:license_count) { 49 }
let(:hidden_license_count) { 36 }
let(:featured_license_count) { 3 }
let(:pseudo_license_count) { 2 }
let(:non_featured_license_count) do
Expand Down
2 changes: 1 addition & 1 deletion spec/licensee_spec.rb
Expand Up @@ -4,7 +4,7 @@
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) { 48 }
let(:hidden_license_count) { 49 }

it 'exposes licenses' do
expect(described_class.licenses).to be_an(Array)
Expand Down
76 changes: 76 additions & 0 deletions vendor/choosealicense.com/_licenses/bsd-2-clause-patent.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/license-list-XML/src/0BSD.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license isOsiApproved="true" licenseId="0BSD" name="BSD Zero Clause License">
<license isOsiApproved="true" licenseId="0BSD"
name="BSD Zero Clause License" listVersionAdded="2.2">
<crossRefs>
<crossRef>http://landley.net/toybox/license.html</crossRef>
<crossRef>https://opensource.org/licenses/0BSD</crossRef>
Expand Down
91 changes: 91 additions & 0 deletions vendor/license-list-XML/src/BSD-2-Clause-Patent.xml
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license licenseId="BSD-2-Clause-Patent"
name="BSD-2-Clause Plus Patent License" listVersionAdded="2.7"
isOsiApproved="true">
<crossRefs>
<crossRef>https://opensource.org/licenses/BSDplusPatent</crossRef>
</crossRefs>
<notes>
<p>
Note: This license is designed to provide: a) a simple
permissive license; b) that is compatible with the
GNU General Public License (GPL), version 2; and
c) which also has an express patent grant included.
</p>
</notes>
<text>
<copyrightText>
<p>
Copyright (c) &lt;YEAR&gt; &lt;COPYRIGHT HOLDERS&gt;
</p>
</copyrightText>
<p>
Redistribution and use in source and binary
forms, with or without modification, are permitted
provided that the following conditions are met:
</p>
<list>
<item>
<bullet>1.</bullet>
Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
</item>
<item>
<bullet>2.</bullet>
Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
</item>
</list>
<p>
Subject to the terms and conditions of this license, each copyright
holder and contributor hereby grants to those receiving rights under this
license a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable (except for failure to satisfy the conditions of this license)
patent license to make, have made, use, offer to sell, sell, import,
and otherwise transfer this software, where such license applies only to
those patent claims, already acquired or hereafter acquired, licensable
by such copyright holder or contributor that are necessarily infringed by:
</p>
<list>
<item>
<bullet>(a)</bullet>
their Contribution(s) (the licensed copyrights of
copyright holders and non-copyrightable additions
of contributors, in source or binary form) alone; or
</item>
<item>
<bullet>(b)</bullet>
combination of their Contribution(s) with the work of authorship
to which such Contribution(s) was added by such copyright
holder or contributor, if, at the time the Contribution
is added, such addition causes such combination to be
necessarily infringed. The patent license shall not apply
to any other combinations which include the Contribution.
</item>
</list>
<p>
Except as expressly stated above, no rights or licenses from any
copyright holder or contributor is granted under this license,
whether expressly, by implication, estoppel or otherwise.
</p>
<p>
DISCLAIMER
</p>
<p>
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</p>
</text>
</license>
</SPDXLicenseCollection>
2 changes: 1 addition & 1 deletion vendor/license-list-XML/src/BSD-3-Clause-Clear.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license isOsiApproved="false" licenseId="BSD-3-Clause-Clear"
name="BSD 3-Clause Clear License">
name="BSD 3-Clause Clear License" listVersionAdded="1.17">
<crossRefs>
<crossRef>http://labs.metacarta.com/license-explanation.html#license</crossRef>
</crossRefs>
Expand Down
2 changes: 1 addition & 1 deletion vendor/license-list-XML/src/CC-BY-4.0.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license isOsiApproved="false" licenseId="CC-BY-4.0"
name="Creative Commons Attribution 4.0 International">
name="Creative Commons Attribution 4.0 International" listVersionAdded="1.20">
<crossRefs>
<crossRef>https://creativecommons.org/licenses/by/4.0/legalcode</crossRef>
</crossRefs>
Expand Down
2 changes: 1 addition & 1 deletion vendor/license-list-XML/src/CC-BY-SA-4.0.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license isOsiApproved="false" licenseId="CC-BY-SA-4.0"
name="Creative Commons Attribution Share Alike 4.0 International">
name="Creative Commons Attribution Share Alike 4.0 International" listVersionAdded="1.20">
<crossRefs>
<crossRef>https://creativecommons.org/licenses/by-sa/4.0/legalcode</crossRef>
</crossRefs>
Expand Down
2 changes: 1 addition & 1 deletion vendor/license-list-XML/src/CECILL-2.1.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license isOsiApproved="true" licenseId="CECILL-2.1"
name="CeCILL Free Software License Agreement v2.1">
name="CeCILL Free Software License Agreement v2.1" listVersionAdded="2.2">
<crossRefs>
<crossRef>http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.html</crossRef>
</crossRefs>
Expand Down
2 changes: 1 addition & 1 deletion vendor/license-list-XML/src/EPL-2.0.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license isOsiApproved="true" licenseId="EPL-2.0"
name="Eclipse Public License 2.0">
name="Eclipse Public License 2.0" listVersionAdded="2.7">
<crossRefs>
<crossRef>https://www.eclipse.org/legal/epl-2.0</crossRef>
<crossRef>https://www.opensource.org/licenses/EPL-2.0</crossRef>
Expand Down
2 changes: 1 addition & 1 deletion vendor/license-list-XML/src/EUPL-1.2.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license licenseId="EUPL-1.2" isOsiApproved="true"
name="European Union Public License 1.2">
name="European Union Public License 1.2" listVersionAdded="2.7">
<crossRefs>
<crossRef>https://joinup.ec.europa.eu/page/eupl-text-11-12</crossRef>
<crossRef>https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/eupl_v1.2_en.pdf</crossRef>
Expand Down
2 changes: 1 addition & 1 deletion vendor/license-list-XML/src/UPL-1.0.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license isOsiApproved="true" licenseId="UPL-1.0"
name="Universal Permissive License v1.0">
name="Universal Permissive License v1.0" listVersionAdded="2.1">
<crossRefs>
<crossRef>https://opensource.org/licenses/UPL</crossRef>
</crossRefs>
Expand Down
2 changes: 1 addition & 1 deletion vendor/license-list-XML/src/Unlicense.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license isOsiApproved="true" licenseId="Unlicense" name="The Unlicense">
<license isOsiApproved="true" licenseId="Unlicense" name="The Unlicense" listVersionAdded="1.19">
<crossRefs>
<crossRef>https://unlicense.org/</crossRef>
</crossRefs>
Expand Down
2 changes: 1 addition & 1 deletion vendor/license-list-XML/src/Vim.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license isOsiApproved="false" licenseId="Vim" name="Vim License">
<license isOsiApproved="false" licenseId="Vim" name="Vim License" listVersionAdded="1.20">
<crossRefs>
<crossRef>http://vimdoc.sourceforge.net/htmldoc/uganda.html</crossRef>
</crossRefs>
Expand Down
2 changes: 1 addition & 1 deletion vendor/license-list-XML/src/WTFPL.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<license isOsiApproved="false" licenseId="WTFPL"
name="Do What The F*ck You Want To Public License">
name="Do What The F*ck You Want To Public License" listVersionAdded="1.17">
<crossRefs>
<crossRef>http://www.wtfpl.net/about/</crossRef>
<crossRef>http://sam.zoy.org/wtfpl/COPYING</crossRef>
Expand Down