spdx 1.2.3 → 1.2.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e05e85c6f351876bc534860ed1885c57f13dc585
4
- data.tar.gz: 28aafa0b4575e314cb4db89adf44f83fafe61714
3
+ metadata.gz: 9430cf67fbc16303c3d29e0e477cdf273c03f555
4
+ data.tar.gz: ca766f230f988f88e3e614dd825203d040f17ac2
5
5
  SHA512:
6
- metadata.gz: 308ceedae725f58f9bf809fa853571d0d3c8cff96264d2098ff85cb56be149ca58717b0e47b8beb8d51fa25be8bec34eeed8921fa545a9051e455828dc2e474a
7
- data.tar.gz: 21c992dfcfb6f894672224dc6f2d7b557829ec24e9d976e4d222302423439056dfd38691a0f05e9c3d85991b60ad1ffe3c980cba5a9f9e899dfd840fc9262441
6
+ metadata.gz: 58049c4f725c1a1e6149501a445453cfe2d1277c60231188fecb6a50df5c66a173613976d103d9c42640127a9046ea3e7e72f9a3f726c1e57118d82eb27e1c5c
7
+ data.tar.gz: c23073c225b3fbc1e4275d99eafdc8e21f7370ec734668a362abe14fe774a47af6b742b7f544330867d8036bdcd233914b20047aa1c33aab4cc7d40ba10feec0
data/.travis.yml ADDED
@@ -0,0 +1,3 @@
1
+ language: ruby
2
+ rvm:
3
+ - 2.2.3
data/README.md CHANGED
@@ -26,6 +26,12 @@ Or install it yourself as:
26
26
  Spdx.find('Apache 2') # => <SpdxLicenses::License:0x007fa3a2b462c8 @id="Apache-2.0", @name="Apache License 2.0", @osi_approved=true>
