From d7dd72fdecea24ab32b58499c8ed522b486970d8 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 18 Oct 2017 17:04:09 -0700 Subject: [PATCH 01/10] {} -> <> in license trailer to more closely match canonical texts --- _licenses/gpl-2.0.txt | 6 +++--- _licenses/gpl-3.0.txt | 6 +++--- _licenses/lgpl-2.1.txt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 0ed70e4..1f05260 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -326,8 +326,8 @@ to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {description} - Copyright (C) {year} {fullname} + + Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -365,7 +365,7 @@ necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. - {signature of Ty Coon}, 1 April 1989 + , 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index b05798b..68d2f5d 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -670,8 +670,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + + Copyright (C) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -691,7 +691,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + Copyright (C) This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index 3f5bb28..c0fe81d 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -504,8 +504,8 @@ safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {description} - Copyright (C) {year} {fullname} + + Copyright (C) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -532,7 +532,7 @@ necessary. Here is a sample; alter the names: library `Frob' (a library for tweaking knobs) written by James Random Hacker. - {signature of Ty Coon}, 1 April 1990 + , 1 April 1990 Ty Coon, President of Vice That's all there is to it! From e90b7c383a8c46fa6b88801be60bced12f429513 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 18 Oct 2017 17:14:38 -0700 Subject: [PATCH 02/10] wording changes for <> fields to match canonical versions --- _licenses/gpl-2.0.txt | 4 ++-- _licenses/gpl-3.0.txt | 2 +- _licenses/lgpl-2.1.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 1f05260..4e47be9 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -326,8 +326,8 @@ to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + + Copyright (C) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index 68d2f5d..a533d7f 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -691,7 +691,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - Copyright (C) + Copyright (C) This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index c0fe81d..deecf4e 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -504,8 +504,8 @@ safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + + Copyright (C) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public From 64ba25a22f835295c80e024cf3bc7703c876fcb9 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 18 Oct 2017 17:16:11 -0700 Subject: [PATCH 03/10] remove link not found in canonical version --- _licenses/gpl-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 4e47be9..506fcea 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -37,7 +37,7 @@ limitations: GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., + Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. From ddb0f09db972522b2aaf4877332cb96ad2a4d196 Mon Sep 17 00:00:00 2001 From: Park Hyunwoo Date: Thu, 19 Oct 2017 22:34:04 +0900 Subject: [PATCH 04/10] Replace gems with plugins to follow up jekyll update --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index e5d4e8d..004f14b 100644 --- a/_config.yml +++ b/_config.yml @@ -35,7 +35,7 @@ exclude: - assets/vendor/selectivizr/tests - assets/vendor/clipboard/test -gems: +plugins: - jekyll-sitemap - jekyll-redirect-from - jekyll-seo-tag From 96620b48968c1ebc905ff0d663612806357c63a4 Mon Sep 17 00:00:00 2001 From: Park Hyunwoo Date: Fri, 20 Oct 2017 14:25:19 +0900 Subject: [PATCH 05/10] Add pipe character for sort filter to fix liquid syntax warning --- appendix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appendix.md b/appendix.md index 316c6bd..09c6e45 100644 --- a/appendix.md +++ b/appendix.md @@ -25,7 +25,7 @@ If you're here to choose a license, **[start from the home page](/)** to see a f {% endfor %} {% endfor %} -{% assign licenses = site.licenses sort: "path" %} +{% assign licenses = site.licenses | sort: "path" %} {% for license in licenses %} {{ license.title }} {% assign seen_tags = '' %} From 17d1196b31240c4596a1c7fac5447a20ee3e85fd Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 24 Oct 2017 11:22:07 -0700 Subject: [PATCH 06/10] replace 404 link --- _licenses/osl-3.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index a71ce60..d973ace 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -11,7 +11,7 @@ note: OSL 3.0's author has pr using: - appserver.io: https://github.com/appserver-io/appserver/blob/master/LICENSE.txt - - Magento 2: https://github.com/magento/magento2/blob/develop/LICENSE.txt + - JsonMapper: https://github.com/cweiske/jsonmapper/blob/master/LICENSE - Restyaboard: https://github.com/RestyaPlatform/board/blob/master/LICENSE.txt permissions: From 38a3be48986ad7ad8dae94748294e3c563d2bfd8 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 24 Oct 2017 14:48:49 -0700 Subject: [PATCH 07/10] restore square brackets from canonical versions --- _licenses/apache-2.0.txt | 4 ++-- _licenses/ecl-2.0.txt | 4 ++-- _licenses/lgpl-2.1.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index 0c594de..f652198 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -215,7 +215,7 @@ limitations: APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -223,7 +223,7 @@ limitations: same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright {yyyy} {name of copyright owner} + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt index 90f7403..ccc9267 100644 --- a/_licenses/ecl-2.0.txt +++ b/_licenses/ecl-2.0.txt @@ -216,14 +216,14 @@ END OF TERMS AND CONDITIONS APPENDIX: How to apply the Educational Community License to your work To apply the Educational Community License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "{}" replaced with +boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. -Copyright {yyyy} {name of copyright owner} Licensed under the Educational +Copyright [yyyy] [name of copyright owner] Licensed under the Educational Community License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index deecf4e..88fb2d3 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -40,9 +40,9 @@ limitations: Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -(This is the first released version of the Lesser GPL. It also counts +[This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.) + the version number 2.1.] Preamble From d5c6d8d7467682963a31ee3395d4a4a7db7963d2 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 24 Oct 2017 14:51:39 -0700 Subject: [PATCH 08/10] only look for unknown [] fields in first 1000 charcters that's where they're likely to be, outside of examples at the end of long licenses still want to check as if there are unknown [] fields in first 1000 characters, might be a field that should be filled in, but wouldn't for lack of correct name --- 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 4215f37..f8b88bd 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'].scan(/\[([a-z]+)\]/) + matches = license['content'][0,1000].scan(/\[([a-z]+)\]/) extra_fields = matches.flatten - (fields.map { |f| f['name'] }) expect(extra_fields).to be_empty end From 71aace0808219610c42e358114cdc3399749aa75 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 24 Oct 2017 16:24:38 -0700 Subject: [PATCH 09/10] rubocop --- 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 f8b88bd..af0a177 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'][0, 1000].scan(/\[([a-z]+)\]/) extra_fields = matches.flatten - (fields.map { |f| f['name'] }) expect(extra_fields).to be_empty end From 5e7b07f998e9264092b8e1274f99605ead412138 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 25 Oct 2017 09:34:49 -0700 Subject: [PATCH 10/10] rm no longer relevant test --- spec/license_fields_spec.rb | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 spec/license_fields_spec.rb diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb deleted file mode 100644 index af0a177..0000000 --- a/spec/license_fields_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -# 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