Merge branch 'gh-pages' into goals

Author: mlinksva

.rubocop.yml

@@ -1,9 +1,12 @@
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.4
   Exclude:
     - _site/**/*
     - vendor/**/*
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/LineLength:
   Enabled: false
 

.travis.yml

@@ -5,7 +5,12 @@ script: "./script/cibuild"
 #environment
 language: ruby
 rvm:
-  - 2.3.3
+  - 2.4.2
+
+addons:
+  apt:
+    packages:
+    - libcurl4-openssl-dev
 
 branches:
   only:

CONTRIBUTING.md

@@ -2,32 +2,36 @@
 
 We love Pull Requests! Your contributions help make ChooseALicense.com great.
 
+Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE.md).
+
 Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
 
 ## Getting Started
 
 So you want to contribute to ChooseALicense. Great! We welcome any help we can
 get. But first, please make sure you understand what
-[this site is all about](http://choosealicense.com/about). It’s not a comprehensive list of all possible licenses.
+[this site is all about](https://choosealicense.com/about). It’s not a comprehensive list of all possible licenses.
 
 ## Adding a license
 
-Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or <http://choosealicense.com/licenses>, and there are several requirements for a license to be [cataloged](http://choosealicense.com/appendix/) on the site:
+Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or <https://choosealicense.com/licenses>, and there are several requirements for a license to be [cataloged](https://choosealicense.com/appendix/) on the site:
 
-1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license-or-exception).
+1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license).
 2. The license must be listed on one of the following approved lists of licenses:
    * [List of OSI approved licenses](https://opensource.org/licenses/alphabetical)
    * [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*)
-   * [Open Definition's list of conformant licenses](http://opendefinition.org/licenses/) (non-code)
+   * [Open Definition's list of conformant licenses](https://opendefinition.org/licenses/) (non-code)
 3. A [GitHub code search](https://github.com/search?q=MIT+filename%3ALICENSE&type=Code) must reveal at least *1,000* public repositories using the license
+4. Identification of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that could be detected by [licensee](https://github.com/benbalter/licensee) if it knew about the license
 
 If your proposed license meets the above criteria, here's a few other things to keep in mind as you propose the license's addition:
 
-* Is the license already cataloged? See <http://choosealicense.com/appendix/> for a list of all of the licenses known by the site.
+* Is the license already cataloged? See <https://choosealicense.com/appendix/> for a list of all of the licenses known by the site.
 * Licenses live in the `/_licenses` folder.
 * The license files should be in the format of `_licenses/[lowercased-spdx-id].txt` (e.g., `_licenses/mit.txt`)
 * Each license has both [required and optional metadata](https://github.com/github/choosealicense.com#license-metadata) that should be included.
 * The text of the license should be wrapped to a 78 character width.
+* The text of the license should match the corresponding text found at https://spdx.org/licenses/
 * The body of the file should be the text of the license in plain text.
 
 ## Making Changes
@@ -41,8 +45,6 @@ find it in the GitHub repository. Then click the `Edit` button. Make your
 changes, type in a commit message, and click the `Propose File Change` button.
 That’s it!
 
-You will be asked to sign the [GitHub Contributor License Agreement](https://cla.github.com/) for this project when you make your first pull request. 
-
 For more advanced changes, check out [the bootstrap instructions](https://github.com/github/choosealicense.com#run-it-on-your-machine) in the [project's readme](/README.md).
 
 ## Testing

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 require 'json'
@@ -14,7 +16,7 @@ end
 
 group :test do
   gem 'html-proofer', '~> 3.0'
-  gem 'nokogiri'
+  gem 'licensee'
   gem 'rake'
   gem 'rspec'
   gem 'rubocop'

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 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

README.md

@@ -1,43 +1,31 @@
 **[ChooseALicense.com](http://choosealicense.com)** aims to provide **accurate**, **non-judgmental**, and **understandable** information about **open source licenses** in order to **help people make informed decisions** about the projects they start, maintain, contribute to, and use.
 
-We catalog [select](CONTRIBUTING.md#adding-a-license) open source licenses with a [Jekyll collection](https://jekyllrb.com/docs/collections/) (in `_licenses`). The catalog is used to render [ChooseALicense.com](http://choosealicense.com) and is regularly vendored into [Licensee](https://github.com/benbalter/licensee), which GitHub uses to provide a [license chooser and license detection](https://help.github.com/articles/adding-a-license-to-a-repository/), a [licenses API](https://developer.github.com/v3/licenses/), and to [display license descriptions and metadata](https://github.com/blog/2335-open-source-license-descriptions-and-metadata).
-
-The website navigation is
-
-Collaborative
-
-
-[the CONTRIBUTING file](CONTRIBUTING.md#adding-a-license)
-
-
-## License
-
-The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](http://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](http://opensource.org/licenses/mit-license.php).
-
+[![Build Status](https://travis-ci.org/github/choosealicense.com.svg?branch=gh-pages)](https://travis-ci.org/github/choosealicense.com)
 
+We catalog [select](CONTRIBUTING.md#adding-a-license) open source licenses with a [Jekyll collection](https://jekyllrb.com/docs/collections/) (in `_licenses`). The catalog is used to render [ChooseALicense.com](http://choosealicense.com) and is regularly vendored into [Licensee](https://github.com/benbalter/licensee), which GitHub uses to provide a [license chooser and license detection](https://help.github.com/articles/adding-a-license-to-a-repository/), a [licenses API](https://developer.github.com/v3/licenses/), and to [display license descriptions and metadata](https://github.com/blog/2335-open-source-license-descriptions-and-metadata).
 
 ## License metadata
 
 Licenses sit in the `/_licenses` folder. Each license has YAML front matter describing the license's properties. The body of the file contains the text of the license in plain text. The available metadata fields are:
 
 #### Required fields
 
-* `title` - The license full name specified by http://spdx.org/licenses/
-* `spdx-id` - Short identifier specified by http://spdx.org/licenses/
+* `title` - The license full name specified by https://spdx.org/licenses/
+* `spdx-id` - Short identifier specified by https://spdx.org/licenses/
 * `source` - The URL to the license source text
 * `description` - A human-readable description of the license
 * `how` - Instructions on how to implement the license
+* `using` - A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`
 * `permissions` - Bulleted list of permission rules
 * `conditions` - Bulleted list of condition rules
 * `limitations` - Bulleted list of limitation rules
 
 #### Optional fields
 
 * `featured` - Whether the license should be featured on the main page (defaults to false)
-* `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true)
+* `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](https://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true)
 * `nickname` - Customary short name if applicable (e.g, GPLv3)
 * `note` - Additional information about the licenses
-* `using` - A list of up to 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`
 * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs
 
 ### Auto-populated fields
@@ -52,6 +40,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
 
@@ -63,21 +52,27 @@ The license properties (rules) are stored as a bulleted list within the licenses
 
 * `commercial-use` - This software and derivatives may be used for commercial purposes.
 * `modifications` - This software may be modified.
-* `distribution` - You may distribute this software.
-* `private-use` - You may use and modify the software without distributing it.
-* `patent-use` - This license provides an express grant of patent rights from the contributor to the recipient.
+* `distribution` - This software may be distributed.
+* `private-use` - This software may be used and modified in private.
+* `patent-use` - This license provides an express grant of patent rights from contributors.
 
 #### Conditions
 
-* `include-copyright` - Include a copy of the license and copyright notice with the software.
-* `document-changes` - Indicate changes made to the code.
-* `disclose-source` - Source code must be made available when distributing the software.
-* `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code.
+* `include-copyright` - A copy of the license and copyright notice must be included with the software.
+* `document-changes` - Changes made to the code must be documented.
+* `disclose-source` - Source code must be made available when the software is distributed.
+* `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the source code.
 * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.
+* `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used.
+* `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library.
 
 #### Limitations
 
-* `trademark-use` - This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.
+* `trademark-use` - This license explicitly states that it does NOT grant trademark rights, even though licenses without such a statement probably do not grant any implicit trademark rights.
 * `liability` - This license includes a limitation of liability.
-* `patent-use` -  This license explicitly states that it does NOT grant you any rights in the patents of contributors.
+* `patent-use` - This license explicitly states that it does NOT grant any rights in the patents of contributors.
 * `warranty` - The license explicitly states that it does NOT provide any warranty.
+
+## License
+
+The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](https://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](https://opensource.org/licenses/mit-license.php).

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'html-proofer'
 require 'rspec/core/rake_task'
 
@@ -13,7 +15,8 @@ task :test do
   HTMLProofer.check_directory('./_site',
                               check_html: true,
                               validation: { ignore_script_embeds: true },
-                              url_swap: { %r{http://choosealicense.com} => '' }).run
+                              url_swap: { %r{https://choosealicense.com} => '' },
+                              check_img_http: true).run
 end
 
 task :approved_licenses do
@@ -24,7 +27,7 @@ task :approved_licenses do
   puts approved.join(', ')
   puts "\n"
 
-  potential = approved - licenses.map { |l| l['id'] }
+  potential = approved - (licenses.map { |l| l['id'] })
   puts "#{potential.count} potential additions:"
   puts potential.join(', ')
 end

_config.yml

@@ -3,7 +3,7 @@ title: Choose a License
 description: Non-judgmental guidance on choosing a license for your open source project
 relative_permalinks: false
 markdown: kramdown
-url: "http://choosealicense.com"
+url: "https://choosealicense.com"
 
 collections:
   licenses:
@@ -35,7 +35,7 @@ exclude:
   - assets/vendor/selectivizr/tests
   - assets/vendor/clipboard/test
 
-gems:
+plugins:
   - jekyll-sitemap
   - jekyll-redirect-from
   - jekyll-seo-tag

_data/fields.yml

@@ -21,3 +21,6 @@
 
 - name: year
   description: The current year
+
+- name: projecturl
+  description: The repository URL or other project website

_data/meta.yml

@@ -2,12 +2,12 @@
 # The available fields are:
 
 - name: title
-  description: The license full name specified by http://spdx.org/licenses/
+  description: The license full name specified by https://spdx.org/licenses/
   required: true
 
 - name: spdx-id
-  description: Short identifier specified by http://spdx.org/licenses/
-  required: required
+  description: Short identifier specified by https://spdx.org/licenses/
+  required: true
 
 - name: source
   description: The URL to the license source text
@@ -33,14 +33,18 @@
   description: Bulleted list of limited rules
   required: true
 
+- name: using
+  description: 'A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`'
+  required: true
+
 # Optional fields
 
 - name: featured
   description: Whether the license should be featured on the main page (defaults to false)
   required: false
 
 - name: hidden
-  description: Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true)
+  description: Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](https://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true)
   required: false
 
 - name: nickname
@@ -51,10 +55,6 @@
   description: Additional information about the licenses
   required: false
 
-- name: using
-  description: 'A list of up to 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`'
-  required: false
-
 - name: redirect_from
   description: Relative path(s) to redirect to the license from, to prevent breaking old URLs
   required: false