From a03e61a993347cab3a8a7a8b78b93bca8e5d988a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 16 Feb 2018 09:09:15 +0000 Subject: [PATCH 1/3] CONTRIBUTING: note license. This is to be more explicit about the contribution process and license. --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 592b0d5..69b966d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,6 +2,8 @@ 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 From adb35c0c823def75d0a10bfb6f5952fb99ca5ba8 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 14 Mar 2018 18:45:10 -0700 Subject: [PATCH 2/3] Rubocop 0.53 doesn't like kernel#open use more specific OpenURI.open_uri instead https://github.com/bbatsov/rubocop/blob/841569b305808e279a814c9823da30e8d1d0649a/manual/cops_security.md#securityopen Not sure this is really a problem for tests, but easiest to just change. --- spec/license_meta_spec.rb | 2 +- spec/spec_helper.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index df2957c..e9067a5 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -54,7 +54,7 @@ describe 'license meta' do example_url = example.values[0] 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 } if example_url.start_with?('https://github.com/') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2fb5fd8..1c309b1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -73,7 +73,7 @@ end def spdx_list SpecHelper.spdx ||= begin 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| memo[values['licenseId']] = values end @@ -102,7 +102,7 @@ end def fsf_approved_licenses SpecHelper.fsf_approved_licenses ||= begin 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 = {} object.each_value do |meta| 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 SpecHelper.od_approved_licenses ||= begin url = 'http://licenses.opendefinition.org/licenses/groups/od.json' - data = open(url).read + data = OpenURI.open_uri(url).read data = JSON.parse(data) licenses = {} data.each do |id, meta| From c89376ae18e010164a63f9d8871ef818ae79cb9a Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 28 Mar 2018 09:51:49 -0700 Subject: [PATCH 3/3] Remove obsolete CLA instructions Followup to #573, fixes #576 --- CONTRIBUTING.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 69b966d..3165304 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,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