hcl-checker 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dba14fa38ca8a55c4d6fff75c7f0fea2de7a8bc5e21dc4aaa2d0812e4dc0483e
-  data.tar.gz: bc3cd480f8edb04c18d1ffabdbea3f6234ca39e2d2518e6aedfcbf590537bb91
+  metadata.gz: d85d4b3175de82a6a7f8b7fc4b7902b1a3854995f175c44b55ab6319cd336030
+  data.tar.gz: 3dec1439149205bf08ba66017948f12e54fe3a616da0c3de4ce8219c15bcfc3f
 SHA512:
-  metadata.gz: 5ba8f95741ad1409547546af252178b7ab96dcf5111934fa1f5391610a96ec1d199211c2912006a043106cb3c40f12e35440830ddc5b9f64589e550f7057bb3a
-  data.tar.gz: f27f4fb782b3a47a788ea5f966f5d38a54becb71dbec6a564a3d9623c7cee1b0050b906b51c7ac86b192e74c15bd4a2c5fa3bc9705d74c1543ab98db12168f12
+  metadata.gz: cae4ca4014aa2bba9440133e39f57504e7d06d81b82d4c54d5005abfee0ecad57385aa71698b4728c2d7bfbc200584f1448bd1f8c162f129ab2c3f1ab6387cd3
+  data.tar.gz: 8973ab4020427a3954e5076bc8f38060a88934bbc9c9afb72bea81a2a259831ab17934d73282e3828a7e0a1cd91606c859ffa2a74469808431186ee54821c7e4

data/Gemfile

@@ -7,7 +7,7 @@ source "https://rubygems.org"
 # with the use of the libxml2 library may be vulnerable to a denial of service attack due
 # to a crash of the application.
 # Nokogiri >= 1.8.5 solves this problem
-gem "nokogiri", ">= 1.8.5"
+gem "nokogiri", ">= 1.10.4"
 
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    hcl-checker (1.1.1)
+    hcl-checker (1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
-    filesize (0.1.1)
+    filesize (0.2.0)
     jsobfu (0.4.2)
       rkelly-remix
-    json (2.0.4)
-    metasm (1.0.3)
+    json (2.2.0)
+    metasm (1.0.4)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.1)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     racc (1.4.14)
-    rake (10.4.2)
+    rake (10.5.0)
     rb-readline (0.5.5)
     rex (2.0.12)
       filesize (~> 0)
@@ -25,34 +25,34 @@ GEM
       metasm (~> 1)
       nokogiri (~> 1)
       rb-readline (~> 0)
-    rexical (1.0.5)
+    rexical (1.0.7)
     rkelly-remix (0.0.7)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0.2)
   hcl-checker!
-  nokogiri (>= 1.8.5)
+  nokogiri (>= 1.10.4)
   racc (= 1.4.14)
   rake (~> 10.0)
   rex (= 2.0.12)
-  rexical (= 1.0.5)
+  rexical (>= 1.0.7)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.2
+   2.0.2

data/assets/lexer.rex

@@ -20,7 +20,7 @@ macro
   RIGHTBRACE            \}
   LEFTBRACKET           \[
   RIGHTBRACKET          \]
-  HEREDOCUMENT          \<<-
+  HEREDOCUMENT          \<<\-?
 
 rule
 # [:state]      pattern                   [actions]

data/assets/parse.y

@@ -26,8 +26,12 @@ rule
 
 
   objectlist:
-     objectitem
+     objectitem COMMA
        { result = [val[0]] }
+  |  objectitem
+       { result = [val[0]] }
+  |  objectlist objectitem COMMA
+       { result = val[0] << val[1]  }
   |  objectlist objectitem
        { result = val[0] << val[1]  }
   ;
@@ -126,7 +130,7 @@ require_relative './lexer'
   #//       from object.go:  there is a flattened list structure
   #//
   def flatten_objectlist(list)
-    list.each_with_object({}) do |a, h|
+    (list || {}).each_with_object({}) do |a, h|
       h[a.first] =
         case a.last
         when Hash

