spandx 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d25ff66ba00edb25cf87b9d9af71ed9433bf084a819a80f86676714754359b34
-  data.tar.gz: 59e6783d2cba9287e0a65836aeae6705434fc0c9ccdfb093763d83b23d673207
+  metadata.gz: bb37d5c085e6c24f08f563a34abe6395448e63a0f8a7571cd16ee7353fcf0e86
+  data.tar.gz: 8cb0c804cf63410200d1a8d7b28e7ba7ec1cf57e180d1e66e63664f3daf2e4b8
 SHA512:
-  metadata.gz: c75d55cc57a24d00912a98d0a339b22f21e04fb0c84459ce9b769b900cce83f5877557cbe70e2cdff522d1869ba4d89688b9e9d67913719247cc53897216cb01
-  data.tar.gz: 770105bb92091a740afc3d886194712eb54908718af73e2769acfd512afe553d3f00de0e1ada81930b3d5c09a0a6053dfcc3cd8c9f48ecdb76673e1534ad9fff
+  metadata.gz: '0815ee42c9a013e2d4979d662166ca44d898d513b64250635ab36e8c65ab55d2eb1d7683b7cd1dcf4c2d8bc365d55433aba88713b3d4e2613c47dc62a7b53ba7'
+  data.tar.gz: 1dd8fa583d48f9007162b2eda18e07b0e58e906791c06491dd1d43dece6304c6831b279a4840761e8a370c6aaf6d7304e16eb2baa2a9f80b627bdffbf0ae2632

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-Version 0.18.0
+Version 0.18.1
 
 # Changelog
 
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.18.1] - 2021-06-02
+### Fixed
+- Parse `.terraform.lock.hcl` files with multiple providers.
+
 ## [0.18.0] - 2021-05-10
 ### Added
 - Add support for parsing `.terraform.lock.hcl` files.
@@ -228,7 +232,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Provide ruby API to the latest SPDX catalogue.
 
-[Unreleased]: https://github.com/spandx/spandx/compare/v0.18.0...HEAD
+[Unreleased]: https://github.com/spandx/spandx/compare/v0.18.1...HEAD
+[0.18.1]: https://github.com/spandx/spandx/compare/v0.18.0...v0.18.1
 [0.18.0]: https://github.com/spandx/spandx/compare/v0.17.0...v0.18.0
 [0.17.0]: https://github.com/spandx/spandx/compare/v0.16.1...v0.17.0
 [0.16.1]: https://github.com/spandx/spandx/compare/v0.16.0...v0.16.1

data/lib/spandx/terraform/parsers/hcl.rb

@@ -6,6 +6,7 @@ module Spandx
       class Hcl < Parslet::Parser
         rule(:alpha) { match['a-zA-Z'] }
         rule(:assign) { str('=') }
+        rule(:colon) { str(':') }
         rule(:comma) { str(',') }
         rule(:comment) { (str('#') | str('//')) >> ((str("\n") >> str("\r").maybe).absent? >> any).repeat >> eol }
         rule(:crlf) { match('[\r\n]') }
@@ -21,11 +22,13 @@ module Spandx
         rule(:major_minor_patch) { number >> dot >> number >> dot >> number }
         rule(:multiline_comment) { str('/*') >> (str('*/').absent? >> any).repeat >> str('*/') }
         rule(:number) { digit.repeat }
+        rule(:plus) { str('+') }
         rule(:pre_release) { hyphen >> (alpha | digit).repeat }
         rule(:pre_release?) { pre_release.maybe }
         rule(:quote) { str('"') }
         rule(:rbracket) { str(']') }
         rule(:rcurly) { str('}') }
+        rule(:slash) { str('/') }
         rule(:space) { match('\s') }
         rule(:tilda_wacka) { str('~>') }
         rule(:version) { number >> dot >> number >> dot >> number >> pre_release? }
@@ -61,39 +64,41 @@ module Spandx
         end
 
         rule :string do
-          quote >> match('[0-9A-Za-z.~> :=/]').repeat.as(:value) >> quote
+          quote >> (
+            digit | dot | alpha | str('~> ') | slash | colon | assign | plus
+          ).repeat(1).as(:value) >> quote
         end
 
         rule :array_item do
-          whitespace >> string >> comma >> eol
+          whitespace? >> string >> comma.maybe >> eol
         end
 
         rule :array do
-          lbracket >> eol >> array_item.repeat >> rbracket
+          lbracket >> eol >> array_item.repeat >> whitespace >> rbracket
         end
 
-        rule :argument do
-          alpha.repeat.as(:name) >> whitespace >> assign >> whitespace >> (array.as(:values) | string)
+        rule :argument_value do
+          (array.as(:values) | string) >> eol
         end
 
-        rule :arguments do
-          (argument >> eol).repeat
+        rule :argument do
+          whitespace >> alpha.repeat(1).as(:name) >> whitespace >> assign >> whitespace >> argument_value
         end
 
-        rule :identifier do
-          whitespace >> quote >> ((alpha | match('[./]')).repeat).as(:name) >> quote >> whitespace
+        rule :block_body do
+          lcurly >> crlf >> argument.repeat.as(:arguments) >> rcurly
         end
 
-        rule :block_body do
-          arguments.as(:arguments)
+        rule :identifier do
+          whitespace >> quote >> (alpha | dot | slash).repeat(1).as(:name) >> quote >> whitespace
         end
 
         rule :block do
-          whitespace? >> (alpha.repeat).as(:type) >> identifier >> whitespace >> lcurly >> eol >> block_body >> rcurly >> eol
+          alpha.repeat(1).as(:type) >> identifier >> block_body
         end
 
         rule :blocks do
-          block.repeat.as(:blocks)
+          whitespace? >> (block >> eol.maybe).repeat(1).as(:blocks)
         end
 
         root(:blocks)

data/lib/spandx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spandx
-  VERSION = '0.18.0'
+  VERSION = '0.18.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spandx
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Can Eldem
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -460,7 +460,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.19
 signing_key:
 specification_version: 4
 summary: A ruby interface to the SPDX catalogue.