spdx 2.0.11 → 2.0.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/spdx/version.rb +1 -1
- data/lib/spdx_parser.treetop +4 -4
- data/spec/spdx_spec.rb +2 -0
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6b710b626383daa5b897071127070f74863afc3149e016dde2944cfbb4459ee0
|
|
4
|
+
data.tar.gz: fd93bc57de2be909c8129a5893860a7ed01f52b3a661a268a356eeb2ef8d9d18
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 51e16e88b99e72293efa83ad7d2615f67b3fff62a04e835fcb661b1ec80dc83080c1b3d75844a203735dd9a76240bb1e80f87146f637eefb491bb07ab48c672d
|
|
7
|
+
data.tar.gz: 94e08d7d2d0fed47528b39ae22f3a9e0db5eaa0775f97d32627d9c66f5d31aa44c951ccbd652367f2c407cafe016cfdb744756900fcebe5d004a9614cd09f483
|
data/lib/spdx/version.rb
CHANGED
data/lib/spdx_parser.treetop
CHANGED
|
@@ -9,19 +9,19 @@ grammar SpdxGrammar
|
|
|
9
9
|
end
|
|
10
10
|
|
|
11
11
|
rule body
|
|
12
|
-
(compound_expression / and / or / with / license
|
|
12
|
+
( compound_expression / and / or / with / license )* <Body>
|
|
13
13
|
end
|
|
14
14
|
|
|
15
15
|
rule and
|
|
16
|
-
"AND" space !reserve_words <LogicalAnd>
|
|
16
|
+
space "AND" space !reserve_words <LogicalAnd>
|
|
17
17
|
end
|
|
18
18
|
|
|
19
19
|
rule or
|
|
20
|
-
"OR" space !reserve_words <LogicalOr>
|
|
20
|
+
space "OR" space !reserve_words <LogicalOr>
|
|
21
21
|
end
|
|
22
22
|
|
|
23
23
|
rule with
|
|
24
|
-
"WITH" space license_exception <With>
|
|
24
|
+
space "WITH" space license_exception <With>
|
|
25
25
|
end
|
|
26
26
|
|
|
27
27
|
rule license
|
data/spec/spdx_spec.rb
CHANGED
|
@@ -188,11 +188,13 @@ describe Spdx do
|
|
|
188
188
|
expect(Spdx.valid_spdx?("MIT OR FAKEYLICENSE")).to be false
|
|
189
189
|
expect(Spdx.valid_spdx?(nil)).to be false
|
|
190
190
|
expect(Spdx.valid_spdx?("")).to be false
|
|
191
|
+
expect(Spdx.valid_spdx?("MIT (MIT)")).to be false
|
|
191
192
|
end
|
|
192
193
|
it "returns true for valid spdx" do
|
|
193
194
|
expect(Spdx.valid_spdx?("(MIT OR MPL-2.0)")).to be true
|
|
194
195
|
expect(Spdx.valid_spdx?("MIT")).to be true
|
|
195
196
|
expect(Spdx.valid_spdx?("((MIT OR AGPL-1.0) AND (MIT OR MPL-2.0))")).to be true
|
|
197
|
+
expect(Spdx.valid_spdx?("MIT OR (MIT)")).to be true
|
|
196
198
|
end
|
|
197
199
|
it "returns true for NONE and NOASSERTION" do
|
|
198
200
|
expect(Spdx.valid_spdx?("NONE")).to be true
|
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: 2.0.
|
|
4
|
+
version: 2.0.12
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Tidelift, Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-07-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: fuzzy_match
|
|
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
161
161
|
- !ruby/object:Gem::Version
|
|
162
162
|
version: '0'
|
|
163
163
|
requirements: []
|
|
164
|
-
rubygems_version: 3.0.
|
|
164
|
+
rubygems_version: 3.0.8
|
|
165
165
|
signing_key:
|
|
166
166
|
specification_version: 4
|
|
167
167
|
summary: A SPDX license normalizer
|