data/hcl-checker.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.0.2'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'racc', '1.4.14'
   spec.add_development_dependency 'rex', '2.0.12'
-  spec.add_development_dependency 'rexical', '1.0.5'
+  spec.add_development_dependency 'rexical', '>= 1.0.7'
 
 end

data/lib/hcl/checker/version.rb

@@ -1,5 +1,5 @@
 module HCL
   module Checker
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
   end
 end

data/lib/hcl/lexer.rb

@@ -81,7 +81,7 @@ class HCLLexer
       when (text = @ss.scan(/\"/))
          action { [:STRING,       consume_string(text)] }
 
-      when (text = @ss.scan(/\<<-/))
+      when (text = @ss.scan(/\<<\-?/))
          action { [:STRING,       consume_heredoc] }
 
       when (text = @ss.scan(/\{/))

data/lib/hcl/parser.rb

@@ -10,7 +10,7 @@ require_relative './lexer'
 
 class HCLParser < Racc::Parser
 
-module_eval(<<'...end parse.y/module_eval...', 'parse.y', 119)
+module_eval(<<'...end parse.y/module_eval...', 'parse.y', 123)
   #//
   #//       HCL is unclear on what one should do when duplicate
   #//       keys are encountered.
@@ -21,7 +21,7 @@ module_eval(<<'...end parse.y/module_eval...', 'parse.y', 119)
   #//       from object.go:  there is a flattened list structure
   #//
   def flatten_objectlist(list)
-    list.each_with_object({}) do |a, h|
+    (list || {}).each_with_object({}) do |a, h|
       h[a.first] =
         case a.last
         when Hash
@@ -69,45 +69,47 @@ module_eval(<<'...end parse.y/module_eval...', 'parse.y', 119)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    20,    26,    25,    18,    26,    25,     5,    21,     6,    13,
-    33,    24,    13,    12,    24,    30,    26,    25,    38,     5,
-    -9,     6,    33,     5,    13,     6,    24,    37,    28,     5,
-    -8,     6,    10,    16,    36,    17,   nil,    13 ]
+    22,    28,    27,    10,    28,    27,     5,    23,     6,    14,
+    35,    26,    14,    12,    26,    32,    28,    27,    40,     5,
+   -10,     6,    35,     5,    14,     6,    26,    39,    30,     5,
+   -11,     6,    13,    17,    38,    18,    19,    14,    20 ]
 
 racc_action_check = [
-    12,    12,    12,    10,    24,    24,     0,    12,     0,    12,
-    24,    12,    24,     7,    24,    24,    38,    38,    29,     3,
-     6,     3,    38,    13,    38,    13,    38,    29,    13,    27,
-     5,    27,     1,     9,    27,     9,   nil,     9 ]
+    13,    13,    13,     1,    26,    26,     0,    13,     0,    13,
+    26,    13,    26,     4,    26,    26,    40,    40,    31,     3,
+     5,     3,    40,    14,    40,    14,    40,    31,    14,    29,
+     6,    29,     7,     9,    29,     9,    10,     9,    11 ]
 
 racc_action_pointer = [
-    -1,    32,   nil,    12,   nil,    22,    12,     5,   nil,    26,
-     3,   nil,    -2,    16,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     1,   nil,   nil,    22,   nil,    13,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13,   nil ]
+    -1,     3,   nil,    12,     8,    12,    22,    24,   nil,    26,
+    36,    33,   nil,    -2,    16,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     1,   nil,   nil,    22,
+   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    13,   nil ]
 
 racc_action_default = [
-    -2,   -31,    -1,    -3,    -4,   -18,   -19,   -31,   -15,   -31,
-   -31,    -5,   -31,   -31,   -16,   -17,   -18,   -19,    40,   -10,
-   -11,   -12,   -13,   -14,   -31,   -29,   -30,   -31,    -7,   -31,
-   -21,   -22,   -25,   -26,   -27,   -28,    -6,   -20,   -24,   -23 ]
+    -2,   -33,    -1,    -3,    -5,   -20,   -21,   -33,   -17,   -33,
+   -33,    -7,    -4,   -33,   -33,   -18,   -19,   -20,   -21,    42,
+    -6,   -12,   -13,   -14,   -15,   -16,   -33,   -31,   -32,   -33,
+    -9,   -33,   -23,   -24,   -27,   -28,   -29,   -30,    -8,   -22,
+   -26,   -25 ]
 
 racc_goto_table = [
-    11,    31,    14,     3,    15,    22,    29,    19,     2,     1,
-    23,   nil,   nil,   nil,   nil,    39,    27,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    11 ]
+    11,     3,    33,    15,     1,     2,    21,    24,    25,    16,
+    31,   nil,   nil,   nil,   nil,    29,    41,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    11 ]
 
 racc_goto_check = [
-     4,    12,     5,     3,     9,     5,    11,     7,     2,     1,
-     8,   nil,   nil,   nil,   nil,    12,     3,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     4 ]
+     4,     3,    12,     5,     1,     2,     7,     5,     8,     9,
+    11,   nil,   nil,   nil,   nil,     3,    12,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     4 ]
 
 racc_goto_pointer = [
-   nil,     9,     8,     3,    -3,    -7,   nil,    -5,    -2,    -5,
-   nil,   -18,   -23 ]
+   nil,     4,     5,     1,    -3,    -6,   nil,    -7,    -5,     0,
+   nil,   -16,   -24 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,     4,    35,     7,    32,    34,     8,
+   nil,   nil,   nil,   nil,     4,    37,     7,    34,    36,     8,
      9,   nil,   nil ]
 
 racc_reduce_table = [
@@ -115,37 +117,39 @@ racc_reduce_table = [
   1, 19, :_reduce_1,
   0, 20, :_reduce_2,
   1, 20, :_reduce_none,
-  1, 21, :_reduce_4,
-  2, 21, :_reduce_5,
-  3, 23, :_reduce_6,
-  2, 23, :_reduce_7,
-  1, 24, :_reduce_8,
-  1, 24, :_reduce_9,
-  3, 22, :_reduce_10,
-  3, 22, :_reduce_11,
+  2, 21, :_reduce_4,
+  1, 21, :_reduce_5,
+  3, 21, :_reduce_6,
+  2, 21, :_reduce_7,
+  3, 23, :_reduce_8,
+  2, 23, :_reduce_9,
+  1, 24, :_reduce_10,
+  1, 24, :_reduce_11,
   3, 22, :_reduce_12,
   3, 22, :_reduce_13,
   3, 22, :_reduce_14,
-  1, 22, :_reduce_15,
-  2, 27, :_reduce_16,
-  2, 27, :_reduce_17,
-  1, 28, :_reduce_18,
-  1, 28, :_reduce_19,
-  3, 26, :_reduce_20,
-  2, 26, :_reduce_21,
-  1, 29, :_reduce_22,
-  3, 29, :_reduce_23,
-  2, 29, :_reduce_24,
-  1, 30, :_reduce_25,
-  1, 30, :_reduce_26,
+  3, 22, :_reduce_15,
+  3, 22, :_reduce_16,
+  1, 22, :_reduce_17,
+  2, 27, :_reduce_18,
+  2, 27, :_reduce_19,
+  1, 28, :_reduce_20,
+  1, 28, :_reduce_21,
+  3, 26, :_reduce_22,
+  2, 26, :_reduce_23,
+  1, 29, :_reduce_24,
+  3, 29, :_reduce_25,
+  2, 29, :_reduce_26,
   1, 30, :_reduce_27,
   1, 30, :_reduce_28,
-  1, 25, :_reduce_29,
-  1, 25, :_reduce_30 ]
+  1, 30, :_reduce_29,
+  1, 30, :_reduce_30,
+  1, 25, :_reduce_31,
+  1, 25, :_reduce_32 ]
 
