1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 21:00:10 +01:00

Merge branch 'gh-pages' into cc0-source-text

This commit is contained in:
Mike Linksvayer 2018-04-05 13:31:36 -07:00 committed by GitHub
commit b3eb7aacc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -2,6 +2,8 @@
We love Pull Requests! Your contributions help make ChooseALicense.com great. 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. 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 ## Getting Started
@ -43,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. changes, type in a commit message, and click the `Propose File Change` button.
Thats it! Thats 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). 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 ## Testing

View File

@ -54,7 +54,7 @@ describe 'license meta' do
example_url = example.values[0] example_url = example.values[0]
context "the #{example_url} URL" do context "the #{example_url} URL" do
let(:content) { open(example_url).read } let(:content) { OpenURI.open_uri(example_url).read }
let(:detected) { Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license } let(:detected) { Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license }
if example_url.start_with?('https://github.com/') if example_url.start_with?('https://github.com/')

View File

@ -73,7 +73,7 @@ end
def spdx_list def spdx_list
SpecHelper.spdx ||= begin SpecHelper.spdx ||= begin
url = 'https://spdx.org/licenses/licenses.json' url = 'https://spdx.org/licenses/licenses.json'
list = JSON.parse(open(url).read)['licenses'] list = JSON.parse(OpenURI.open_uri(url).read)['licenses']
list.each_with_object({}) do |values, memo| list.each_with_object({}) do |values, memo|
memo[values['licenseId']] = values memo[values['licenseId']] = values
end end
@ -102,7 +102,7 @@ end
def fsf_approved_licenses def fsf_approved_licenses
SpecHelper.fsf_approved_licenses ||= begin SpecHelper.fsf_approved_licenses ||= begin
url = 'https://wking.github.io/fsf-api/licenses-full.json' url = 'https://wking.github.io/fsf-api/licenses-full.json'
object = JSON.parse(open(url).read) object = JSON.parse(OpenURI.open_uri(url).read)
licenses = {} licenses = {}
object.each_value do |meta| object.each_value do |meta|
next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre') next unless (meta.include? 'identifiers') && (meta['identifiers'].include? 'spdx') && (meta.include? 'tags') && (meta['tags'].include? 'libre')
@ -117,7 +117,7 @@ end
def od_approved_licenses def od_approved_licenses
SpecHelper.od_approved_licenses ||= begin SpecHelper.od_approved_licenses ||= begin
url = 'http://licenses.opendefinition.org/licenses/groups/od.json' url = 'http://licenses.opendefinition.org/licenses/groups/od.json'
data = open(url).read data = OpenURI.open_uri(url).read
data = JSON.parse(data) data = JSON.parse(data)
licenses = {} licenses = {}
data.each do |id, meta| data.each do |id, meta|