diff --git a/Gemfile b/Gemfile
index c92472d..6677662 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,6 @@ end
group :test do
gem 'html-proofer', '~> 3.0'
gem 'licensee'
- gem 'nokogiri'
gem 'rake'
gem 'rspec'
gem 'rubocop'
diff --git a/LICENSE.md b/LICENSE.md
index a08a18f..4b26f77 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2017 GitHub, Inc. and contributors
+Copyright (c) 2013-2018 GitHub, Inc. and contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 87c5bb6..24c54d7 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,7 @@ The licenses on choosealicense.com are regularly imported to GitHub.com to be us
* `project` - The repository name
* `description` - The description of the repository
* `year` - The current year
+* `projecturl` - The repository URL or other project website
## License properties
diff --git a/_data/fields.yml b/_data/fields.yml
index 0b5f45d..4e55d42 100644
--- a/_data/fields.yml
+++ b/_data/fields.yml
@@ -21,3 +21,6 @@
- name: year
description: The current year
+
+- name: projecturl
+ description: The repository URL or other project website
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index aef5124..a1218b5 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -14,7 +14,7 @@
{% endif %}
{% assign xgpl = false %}
{% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %}
- Optional: Add {{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}{% if xgpl %} (or {{ page.spdx-id }}-only to disallow future versions){% endif %} to your project's package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.
+ Optional: Add {{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}{% if xgpl %} (or {{ page.spdx-id }}-only to disallow future versions){% endif %} to your project's package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.
{% if page.source %}
diff --git a/_licenses/eupl-1.2.txt b/_licenses/eupl-1.2.txt
new file mode 100644
index 0000000..550ffe7
--- /dev/null
+++ b/_licenses/eupl-1.2.txt
@@ -0,0 +1,309 @@
+---
+title: European Union Public License 1.2
+spdx-id: EUPL-1.2
+source: http://eur-lex.europa.eu/legal-content/TXT/?uri=CELEX%3A32017D0863
+
+description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union.
+
+how: Indicate “Licensed under the EUPL” following the copyright notice of your source code, for example in a README file or directly in a source code file as a comment.
+
+using:
+ - AethysRotation: https://github.com/SimCMinMax/AethysRotation/blob/master/LICENSE
+ - WildDuck: https://github.com/nodemailer/wildduck/blob/master/LICENSE
+ - ZoneMTA: https://github.com/zone-eu/zone-mta/blob/master/LICENSE
+
+permissions:
+ - commercial-use
+ - modifications
+ - distribution
+ - patent-use
+ - private-use
+
+conditions:
+ - include-copyright
+ - disclose-source
+ - document-changes
+ - network-use-disclose
+ - same-license
+
+limitations:
+ - liability
+ - trademark-use
+ - warranty
+
+---
+
+European Union Public Licence
+V. 1.2
+
+EUPL © the European Union 2007, 2016
+
+This European Union Public Licence (the ‘EUPL’) applies to the Work (as
+defined below) which is provided under the terms of this Licence. Any use of
+the Work, other than as authorised under this Licence is prohibited (to the
+extent such use is covered by a right of the copyright holder of the Work).
+
+The Work is provided under the terms of this Licence when the Licensor (as
+defined below) has placed the following notice immediately following the
+copyright notice for the Work: “Licensed under the EUPL”, or has expressed by
+any other means his willingness to license under the EUPL.
+
+1. Definitions
+
+In this Licence, the following terms have the following meaning:
+— ‘The Licence’: this Licence.
+— ‘The Original Work’: the work or software distributed or communicated by the
+ ‘Licensor under this Licence, available as Source Code and also as
+ ‘Executable Code as the case may be.
+— ‘Derivative Works’: the works or software that could be created by the
+ ‘Licensee, based upon the Original Work or modifications thereof. This
+ ‘Licence does not define the extent of modification or dependence on the
+ ‘Original Work required in order to classify a work as a Derivative Work;
+ ‘this extent is determined by copyright law applicable in the country
+ ‘mentioned in Article 15.
+— ‘The Work’: the Original Work or its Derivative Works.
+— ‘The Source Code’: the human-readable form of the Work which is the most
+ convenient for people to study and modify.
+
+— ‘The Executable Code’: any code which has generally been compiled and which
+ is meant to be interpreted by a computer as a program.
+— ‘The Licensor’: the natural or legal person that distributes or communicates
+ the Work under the Licence.
+— ‘Contributor(s)’: any natural or legal person who modifies the Work under
+ the Licence, or otherwise contributes to the creation of a Derivative Work.
+— ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of
+ the Work under the terms of the Licence.
+— ‘Distribution’ or ‘Communication’: any act of selling, giving, lending,
+ renting, distributing, communicating, transmitting, or otherwise making
+ available, online or offline, copies of the Work or providing access to its
+ essential functionalities at the disposal of any other natural or legal
+ person.
+
+2. Scope of the rights granted by the Licence
+
+The Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+sublicensable licence to do the following, for the duration of copyright
+vested in the Original Work:
+
+— use the Work in any circumstance and for all usage,
+— reproduce the Work,
+— modify the Work, and make Derivative Works based upon the Work,
+— communicate to the public, including the right to make available or display
+ the Work or copies thereof to the public and perform publicly, as the case
+ may be, the Work,
+— distribute the Work or copies thereof,
+— lend and rent the Work or copies thereof,
+— sublicense rights in the Work or copies thereof.
+
+Those rights can be exercised on any media, supports and formats, whether now
+known or later invented, as far as the applicable law permits so.
+
+In the countries where moral rights apply, the Licensor waives his right to
+exercise his moral right to the extent allowed by law in order to make
+effective the licence of the economic rights here above listed.
+
+The Licensor grants to the Licensee royalty-free, non-exclusive usage rights
+to any patents held by the Licensor, to the extent necessary to make use of
+the rights granted on the Work under this Licence.
+
+3. Communication of the Source Code
+
+The Licensor may provide the Work either in its Source Code form, or as
+Executable Code. If the Work is provided as Executable Code, the Licensor
+provides in addition a machine-readable copy of the Source Code of the Work
+along with each copy of the Work that the Licensor distributes or indicates,
+in a notice following the copyright notice attached to the Work, a repository
+where the Source Code is easily and freely accessible for as long as the
+Licensor continues to distribute or communicate the Work.
+
+4. Limitations on copyright
+
+Nothing in this Licence is intended to deprive the Licensee of the benefits
+from any exception or limitation to the exclusive rights of the rights owners
+in the Work, of the exhaustion of those rights or of other applicable
+limitations thereto.
+
+5. Obligations of the Licensee
+
+The grant of the rights mentioned above is subject to some restrictions and
+obligations imposed on the Licensee. Those obligations are the following:
+
+Attribution right: The Licensee shall keep intact all copyright, patent or
+trademarks notices and all notices that refer to the Licence and to the
+disclaimer of warranties. The Licensee must include a copy of such notices and
+a copy of the Licence with every copy of the Work he/she distributes or
+communicates. The Licensee must cause any Derivative Work to carry prominent
+notices stating that the Work has been modified and the date of modification.
+
+Copyleft clause: If the Licensee distributes or communicates copies of the
+Original Works or Derivative Works, this Distribution or Communication will be
+done under the terms of this Licence or of a later version of this Licence
+unless the Original Work is expressly distributed only under this version of
+the Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee
+(becoming Licensor) cannot offer or impose any additional terms or conditions
+on the Work or Derivative Work that alter or restrict the terms of the
+Licence.
+
+Compatibility clause: If the Licensee Distributes or Communicates Derivative
+Works or copies thereof based upon both the Work and another work licensed
+under a Compatible Licence, this Distribution or Communication can be done
+under the terms of this Compatible Licence. For the sake of this clause,
+‘Compatible Licence’ refers to the licences listed in the appendix attached to
+this Licence. Should the Licensee's obligations under the Compatible Licence
+conflict with his/her obligations under this Licence, the obligations of the
+Compatible Licence shall prevail.
+
+Provision of Source Code: When distributing or communicating copies of the
+Work, the Licensee will provide a machine-readable copy of the Source Code or
+indicate a repository where this Source will be easily and freely available
+for as long as the Licensee continues to distribute or communicate the Work.
+
+Legal Protection: This Licence does not grant permission to use the trade
+names, trademarks, service marks, or names of the Licensor, except as required
+for reasonable and customary use in describing the origin of the Work and
+reproducing the content of the copyright notice.
+
+6. Chain of Authorship
+
+The original Licensor warrants that the copyright in the Original Work granted
+hereunder is owned by him/her or licensed to him/her and that he/she has the
+power and authority to grant the Licence.
+
+Each Contributor warrants that the copyright in the modifications he/she
+brings to the Work are owned by him/her or licensed to him/her and that he/she
+has the power and authority to grant the Licence.
+
+Each time You accept the Licence, the original Licensor and subsequent
+Contributors grant You a licence to their contributions to the Work, under the
+terms of this Licence.
+
+7. Disclaimer of Warranty
+
+The Work is a work in progress, which is continuously improved by numerous
+Contributors. It is not a finished work and may therefore contain defects or
+‘bugs’ inherent to this type of development.
+
+For the above reason, the Work is provided under the Licence on an ‘as is’
+basis and without warranties of any kind concerning the Work, including
+without limitation merchantability, fitness for a particular purpose, absence
+of defects or errors, accuracy, non-infringement of intellectual property
+rights other than copyright as stated in Article 6 of this Licence.
+
+This disclaimer of warranty is an essential part of the Licence and a
+condition for the grant of any rights to the Work.
+
+8. Disclaimer of Liability
+
+Except in the cases of wilful misconduct or damages directly caused to natural
+persons, the Licensor will in no event be liable for any direct or indirect,
+material or moral, damages of any kind, arising out of the Licence or of the
+use of the Work, including without limitation, damages for loss of goodwill,
+work stoppage, computer failure or malfunction, loss of data or any commercial
+damage, even if the Licensor has been advised of the possibility of such
+damage. However, the Licensor will be liable under statutory product liability
+laws as far such laws apply to the Work.
+
+9. Additional agreements
+
+While distributing the Work, You may choose to conclude an additional
+agreement, defining obligations or services consistent with this Licence.
+However, if accepting obligations, You may act only on your own behalf and on
+your sole responsibility, not on behalf of the original Licensor or 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 the fact You have accepted any warranty or additional
+liability.
+
+10. Acceptance of the Licence
+
+The provisions of this Licence can be accepted by clicking on an icon ‘I
+agree’ placed under the bottom of a window displaying the text of this Licence
+or by affirming consent in any other similar way, in accordance with the rules
+of applicable law. Clicking on that icon indicates your clear and irrevocable
+acceptance of this Licence and all of its terms and conditions.
+
+Similarly, you irrevocably accept this Licence and all of its terms and
+conditions by exercising any rights granted to You by Article 2 of this
+Licence, such as the use of the Work, the creation by You of a Derivative Work
+or the Distribution or Communication by You of the Work or copies thereof.
+
+11. Information to the public
+
+In case of any Distribution or Communication of the Work by means of
+electronic communication by You (for example, by offering to download the Work
+from a remote location) the distribution channel or media (for example, a
+website) must at least provide to the public the information requested by the
+applicable law regarding the Licensor, the Licence and the way it may be
+accessible, concluded, stored and reproduced by the Licensee.
+
+12. Termination of the Licence
+
+The Licence and the rights granted hereunder will terminate automatically upon
+any breach by the Licensee of the terms of the Licence. Such a termination
+will not terminate the licences of any person who has received the Work from
+the Licensee under the Licence, provided such persons remain in full
+compliance with the Licence.
+
+13. Miscellaneous
+
+Without prejudice of Article 9 above, the Licence represents the complete
+agreement between the Parties as to the Work.
+
+If any provision of the Licence is invalid or unenforceable under applicable
+law, this will not affect the validity or enforceability of the Licence as a
+whole. Such provision will be construed or reformed so as necessary to make it
+valid and enforceable.
+
+The European Commission may publish other linguistic versions or new versions
+of this Licence or updated versions of the Appendix, so far this is required
+and reasonable, without reducing the scope of the rights granted by the
+Licence. New versions of the Licence will be published with a unique version
+number.
+
+All linguistic versions of this Licence, approved by the European Commission,
+have identical value. Parties can take advantage of the linguistic version of
+their choice.
+
+14. Jurisdiction
+
+Without prejudice to specific agreement between parties,
+— any litigation resulting from the interpretation of this License, arising
+ between the European Union institutions, bodies, offices or agencies, as a
+ Licensor, and any Licensee, will be subject to the jurisdiction of the Court
+ of Justice of the European Union, as laid down in article 272 of the Treaty
+ on the Functioning of the European Union,
+— any litigation arising between other parties and resulting from the
+ interpretation of this License, will be subject to the exclusive
+ jurisdiction of the competent court where the Licensor resides or conducts
+ its primary business.
+
+15. Applicable Law
+
+Without prejudice to specific agreement between parties,
+— this Licence shall be governed by the law of the European Union Member State
+ where the Licensor has his seat, resides or has his registered office,
+— this licence shall be governed by Belgian law if the Licensor has no seat,
+ residence or registered office inside a European Union Member State.
+
+Appendix
+
+‘Compatible Licences’ according to Article 5 EUPL are:
+— GNU General Public License (GPL) v. 2, v. 3
+— GNU Affero General Public License (AGPL) v. 3
+— Open Software License (OSL) v. 2.1, v. 3.0
+— Eclipse Public License (EPL) v. 1.0
+— CeCILL v. 2.0, v. 2.1
+— Mozilla Public Licence (MPL) v. 2
+— GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
+— Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for
+ works other than software
+— European Union Public Licence (EUPL) v. 1.1, v. 1.2
+— Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or
+ Strong Reciprocity (LiLiQ-R+)
+
+— The European Commission may update this Appendix to later versions of the
+ above licences without producing a new version of the EUPL, as long as they
+ provide the rights granted in Article 2 of this Licence and protect the
+ covered Source Code from exclusive appropriation.
+— All other changes or additions to this Appendix require the production of a
+ new EUPL version.
diff --git a/_licenses/ncsa.txt b/_licenses/ncsa.txt
index 93b99b7..0897884 100644
--- a/_licenses/ncsa.txt
+++ b/_licenses/ncsa.txt
@@ -34,7 +34,7 @@ Copyright (c) [year] [fullname]. All rights reserved.
Developed by: [project]
[fullname]
- [project_url]
+ [projecturl]
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
diff --git a/script/check-approval b/script/check-approval
index 6b491db..6451818 100755
--- a/script/check-approval
+++ b/script/check-approval
@@ -52,6 +52,7 @@ approvals.each do |approver, licenses|
rows << ["#{approver} approved", licenses.include?(license)]
end
+license_ids = licenses.map { |l| l['id'] }
current = license_ids.include?(license)
rows << ['Current license', current]
diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb
new file mode 100644
index 0000000..4856f35
--- /dev/null
+++ b/spec/license_fields_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'license fillable fields' do
+ licenses.each do |license|
+ context "The #{license['title']} license" do
+ it 'should only contain supported fillable fields' do
+ matches = license['content'][1, 1000].scan(/\s+\[([a-z_]+)\]/)
+ extra_fields = matches.flatten - (fields.map { |f| f['name'] })
+ expect(extra_fields).to be_empty
+ end
+ end
+ end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e66a9a1..2fb5fd8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -4,7 +4,6 @@ require 'jekyll'
require 'json'
require 'licensee'
require 'open-uri'
-require 'nokogiri'
module SpecHelper
class << self
@@ -86,7 +85,7 @@ def spdx_ids
end
def find_spdx(license)
- spdx_list.find { |name, _properties| name == license }
+ spdx_list.find { |name, _properties| name.casecmp(license).zero? }
end
def osi_approved_licenses
@@ -102,23 +101,15 @@ end
def fsf_approved_licenses
SpecHelper.fsf_approved_licenses ||= begin
- url = 'https://www.gnu.org/licenses/license-list.en.html'
- doc = Nokogiri::HTML(open(url).read)
- list = doc.css('.green dt')
+ url = 'https://wking.github.io/fsf-api/licenses-full.json'
+ object = JSON.parse(open(url).read)
licenses = {}
- list.each do |license|
- a = license.css('a').find { |link| !link.text.nil? && !link.text.empty? && link.attr('id') }
- next if a.nil?
- id = a.attr('id').downcase
- name = a.text.strip
- licenses[id] = name
+ object.each_value do |meta|
+ next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre')
+ meta['identifiers']['spdx'].each do |identifier|
+ licenses[identifier.downcase] = meta['name']
+ end
end
-
- # FSF approved the Clear BSD, but doesn't use its SPDX ID or Name
- if licenses.keys.include? 'clearbsd'
- licenses['bsd-3-clause-clear'] = licenses['clearbsd']
- end
-
licenses
end
end