-racc_reduce_n = 31
+racc_reduce_n = 33
 
-racc_shift_n = 40
+racc_shift_n = 42
 
 racc_token_table = {
   false => 0,
@@ -251,49 +255,49 @@ module_eval(<<'.,.,', 'parse.y', 29)
 
 module_eval(<<'.,.,', 'parse.y', 31)
   def _reduce_5(val, _values, result)
-     result = val[0] << val[1]  
+     result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 36)
+module_eval(<<'.,.,', 'parse.y', 33)
   def _reduce_6(val, _values, result)
-     result = flatten_objectlist(val[1]) 
+     result = val[0] << val[1]  
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 38)
+module_eval(<<'.,.,', 'parse.y', 35)
   def _reduce_7(val, _values, result)
-     return 
+     result = val[0] << val[1]  
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 43)
+module_eval(<<'.,.,', 'parse.y', 40)
   def _reduce_8(val, _values, result)
-     result = val[0] 
+     result = flatten_objectlist(val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 45)
+module_eval(<<'.,.,', 'parse.y', 42)
   def _reduce_9(val, _values, result)
-     result = val[0] 
+     return 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 50)
+module_eval(<<'.,.,', 'parse.y', 47)
   def _reduce_10(val, _values, result)
-     result = val[0], val[2] 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 52)
+module_eval(<<'.,.,', 'parse.y', 49)
   def _reduce_11(val, _values, result)
