mirror of
https://github.com/github/choosealicense.com
synced 2024-12-22 12:50:24 +01:00
Merge pull request #560 from github/spdx-3.0
Test against SPDX-provided list
This commit is contained in:
commit
5ad0a4374a
@ -5,7 +5,7 @@ script: "./script/cibuild"
|
||||
#environment
|
||||
language: ruby
|
||||
rvm:
|
||||
- 2.4.0
|
||||
- 2.4.2
|
||||
|
||||
addons:
|
||||
apt:
|
||||
|
@ -1,5 +1,5 @@
|
||||
---
|
||||
title: BSD 2-clause "Simplified" License
|
||||
title: BSD 2-Clause "Simplified" License
|
||||
spdx-id: BSD-2-Clause
|
||||
redirect_from: /licenses/bsd/
|
||||
source: https://opensource.org/licenses/BSD-2-Clause
|
||||
|
@ -1,5 +1,5 @@
|
||||
---
|
||||
title: BSD 3-clause Clear License
|
||||
title: BSD 3-Clause Clear License
|
||||
spdx-id: BSD-3-Clause-Clear
|
||||
source: https://spdx.org/licenses/BSD-3-Clause-Clear.html
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
---
|
||||
title: BSD 3-clause "New" or "Revised" License
|
||||
title: BSD 3-Clause "New" or "Revised" License
|
||||
spdx-id: BSD-3-Clause
|
||||
source: https://opensource.org/licenses/BSD-3-Clause
|
||||
hidden: false
|
||||
|
@ -71,8 +71,13 @@ def rule?(tag, group)
|
||||
end
|
||||
|
||||
def spdx_list
|
||||
url = 'https://raw.githubusercontent.com/sindresorhus/spdx-license-list/master/spdx.json'
|
||||
SpecHelper.spdx ||= JSON.parse(open(url).read)
|
||||
SpecHelper.spdx ||= begin
|
||||
url = 'https://spdx.org/licenses/licenses.json'
|
||||
list = JSON.parse(open(url).read)['licenses']
|
||||
list.each_with_object({}) do |values, memo|
|
||||
memo[values['licenseId']] = values
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def spdx_ids
|
||||
@ -86,7 +91,7 @@ end
|
||||
def osi_approved_licenses
|
||||
SpecHelper.osi_approved_licenses ||= begin
|
||||
licenses = {}
|
||||
list = spdx_list.select { |_id, meta| meta['osiApproved'] }
|
||||
list = spdx_list.select { |_id, meta| meta['isOsiApproved'] }
|
||||
list.each do |id, meta|
|
||||
licenses[id.downcase] = meta['name']
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user