spdx 2.0.10 → 2.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/spdx/version.rb +1 -1
- data/lib/spdx_parser.rb +4 -4
- metadata +3 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2666b65e72b1bd12e9fe3d2214ef5177012c7df9ec9a755cf58910c52d6516cd
|
|
4
|
+
data.tar.gz: ee8c457edf2d81a51ba5d54904fd56a5dd121f7494403bd591033485d8cd0396
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 728c74fa33a14330baab9d8c542c7700200dcc67e88310905404d4631e55a5ba08c80dc1145d7c4c32fccc3a2d8837692541e296465027729930e593ef54b46f
|
|
7
|
+
data.tar.gz: 7719ebb561baa9451c90ca440ae548e76c6562bd260589681ecd8416b57b0fb805f6f28917842f05e0d49f5b91d0c52f026a86e7b56618872c83e9de1a8f9297
|
data/lib/spdx/version.rb
CHANGED
data/lib/spdx_parser.rb
CHANGED
|
@@ -9,7 +9,6 @@ class SpdxParser
|
|
|
9
9
|
Treetop.load(File.expand_path(File.join(File.dirname(__FILE__), "spdx_parser.treetop")))
|
|
10
10
|
|
|
11
11
|
SKIP_PARENS = ["NONE", "NOASSERTION", ""].freeze
|
|
12
|
-
@parser = SpdxGrammarParser.new
|
|
13
12
|
|
|
14
13
|
def self.parse(data)
|
|
15
14
|
parse_tree(data)
|
|
@@ -21,11 +20,12 @@ class SpdxParser
|
|
|
21
20
|
end
|
|
22
21
|
|
|
23
22
|
private_class_method def self.parse_tree(data)
|
|
23
|
+
parser = SpdxGrammarParser.new # The generated grammar parser is not thread safe
|
|
24
24
|
# Couldn't figure out treetop to make parens optional
|
|
25
|
-
data = "(#{data})" unless
|
|
26
|
-
tree = @parser.parse(data)
|
|
25
|
+
data = "(#{data})" unless SKIP_PARENS.include?(data)
|
|
27
26
|
|
|
28
|
-
|
|
27
|
+
tree = parser.parse(data)
|
|
28
|
+
raise SpdxGrammar::SpdxParseError, "Unable to parse expression '#{data}'. Parse error at offset: #{parser.index}" if tree.nil?
|
|
29
29
|
|
|
30
30
|
clean_tree(tree)
|
|
31
31
|
tree
|
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.11
|
|
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-06-
|
|
11
|
+
date: 2020-06-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: fuzzy_match
|
|
@@ -161,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
161
161
|
- !ruby/object:Gem::Version
|
|
162
162
|
version: '0'
|
|
163
163
|
requirements: []
|
|
164
|
-
|
|
165
|
-
rubygems_version: 2.7.4
|
|
164
|
+
rubygems_version: 3.0.3
|
|
166
165
|
signing_key:
|
|
167
166
|
specification_version: 4
|
|
168
167
|
summary: A SPDX license normalizer
|