-     result = val[0], val[2] 
+     result = val[0] 
     result
   end
 .,.,
@@ -321,82 +325,82 @@ module_eval(<<'.,.,', 'parse.y', 58)
 
 module_eval(<<'.,.,', 'parse.y', 60)
   def _reduce_15(val, _values, result)
-     result = val[0] 
+     result = val[0], val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 65)
+module_eval(<<'.,.,', 'parse.y', 62)
   def _reduce_16(val, _values, result)
-     result = val[0], val[1] 
+     result = val[0], val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 67)
+module_eval(<<'.,.,', 'parse.y', 64)
   def _reduce_17(val, _values, result)
-     result = val[0], {val[1][0] => val[1][1]} 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 72)
+module_eval(<<'.,.,', 'parse.y', 69)
   def _reduce_18(val, _values, result)
-     result = val[0] 
+     result = val[0], val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 74)
+module_eval(<<'.,.,', 'parse.y', 71)
   def _reduce_19(val, _values, result)
-     result = val[0] 
+     result = val[0], {val[1][0] => val[1][1]} 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 79)
+module_eval(<<'.,.,', 'parse.y', 76)
   def _reduce_20(val, _values, result)
-     result = val[1] 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 81)
+module_eval(<<'.,.,', 'parse.y', 78)
   def _reduce_21(val, _values, result)
-     return 
+     result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 86)
+module_eval(<<'.,.,', 'parse.y', 83)
   def _reduce_22(val, _values, result)
-     result = [val[0]] 
+     result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 88)
+module_eval(<<'.,.,', 'parse.y', 85)
   def _reduce_23(val, _values, result)
-     result = val[0] << val[2] 
+     return 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parse.y', 90)
   def _reduce_24(val, _values, result)
-     result = val[0] 
+     result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 95)
+module_eval(<<'.,.,', 'parse.y', 92)
   def _reduce_25(val, _values, result)
-     result = val[0] 
+     result = val[0] << val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 97)
+module_eval(<<'.,.,', 'parse.y', 94)
   def _reduce_26(val, _values, result)
      result = val[0] 
     result
@@ -417,20 +421,34 @@ module_eval(<<'.,.,', 'parse.y', 101)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 106)
+module_eval(<<'.,.,', 'parse.y', 103)
   def _reduce_29(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parse.y', 108)
+module_eval(<<'.,.,', 'parse.y', 105)
   def _reduce_30(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
+module_eval(<<'.,.,', 'parse.y', 110)
+  def _reduce_31(val, _values, result)
+     result = val[0] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parse.y', 112)
+  def _reduce_32(val, _values, result)
+     result = val[0] 
+    result
+  end
+.,.,
+
 def _reduce_none(val, _values, result)
   val[0]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcl-checker
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Marcelo Castellani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: rexical
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.7
 description: Hashicorp Configuration Language parser and checker for Ruby
 email:
 - marcelofc.rock@gmail.com
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Hashicorp Configuration Language parser for Ruby