From 3532d9cbedccff4d5ce22f3e63ab450082dc9aa5 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 24 Nov 2017 14:15:52 -0800 Subject: [PATCH 01/14] Add EPL-2.0 --- _licenses/epl-1.0.txt | 3 +- _licenses/epl-2.0.txt | 309 +++++++++++++++++++++++++++++++++++++ spec/license_shown_spec.rb | 2 +- 3 files changed, 311 insertions(+), 3 deletions(-) create mode 100644 _licenses/epl-2.0.txt diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index b8dadda..b36cad3 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -1,9 +1,8 @@ --- title: Eclipse Public License 1.0 spdx-id: EPL-1.0 -redirect_from: /licenses/eclipse/ source: https://www.eclipse.org/legal/epl-v10.html -hidden: false +hidden: true description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones. diff --git a/_licenses/epl-2.0.txt b/_licenses/epl-2.0.txt new file mode 100644 index 0000000..c4c0bda --- /dev/null +++ b/_licenses/epl-2.0.txt @@ -0,0 +1,309 @@ +--- +title: Eclipse Public License 2.0 +spdx-id: EPL-2.0 +redirect_from: /licenses/eclipse/ +source: https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt +hidden: false + +description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones. + +how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. + +using: + - Eclipse SmartHome: https://github.com/eclipse/smarthome/blob/master/LICENSE + +permissions: + - commercial-use + - distribution + - modifications + - patent-use + - private-use + +conditions: + - disclose-source + - include-copyright + - same-license + +limitations: + - liability + - warranty + +--- + +Eclipse Public License - v 2.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which +are necessarily infringed by the use or sale of its Contribution alone +or when combined with the Program. + +"Program" means the Contributions Distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). + +3. REQUIREMENTS + +3.1 If a Contributor Distributes the Program in any form, then: + + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities +with respect to end users, business partners and the like. While this +license is intended to facilitate the commercial use of the Program, +the Contributor who includes the Program in a commercial product +offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes +the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those performance +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS +SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software +or hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any licenses +granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. The Eclipse Foundation +is the initial Agreement Steward. The Eclipse Foundation may assign the +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth +in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership. diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb index adf631f..8ef6725 100644 --- a/spec/license_shown_spec.rb +++ b/spec/license_shown_spec.rb @@ -10,7 +10,7 @@ describe 'shown licenses' do apache-2.0 bsd-2-clause bsd-3-clause - epl-1.0 + epl-2.0 gpl-2.0 gpl-3.0 lgpl-2.1 From f2aabb80576ab12c92c5c8b802a8dea2b03e0668 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 29 Dec 2017 15:18:11 -0800 Subject: [PATCH 02/14] 2 more examples --- _licenses/epl-2.0.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_licenses/epl-2.0.txt b/_licenses/epl-2.0.txt index c4c0bda..d61bd4d 100644 --- a/_licenses/epl-2.0.txt +++ b/_licenses/epl-2.0.txt @@ -10,7 +10,9 @@ description: This commercially-friendly copyleft license provides the ability to how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. using: + - Eclipse Ditto: https://github.com/eclipse/ditto/blob/master/LICENSE - Eclipse SmartHome: https://github.com/eclipse/smarthome/blob/master/LICENSE + - SUMO: https://github.com/DLR-TS/sumo/blob/master/COPYING permissions: - commercial-use From 2459e4ff99b522850c106f74e1f990f8aaa4b057 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 30 Dec 2017 15:38:31 -0800 Subject: [PATCH 03/14] add test that this project's license detected as MIT --- spec/license_meta_spec.rb | 12 ------------ spec/self_license_spec.rb | 11 +++++++++++ spec/spec_helper.rb | 12 ++++++++++++ 3 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 spec/self_license_spec.rb diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 37a123e..df2957c 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'licensee' require 'spec_helper' describe 'license meta' do @@ -49,17 +48,6 @@ describe 'license meta' do end context 'licensee detects using examples' do - module Licensee - class License - class << self - def license_dir - dir = ::File.dirname(__FILE__) - ::File.expand_path '../_licenses', dir - end - end - end - end - slug = license['slug'] examples.each do |example| diff --git a/spec/self_license_spec.rb b/spec/self_license_spec.rb new file mode 100644 index 0000000..178c9be --- /dev/null +++ b/spec/self_license_spec.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +require 'spec_helper' + +context 'licensee detects this project' do + let(:detected) { Licensee::project('.').license } + + it "license as MIT" do + expect(detected.key).to eq('mit') + end +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9912e62..e66a9a1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,6 +2,7 @@ require 'jekyll' require 'json' +require 'licensee' require 'open-uri' require 'nokogiri' @@ -138,3 +139,14 @@ end def approved_licenses (osi_approved_licenses.keys + fsf_approved_licenses.keys + od_approved_licenses.keys).flatten.uniq.sort end + +module Licensee + class License + class << self + def license_dir + dir = ::File.dirname(__FILE__) + ::File.expand_path '../_licenses', dir + end + end + end +end From 28fa8ca52141e6d443297e0595d5434da1611dbe Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 30 Dec 2017 15:42:15 -0800 Subject: [PATCH 04/14] rename and redirect no-license to no-permission avodiing licensee false negative --- no-license.md => no-permission.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename no-license.md => no-permission.md (97%) diff --git a/no-license.md b/no-permission.md similarity index 97% rename from no-license.md rename to no-permission.md index 688f1d2..3b85c5e 100644 --- a/no-license.md +++ b/no-permission.md @@ -1,7 +1,9 @@ --- layout: default -permalink: no-license/ -redirect_from: /licenses/no-license/ +permalink: no-permission/ +redirect_from: + - /no-license/ + - /licenses/no-license/ title: No License description: "You're under no obligation to choose a license and it's your right not to include one with your code or project. But please note that opting out of open source licenses doesn't mean you're opting out of copyright law." --- From c3f9bea85262509abdf07a3092b4100793081081 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 30 Dec 2017 15:46:13 -0800 Subject: [PATCH 05/14] change no-license internal links --- existing.md | 2 +- index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/existing.md b/existing.md index e6c6dc0..d4387b6 100644 --- a/existing.md +++ b/existing.md @@ -4,7 +4,7 @@ permalink: /existing/ title: Existing projects and communities --- -If you're contributing to or extending an existing project, it's almost always easiest to continue using that project's license. Look for a file called `LICENSE` or `COPYING`, or a notice in the project's `README` to find out what that license is. If you can't find a license, [ask](/no-license/#for-users). +If you're contributing to or extending an existing project, it's almost always easiest to continue using that project's license. Look for a file called `LICENSE` or `COPYING`, or a notice in the project's `README` to find out what that license is. If you can't find a license, [ask](/no-permission/#for-users). Depending on how you're building on an existing project and what its license is, using the existing project's license for your own might not just be the easiest thing to do, but a condition on which your permission to build on the existing project rests: see the "same license" condition of [some licenses](/licenses/). diff --git a/index.html b/index.html index 8f70441..a11992e 100644 --- a/index.html +++ b/index.html @@ -70,7 +70,7 @@ permalink: /

  • I don’t want to choose a license.

    - You don’t have to. + You don’t have to.

    • From a093c99d3c5b29004f21b2c1f6e5c834ac0f6c4b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 30 Dec 2017 15:48:07 -0800 Subject: [PATCH 06/14] rubocop --- spec/self_license_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/self_license_spec.rb b/spec/self_license_spec.rb index 178c9be..83fe270 100644 --- a/spec/self_license_spec.rb +++ b/spec/self_license_spec.rb @@ -3,9 +3,9 @@ require 'spec_helper' context 'licensee detects this project' do - let(:detected) { Licensee::project('.').license } + let(:detected) { Licensee.project('.').license } - it "license as MIT" do + it 'license as MIT' do expect(detected.key).to eq('mit') end end From e630ac7f29b59ed2a73b4cab201e673556d8f66b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 2 Jan 2018 14:24:52 -0800 Subject: [PATCH 07/14] project_url field --- README.md | 1 + _data/fields.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 87c5bb6..5cf6ebf 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 +* `project_url` - The repository URL or other project website ## License properties diff --git a/_data/fields.yml b/_data/fields.yml index 0b5f45d..e239043 100644 --- a/_data/fields.yml +++ b/_data/fields.yml @@ -21,3 +21,6 @@ - name: year description: The current year + +- name: project_url + description: The repository URL or other project website From d7bf3ac98a8a0b1e52731539dd25fbe56c9ed91b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 2 Jan 2018 14:25:04 -0800 Subject: [PATCH 08/14] Revert "rm no longer relevant test" This reverts commit 5e7b07f998e9264092b8e1274f99605ead412138. --- spec/license_fields_spec.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 spec/license_fields_spec.rb diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb new file mode 100644 index 0000000..af0a177 --- /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'][0, 1000].scan(/\[([a-z]+)\]/) + extra_fields = matches.flatten - (fields.map { |f| f['name'] }) + expect(extra_fields).to be_empty + end + end + end +end From 316bd0b828f90959475e58b423823bf1e342b27f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 2 Jan 2018 14:35:04 -0800 Subject: [PATCH 09/14] match _ fields, require preceding space (ex CECILL-2.1) --- spec/license_fields_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb index af0a177..4856f35 100644 --- a/spec/license_fields_spec.rb +++ b/spec/license_fields_spec.rb @@ -6,7 +6,7 @@ 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'][0, 1000].scan(/\[([a-z]+)\]/) + 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 From 1e715f44b1b022215420e0d904b116af70d67ecb Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 2 Jan 2018 18:09:38 -0800 Subject: [PATCH 10/14] project_url -> projecturl --- README.md | 2 +- _data/fields.yml | 2 +- _licenses/ncsa.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5cf6ebf..24c54d7 100644 --- a/README.md +++ b/README.md @@ -69,7 +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 -* `project_url` - The repository URL or other project website +* `projecturl` - The repository URL or other project website ## License properties diff --git a/_data/fields.yml b/_data/fields.yml index e239043..4e55d42 100644 --- a/_data/fields.yml +++ b/_data/fields.yml @@ -22,5 +22,5 @@ - name: year description: The current year -- name: project_url +- name: projecturl description: The repository URL or other project website 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 From c51d2e956e9c6fd64b2825700d2a59bc8ac4ed5e Mon Sep 17 00:00:00 2001 From: Sheel Bedi Date: Wed, 3 Jan 2018 03:37:33 -0600 Subject: [PATCH 11/14] Update License year to 2018 --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From af78adb4fe661781dbc7c34957949c71d0f29261 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 3 Jan 2018 11:08:38 -0800 Subject: [PATCH 12/14] spec_helper: Restore case-insensitive matching in find_spdx The previous case-insensitive matching was removed in e5f46faa (test required spdx-ids against data from spdx, 2016-05-25, #418). That commit was designed [1] to allow case-sensitive matching as discussed in [2]. But while I'm in favor of case-sensitive keys in spdx_list, the case-sensitive match breaks script/check-approval which downcases its argument since it was added in 8e56bb83 (add script/check-approval, 2016-01-18, #318). There are more notes on SPDX's plans for case sensitivity in [3], so we should see a clearer policy there soon. I'm arguing for case-sensitive *display* with optional case-insensitive matching. I am optimistic that the SPDX will at least agree not to register short IDs that only differ by case, which is all we need to make this case-insensitive match safe here. [1]: https://github.com/github/choosealicense.com/pull/418#issuecomment-221404630 [2]: https://github.com/benbalter/licensee/issues/72 [3]: https://github.com/spdx/spdx-spec/issues/63 --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e66a9a1..c8c2a52 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -86,7 +86,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 From 84a7bbbf968406403bcd57d3ebd4973ca6989cc9 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 3 Jan 2018 11:17:19 -0800 Subject: [PATCH 13/14] spec_helper: Extract FSF approval from wking.github.io/fsf-api Ideally the FSF would be maintaining the API (or any API), but until someone can talk them into that I think we can save work by collaborating on the mock API. Using a JSON API also allows us to drop the Nokogiri dependency. The parens feel excessive, and I'm not familiar with Ruby, so they might be. However, removing the parens from the libre check resulted in: $ ./script/check-approval ISC ./script/check-approval:8:in `require_relative': /.../choosealicense.com/spec/spec_helper.rb:108: syntax error, unexpected tSTRING_BEG, expecting keyword_then or ';' or '\n' (SyntaxError) ...gs') && meta['tags'].include? 'libre' ... ^ /.../choosealicense.com/spec/spec_helper.rb:116: syntax error, unexpected keyword_end, expecting end-of-input from ./script/check-approval:8:in `
    ' --- Gemfile | 1 - spec/spec_helper.rb | 23 +++++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) 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/spec/spec_helper.rb b/spec/spec_helper.rb index c8c2a52..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 @@ -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 From 45369acf791426004f7f0f5da7346523fe279399 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 3 Jan 2018 10:46:57 -0800 Subject: [PATCH 14/14] check-approval: Fix missing license_ids variable Avoid: $ ./script/check-approval MIT ./script/check-approval:55:in `
    ': undefined local variable or method `license_ids' for main:Object (NameError) The license_ids line was added in e505eb8f (check if license is aleady a license, 2016-01-18, #318), but license_ids was removed from the helper in b99e7ab0 (replace 'id' variables with 'spdx_lcase' to minimize confusion, 2016-06-01, #424). This commit restores the old code locally, since this script is the only consumer. --- script/check-approval | 1 + 1 file changed, 1 insertion(+) 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]