27
27
  ```
28
28
 
29
+ ## Testing
30
+
31
+ Run the tests with:
32
+
33
+ $ bundle exec rake
34
+
29
35
  ## Contributing
30
36
 
31
37
  1. Fork it ( https://github.com/librariesio/spdx/fork )
data/lib/spdx.rb CHANGED
@@ -57,10 +57,14 @@ module Spdx
57
57
  'gpl3' => 'GPL-3.0',
58
58
  'gpl2' => 'GPL-2.0',
59
59
  'gpl 3' => 'GPL-3.0',
60
+ 'gpl_1' => 'GPL-1.0',
61
+ 'gpl_2' => 'GPL-2.0',
62
+ 'gpl_3' => 'GPL-3.0',
60
63
  'gpl 2' => 'GPL-2.0',
61
64
  'gpl v3' => 'GPL-3.0',
62
65
  'gpl v2' => 'GPL-2.0',
63
66
  'gpl 3.0' => 'GPL-3.0',
67
+ 'gplv3' => 'GPL-3.0',
64
68
  'gpl 2.0' => 'GPL-2.0',
65
69
  'gpl-3' => 'GPL-3.0',
66
70
  'gpl-2' => 'GPL-2.0',
@@ -68,8 +72,14 @@ module Spdx
68
72
  'gpl20' => 'GPL-2.0',
69
73
  'gpl v3+' => 'GPL-3.0+',
70
74
  'gpl v2+' => 'GPL-2.0+',
75
+ 'gplv2+' => 'GPL-2.0+',
71
76
  'gpl' => 'GPL-2.0+',
72
77
  'gpl (≥ 3)' => 'GPL-3.0+',
78
+ 'mpl2.0' => 'mpl-2.0',
79
+ 'mpl1' => 'mpl-1.0',
80
+ 'mpl1.0' => 'mpl-1.0',
81
+ 'mpl1.1' => 'mpl-1.1',
82
+ 'mpl2' => 'mpl-2.0',
73
83
  'gpl-2 | gpl-3 [expanded from: gpl (≥ 2)]' => 'GPL-2.0+',
74
84
  'gpl-2 | gpl-3 [expanded from: gpl (≥ 2.0)]' => 'GPL-2.0+',
75
85
  'gpl-2 | gpl-3 [expanded from: gpl]' => 'GPL-2.0+',
@@ -80,7 +90,58 @@ module Spdx
80
90
  'gpl2 w/ cpe' => 'GPL-2.0-with-classpath-exception',
81
91
  'new bsd license (gpl-compatible)' => 'BSD-3-Clause',
82
92
  'the gpl v3' => 'GPL-3.0',
83
- 'public domain' => 'Unlicense'
93
+ 'public domain' => 'Unlicense',
94
+ 'cc0' => 'CC0-1.0',
95
+ 'lgpl v3' => 'LGPL-3.0',
96
+ 'artistic_2' => 'Artistic-2.0',
97
+ 'artistic_1' => 'Artistic-1.0',
98
+ 'lgpl 2.1' => 'LGPL-2.1',
99
+ 'lgplv3' => 'LGPL-3.0',
100
+ 'gplv3+' => 'GPL-3.0+',
101
+ 'alv2' => 'Apache-2.0',
102
+ 'asl 2.0' => 'Apache-2.0',
103
+ 'mpl 2.0' => 'MPL-2.0',
104
+ 'agplv3' => 'AGPL-3.0',
105
+ 'publicdomain' => 'Unlicense',
106
+ 'unlicensed' => 'Unlicense',
107
+ 'lgpl-3' => 'LGPL-3.0',
108
+ 'psfl' => 'Python-2.0',
109
+ 'psf' => 'Python-2.0',
110
+ 'asl2' => 'Apache-2.0',
111
+ 'al2' => 'Apache-2.0',
112
+ 'aslv2' => 'Apache-2.0',
113
+ 'apache_2_0' => 'Apache-2.0',
114
+ 'apache_v2' => 'Apache-2.0',
115
+ 'ZPL 1.1' => 'ZPL-1.1',
116
+ 'ZPL 2.0' => 'ZPL-2.0',
117
+ 'ZPL 2.1' => 'ZPL-2.1',
118
+ 'lgplv2' => 'LGPL-2.0',
119
+ 'lgplv2+' => 'LGPL-2.0+',
120
+ 'lgplv2.1' => 'LGPL-2.1',
121
+ 'lgpl_2_1' => 'LGPL-2.1',
122
+ 'lgpl_v2_1' => 'LGPL-2.1',
123
+ 'lgpl v2.1+' => 'LGPL-2.1+',
124
+ 'lgplv3+' => 'LGPL-3.0+',
125
+ 'lgpl 3.0' => 'LGPL-3.0',
126
+ 'lgpl 3' => 'LGPL-3.0',
127
+ 'lgpl3' => 'LGPL-3.0',
128
+ 'lgpl version 3' => 'LGPL-3.0',
129
+ 'agpl3' => 'AGPL-3.0',
130
+ 'agpl-3' => 'AGPL-3.0',
131
+ 'agpl3+' => 'AGPL-3.0+',
132
+ 'cc by-sa 4.0' => 'CC-BY-SA-4.0',
133
+ 'cc by-nc-sa 3.0' => 'CC-BY-NC-SA-3.0',
134
+ 'cc by-sa 3.0' => 'CC-BY-SA-3.0',
135
+ 'mpl v2.0' => 'MPL-2.0',
136
+ 'mplv2.0' => 'MPL-2.0',
137
+ 'mplv2' => 'MPL-2.0',
138
+ 'cpal v1.0' => 'CPAL-1.0',
139
+ 'cddl 1.0' => 'CDDL-1.0',
140
+ 'cddl 1.1' => 'CDDL-1.1',
141
+ 'epl' => 'EPL-1.0',
142
+ 'mit-license' => 'MIT',
143
+ 'iscl' => 'ISC',
144
+ 'wtf' => 'WTFPL'
84
145
  }
85
146
  end
86
147
 
data/lib/spdx/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Spdx
2
- VERSION = "1.2.3"
2
+ VERSION = "1.2.4"
3
3
  end
data/spec/spdx_spec.rb CHANGED
@@ -33,6 +33,11 @@ describe Spdx do
33
33
  end
34
34
 
35
35
  it "should return know licenses for special cases" do
36
+ expect(Spdx.find('MPL1').name).to eq('Mozilla Public License 1.0')
37
+ expect(Spdx.find('MPL1.0').name).to eq('Mozilla Public License 1.0')
38
+ expect(Spdx.find('MPL1.1').name).to eq('Mozilla Public License 1.1')
39
+ expect(Spdx.find('MPL2').name).to eq('Mozilla Public License 2.0')
40
+ expect(Spdx.find('MPL2.0').name).to eq('Mozilla Public License 2.0')
36
41
  expect(Spdx.find('GPL3').name).to eq('GNU General Public License v3.0 only')
37
42
  expect(Spdx.find('GPL v3').name).to eq('GNU General Public License v3.0 only')
38
43
  expect(Spdx.find('GPL3').name).to eq('GNU General Public License v3.0 only')
@@ -52,8 +57,6 @@ describe Spdx do
52
57
  expect(Spdx.find("GPL 2.0").name).to eq('GNU General Public License v2.0 only')
53
58
  expect(Spdx.find("New BSD License (GPL-compatible)").name).to eq('BSD 3-clause "New" or "Revised" License')
54
59
  expect(Spdx.find("The GPL V3").name).to eq('GNU General Public License v3.0 only')
55
-
56
-
57
60
  expect(Spdx.find('perl_5').name).to eq("Artistic License 1.0 (Perl)")
58
61
  expect(Spdx.find('BSD3').name).to eq('BSD 3-clause "New" or "Revised" License')
59
62
  expect(Spdx.find('BSD').name).to eq('BSD 3-clause "New" or "Revised" License')
@@ -65,6 +68,7 @@ describe Spdx do
65
68
  expect(Spdx.find('GPL').name).to eq('GNU General Public License v2.0 or later')
66
69
  expect(Spdx.find('GNU LESSER GENERAL PUBLIC LICENSE').name).to eq('GNU Lesser General Public License v2.1 or later')
67
70
  expect(Spdx.find('New BSD License').name).to eq('BSD 3-clause "New" or "Revised" License')
71
+
68
72
  end
69
73
  end
70
74
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spdx
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.3
4
+ version: 1.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Nesbitt
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-03 00:00:00.000000000 Z
11
+ date: 2015-11-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spdx-licenses
@@ -89,6 +89,7 @@ extra_rdoc_files: []
89
89
  files:
90
90
  - ".gitignore"
91
91
  - ".rspec"
92
+ - ".travis.yml"
92
93
  - Gemfile
93
94
  - LICENSE.txt
94
95
  - README.md
@@ -118,10 +119,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
118
119
  version: '0'
119
120
  requirements: []
120
121
  rubyforge_project:
121
- rubygems_version: 2.4.5
122
+ rubygems_version: 2.4.8
122
123
  signing_key:
123
124
  specification_version: 4
124
125
  summary: A SPDX license checker
125
126
  test_files:
126
127
  - spec/spdx_spec.rb
127
128
  - spec/spec_helper.rb
129
+ has_rdoc: