hcl-checker 1.0.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1efd195e8ca8b8db483856773b83144bc9137c2
-  data.tar.gz: e2bf9f4f3c1ea37361e5df981316b7849bf74c5e
+SHA256:
+  metadata.gz: 195128a0325ac3b7fa3add01a739dbe3ce0aeb5b3314edfc74d195caa3a0aa61
+  data.tar.gz: ab84f84386083bdbb9aaea917716ea7e8462eaed2b89a2ab4f887fb4c3b2ee93
 SHA512:
-  metadata.gz: 5172205785804e8b064e61667fec47c889a1e9dc86a5309b6b4030c71b6c7226b2c02ea06fa3376eba8b5439e4c83f4615f29a338e2c9a171e216922ae7002fd
-  data.tar.gz: e456fbf641474294ba47bfb3c07af523801c717902d6415f31fb5720833e4c19106e6433f0c4a2718ab111080f2de1c6c249638be2347c6644b58401cf7175c7
+  metadata.gz: b53587ad90fa9ed3cf6c2fbfd5cad15f6b526e62e5c63298fbd963a1629d6283a0bac0ab7276674acba8a1d67e38bc2118fe8f9a0a11a5d362afef4957cc745a
+  data.tar.gz: 4d908d23f548138a2e4e876709cda19321650203d13219f8ac8fe3748cd1427e628f9cb834f80bf684252a7d06d9a97d72663f3ac6c19699a0149593e3450a0d

data/Gemfile

@@ -1,5 +1,15 @@
 source "https://rubygems.org"
 
+# This is needed due https://nvd.nist.gov/vuln/detail/CVE-2018-14404
+# A NULL pointer dereference vulnerability exists in the xpath.c:xmlXPathCompOpEval()
+# function of libxml2 through 2.9.8 when parsing an invalid XPath expression in the
+# XPATH_OP_AND or XPATH_OP_OR case. Applications processing untrusted XSL format inputs
+# 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.10.8"
+
+
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in hcl-checker.gemspec

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    hcl-checker (1.0.6)
+    hcl-checker (1.4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
-    filesize (0.1.1)
+    diff-lcs (1.4.4)
+    filesize (0.2.0)
     jsobfu (0.4.2)
       rkelly-remix
-    json (2.0.4)
-    metasm (1.0.3)
-    mini_portile2 (2.3.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    racc (1.4.14)
-    rake (10.4.2)
+    json (2.3.1)
+    metasm (1.0.4)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    racc (1.5.0)
+    rake (12.3.3)
     rb-readline (0.5.5)
     rex (2.0.12)
       filesize (~> 0)
@@ -25,33 +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.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1.4)
   hcl-checker!
-  racc (= 1.4.14)
-  rake (~> 10.0)
+  nokogiri (>= 1.10.8)
+  racc (= 1.5.0)
+  rake (~> 12.3.3)
   rex (= 2.0.12)
-  rexical (= 1.0.5)
+  rexical (>= 1.0.7)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.1
+   2.1.4

data/README.md

@@ -1,10 +1,10 @@
 # Hcl::Checker
 
-**Hashicorp Configuration Language** syntax checker and parser. 
+**Hashicorp Configuration Language** syntax checker and parser.
 
 Parser originally created by [Sikula](https://github.com/sikula) and available
 at [Ruby HCL Repository](https://github.com/sikula/ruby-hcl). Only works with
-[HCL Version 1](https://github.com/hashicorp/hcl). 
+[HCL Version 1](https://github.com/hashicorp/hcl).
 
 ## Installation
 
@@ -47,21 +47,21 @@ You can validate the `hcl_string` contents with `valid?` method. This will
 return `true` if is a valid HCL or `false` if not.
 
 ```
-2.3.2 :014 > HCL::Checker.valid? hcl_string
+2.3.2 :014 > HCL1::Checker.valid? hcl_string
  => true
 ```
 
 You can parse the `hcl_string` into a `Hash` with `parse` method.
 
 ```
-2.3.2 :015 > HCL::Checker.parse(hcl_string)
+2.3.2 :015 > HCL1::Checker.parse(hcl_string)
  => {"provider"=>{"aws"=>{"region"=>"${var.aws_region}", "access_key"=>"${var.aws_access_key}", "secret_key"=>"${var.aws_secret_key}"}}, "resource"=>{"aws_vpc"=>{"default"=>{"cidr_block"=>"10.0.0.0/16", "enable_dns_hostnames"=>true, "tags"=>{"Name"=>"Event Store VPC"}}}}}
 ```
 
 If after a `parse` you got `false` you can check `last_error` with:
 
 ```
-2.4.2 :063 > HCL::Checker.last_error
+2.4.2 :063 > HCL1::Checker.last_error
  => "Parse error at  \"eec8b16c-ee89-4ea0-bdcc-d094300a42e8\" , (invalid token: ,)"
 ```
 
@@ -84,7 +84,7 @@ $ bundle exec rake build_grammar
 Building Lexer....done
 Building Parser....done
 ```
-  
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at
@@ -96,5 +96,3 @@ to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 The gem is available as open source under the terms of the [MIT
 License](https://opensource.org/licenses/MIT).
-
-

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]  }
   ;
@@ -96,6 +100,10 @@ rule
        { result = val[0] }
   |  STRING
        { result = val[0] }
+  | list
+       { result = val[0] }
+  | object
+       { result = val[0] }
   ;
 
   number:
@@ -122,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

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'hcl-checker'
   spec.version       = HCL::Checker::VERSION
   spec.authors       = ['Marcelo Castellani']
-  spec.email         = ['marcelo.castellani@totvs.com.br']
+  spec.email         = ['marcelo@linux.com']
 
   spec.summary       = 'Hashicorp Configuration Language parser for Ruby'
   spec.description   = 'Hashicorp Configuration Language parser and checker for Ruby'
@@ -18,11 +18,35 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.1.4'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'racc', '1.4.14'
+  spec.add_development_dependency 'racc', '1.5.0'
   spec.add_development_dependency 'rex', '2.0.12'
-  spec.add_development_dependency 'rexical', '1.0.5'
+  spec.add_development_dependency 'rexical', '>= 1.0.7'
 
+  spec.post_install_message = %q{
+Hello, I am updating this Gem to support version 2.0 of the HCL.
+
+In the meantime, it is important that you know that there will be a
+compatibility break with the current version, for Gem to support both
+versions.
+
+Therefore, instead of using just HCL::Checker you must tell which
+version you are using, like this:
+
+HCL1::Checker
+
+Or
+
+HCL2::Checker
+
+At the moment both HCL::Checker and HCL1::Checker will work, but with
+the release of support for version 2 the HCL::Checker syntax will no
+longer work.
+
+So, update your code.
+
+Thank you :)
+}
 end

data/lib/hcl/checker/version.rb

@@ -1,5 +1,5 @@
 module HCL
   module Checker
-    VERSION = '1.0.6'
+    VERSION = '1.4.0'
   end
 end

data/lib/hcl/lexer.rb

@@ -1,123 +1,124 @@
 #--
 # DO NOT MODIFY!!!!
-# This file is automatically generated by rex 1.0.5
+# This file is automatically generated by rex 1.0.7
 # from lexical definition file "./assets/lexer.rex".
 #++
 
 
 class HCLLexer
-  require 'strscan'
+      require 'strscan'
 
-  class ScanError < StandardError ; end
+      class ScanError < StandardError ; end
 
-  attr_reader   :lineno
-  attr_reader   :filename
-  attr_accessor :state
+      attr_reader   :lineno
+      attr_reader   :filename
+      attr_accessor :state
 
-  def scan_setup(str)
-    @ss = StringScanner.new(str)
-    @lineno =  1
-    @state  = nil
-  end
+      def scan_setup(str)
+        @ss = StringScanner.new(str)
+        @lineno =  1
+        @state  = nil
+      end
 
-  def action
-    yield
-  end
+      def action
+        yield
+      end
 
-  def scan_str(str)
-    scan_setup(str)
-    do_parse
-  end
-  alias :scan :scan_str
+      def scan_str(str)
+        scan_setup(str)
+        do_parse
+      end
+      alias :scan :scan_str
 
-  def load_file( filename )
-    @filename = filename
-    open(filename, "r") do |f|
-      scan_setup(f.read)
-    end
-  end
+      def load_file( filename )
+        @filename = filename
+        File.open(filename, "r") do |f|
+          scan_setup(f.read)
+        end
+      end
 
-  def scan_file( filename )
-    load_file(filename)
-    do_parse
-  end
+      def scan_file( filename )
+        load_file(filename)
+        do_parse
+      end
 
 
-  def next_token
-    return if @ss.eos?
-    
-    # skips empty actions
-    until token = _next_token or @ss.eos?; end
-    token
-  end
+        def next_token
+          return if @ss.eos?
 
-  def _next_token
-    text = @ss.peek(1)
-    @lineno  +=  1  if text == "\n"
-    token = case @state
-    when nil
-      case
-      when (text = @ss.scan(/\s+/))
-        ;
+          # skips empty actions
+          until token = _next_token or @ss.eos?; end
+          token
+        end
 
-      when (text = @ss.scan(/\#.*|\/\/.*$/))
-        ;
+        def _next_token
+          text = @ss.peek(1)
+          @lineno  +=  1  if text == "\n"
+          token = case @state
+            when nil
+          case
+                  when (text = @ss.scan(/\s+/))
+                    ;
 
-      when (text = @ss.scan(/\n|\r/))
-        ;
+                  when (text = @ss.scan(/\#.*|\/\/.*$/))
+                    ;
 
-      when (text = @ss.scan(/\/\*/))
-         action { consume_comment(text) }
+                  when (text = @ss.scan(/\n|\r/))
+                    ;
 
-      when (text = @ss.scan(/true|false/))
-         action { [:BOOL,         to_boolean(text)]}
+                  when (text = @ss.scan(/\/\*/))
+                     action { consume_comment(text) }
 
-      when (text = @ss.scan(/\-?\d+\.\d+/))
-         action { [:FLOAT,        text.to_f] }
+                  when (text = @ss.scan(/true|false/))
+                     action { [:BOOL,         to_boolean(text)]}
 
-      when (text = @ss.scan(/-?\d+/))
-         action { [:NUMBER,       text.to_i] }
+                  when (text = @ss.scan(/\-?\d+\.\d+/))
+                     action { [:FLOAT,        text.to_f] }
 
-      when (text = @ss.scan(/\"/))
-         action { [:STRING,       consume_string(text)] }
+                  when (text = @ss.scan(/-?\d+/))
+                     action { [:NUMBER,       text.to_i] }
 
-      when (text = @ss.scan(/\<<-/))
-         action { [:STRING,       consume_heredoc] }
+                  when (text = @ss.scan(/\"/))
+                     action { [:STRING,       consume_string(text)] }
 
-      when (text = @ss.scan(/\{/))
-         action { [:LEFTBRACE,    text]}
+                  when (text = @ss.scan(/\<<\-?/))
+                     action { [:STRING,       consume_heredoc] }
 
-      when (text = @ss.scan(/\}/))
-         action { [:RIGHTBRACE,   text]}
+                  when (text = @ss.scan(/\{/))
+                     action { [:LEFTBRACE,    text]}
 
-      when (text = @ss.scan(/\[/))
-         action { [:LEFTBRACKET,  text]}
+                  when (text = @ss.scan(/\}/))
+                     action { [:RIGHTBRACE,   text]}
 
-      when (text = @ss.scan(/\]/))
-         action { [:RIGHTBRACKET, text]}
+                  when (text = @ss.scan(/\[/))
+                     action { [:LEFTBRACKET,  text]}
 
-      when (text = @ss.scan(/\,/))
-         action { [:COMMA,        text]}
+                  when (text = @ss.scan(/\]/))
+                     action { [:RIGHTBRACKET, text]}
 
-      when (text = @ss.scan(/[a-zA-Z_][a-zA-Z0-9_\-\.]*/))
-         action { [:IDENTIFIER,   text]}
+                  when (text = @ss.scan(/\,/))
+                     action { [:COMMA,        text]}
 
-      when (text = @ss.scan(/\=/))
-         action { [:EQUAL,        text]}
+                  when (text = @ss.scan(/[a-zA-Z_][a-zA-Z0-9_\-\.]*/))
+                     action { [:IDENTIFIER,   text]}
 
-      when (text = @ss.scan(/\-/))
-         action { [:MINUS,        text]}
+                  when (text = @ss.scan(/\=/))
+                     action { [:EQUAL,        text]}
 
-      else
-        text = @ss.string[@ss.pos .. -1]
-        raise  ScanError, "can not match: '" + text + "'"
-      end  # if
-
-    else
-      raise  ScanError, "undefined state: '" + state.to_s + "'"
-    end  # case state
-    token
-  end  # def _next_token
+                  when (text = @ss.scan(/\-/))
+                     action { [:MINUS,        text]}
+
+          
+          else
+            text = @ss.string[@ss.pos .. -1]
+            raise  ScanError, "can not match: '" + text + "'"
+          end  # if
+
+        else
+          raise  ScanError, "undefined state: '" + state.to_s + "'"
+        end  # case state
+          token
+        end  # def _next_token
 
   def lex(input)
     scan_setup(input)