hcl-checker 1.1.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dba14fa38ca8a55c4d6fff75c7f0fea2de7a8bc5e21dc4aaa2d0812e4dc0483e
-  data.tar.gz: bc3cd480f8edb04c18d1ffabdbea3f6234ca39e2d2518e6aedfcbf590537bb91
+  metadata.gz: db4fad85fc6cac710e6cf24082498ce2454f89f19204afc977413913a0e58699
+  data.tar.gz: 8d6be4dd1a00565006886e0dadbee8d2737de8d2b0819eed26d76d0573dbddb2
 SHA512:
-  metadata.gz: 5ba8f95741ad1409547546af252178b7ab96dcf5111934fa1f5391610a96ec1d199211c2912006a043106cb3c40f12e35440830ddc5b9f64589e550f7057bb3a
-  data.tar.gz: f27f4fb782b3a47a788ea5f966f5d38a54becb71dbec6a564a3d9623c7cee1b0050b906b51c7ac86b192e74c15bd4a2c5fa3bc9705d74c1543ab98db12168f12
+  metadata.gz: 878423137f46f8043861744bbb8ff9026f5472caa0d8f9cfa0eb532f612f82bad0451b5c154b0aec19a98fdd9b568860a578d36903ef55fee9f3efbeec03e6a6
+  data.tar.gz: 63ebcea583cc378a141a41435ab0c32b0a9ee88a21fbbac197b7f0756fd8c46461f55987730fc591e0cfee124b85cb6558be5281e41e1ea52f32ad421f8842f8

data/.rubocop.yml

@@ -0,0 +1,32 @@
+AllCops:
+  NewCops: enable
+  Exclude:
+    - lib/hcl/lexer.rb
+    - lib/hcl/parser.rb
+
+Layout/LineLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: never

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+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()
@@ -7,10 +7,9 @@ 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.11.4'
 
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in hcl-checker.gemspec
 gemspec

data/Gemfile.lock

@@ -1,22 +1,23 @@
 PATH
   remote: .
   specs:
-    hcl-checker (1.1.1)
+    hcl-checker (1.6.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.4.0)
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    racc (1.4.14)
-    rake (10.4.2)
+    json (2.3.1)
+    metasm (1.0.4)
+    mini_portile2 (2.5.3)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    racc (1.5.0)
+    rake (12.3.3)
     rb-readline (0.5.5)
     rex (2.0.12)
       filesize (~> 0)
@@ -25,34 +26,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.2.10)
   hcl-checker!
-  nokogiri (>= 1.8.5)
-  racc (= 1.4.14)
-  rake (~> 10.0)
+  nokogiri (>= 1.11.4)
+  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.2
+   2.2.20

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
 
@@ -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/Rakefile

@@ -1,19 +1,18 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new do |c|
-  options = ["--color"]
-  options += ["--format", "documentation"]
+  options = ['--color']
+  options += ['--format', 'documentation']
   c.rspec_opts = options
 end
 
-desc "Generate Grammar files for HCL"
+desc 'Generate Grammar files for HCL'
 task :build_grammar do
   print 'Building Lexer'
-  `rex  ./assets/lexer.rex -o ./lib/hcl/lexer.rb`
+  `rex ./assets/lexer.rex -o ./lib/hcl/checker/lexer.rb`
   print "....done\n"
   print 'Building Parser'
-  `racc ./assets/parse.y -o ./lib/hcl/parser.rb`
+  `racc ./assets/parse.y -o ./lib/hcl/checker/parser.rb`
   print "....done\n\n"
 end
-

data/assets/lexer.rex

@@ -1,8 +1,7 @@
-
-class HCLLexer
+class HCL::Checker::Lexer
 option
   independent
-  
+
 macro
   NEWLINE               \n|\r
   BLANK                 \s+
@@ -20,7 +19,9 @@ macro
   RIGHTBRACE            \}
   LEFTBRACKET           \[
   RIGHTBRACKET          \]
-  HEREDOCUMENT          \<<-
+  LEFTPARENTHESES       \(
+  RIGHTPARENTHESES      \)
+  HEREDOCUMENT          \<<\-?
 
 rule
 # [:state]      pattern                   [actions]
@@ -36,37 +37,39 @@ rule
                 {QUOTE}                   { [:STRING,       consume_string(text)] }
                 {HEREDOCUMENT}            { [:STRING,       consume_heredoc] }
 #-------------------------------------------------------------------------------
-                {LEFTBRACE}               { [:LEFTBRACE,    text]}
-                {RIGHTBRACE}              { [:RIGHTBRACE,   text]}
-                {LEFTBRACKET}             { [:LEFTBRACKET,  text]}
-                {RIGHTBRACKET}            { [:RIGHTBRACKET, text]}
+                {LEFTBRACE}               { [:LEFTBRACE,        text]}
+                {RIGHTBRACE}              { [:RIGHTBRACE,       text]}
+                {LEFTBRACKET}             { [:LEFTBRACKET,      text]}
+                {RIGHTBRACKET}            { [:RIGHTBRACKET,     text]}
+                {LEFTPARENTHESES}         { [:LEFTPARENTHESES,  text]}
+                {RIGHTPARENTHESES}        { [:RIGHTPARENTHESES, text]}
 #-------------------------------------------------------------------------------
                 {COMMA}                   { [:COMMA,        text]}
                 {IDENTIFIER}              { [:IDENTIFIER,   text]}
                 {EQUAL}                   { [:EQUAL,        text]}
                 {MINUS}                   { [:MINUS,        text]}
 
-
 inner
-
   def lex(input)
     scan_setup(input)
     tokens = []
     while token = next_token
       tokens << token
     end
+
     tokens
   end
 
 
   def to_boolean(input)
-    input =
-      if input =~ /true/
-        true
-      elsif input =~ /false/
-        false
-      end
-    return input
+    case input
+    when /true/
+      true
+    when /false/
+      false
+    else
+      raise "Invalid value for `to_boolean`, expected true/false got #{input}"
+    end
   end
 
 
@@ -90,19 +93,21 @@ inner
     result = ''
     nested = 0
 
-    begin
+    loop do
       case(text = @ss.scan_until(%r{\"|\$\{|\}|\\}))
       when %r{\$\{\z}
         nested += 1
       when %r{\}\z}
-        nested -= 1 if nested > 0
+        nested -= 1 if nested.positive?
       when %r{\\\z}
         result += text.chop + @ss.getch
         next
       end
 
       result += text.to_s
-    end until nested == 0 && text =~ %r{\"\z}
+
+      break if nested.zero? && text =~ %r{\"\z}
+    end
 
     result.chop
   end

data/assets/parse.y

@@ -1,4 +1,4 @@
-class HCLParser
+class HCL::Checker::Parser
 token BOOL
       FLOAT
       NUMBER
@@ -12,6 +12,8 @@ token BOOL
       RIGHTBRACE
       LEFTBRACKET
       RIGHTBRACKET
+      LEFTPARENTHESES
+      RIGHTPARENTHESES
       PERIOD
       EPLUS
       EMINUS
@@ -24,10 +26,13 @@ rule
   |  objectlist
   ;
 
-
   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]  }
   ;
@@ -36,7 +41,7 @@ rule
      LEFTBRACE objectlist RIGHTBRACE
        { result = flatten_objectlist(val[1]) }
   |  LEFTBRACE RIGHTBRACE
-       { return }
+       { return {} }
   ;
 
   objectkey:
@@ -57,6 +62,10 @@ rule
        { result = val[0], val[2] }
   |  objectkey EQUAL list
        { result = val[0], val[2] }
+  |  objectkey EQUAL IDENTIFIER LEFTPARENTHESES IDENTIFIER RIGHTPARENTHESES
+       { result = val[0], "#{val[2]}(#{val[4]})" }
+  |  objectkey EQUAL IDENTIFIER
+       { result = val[0], val[2] }
   |  block
        { result = val[0] }
   ;
@@ -79,7 +88,7 @@ rule
      LEFTBRACKET listitems RIGHTBRACKET
        { result = val[1] }
   |  LEFTBRACKET RIGHTBRACKET
-       { return }
+       { return [] }
   ;
 
   listitems:
@@ -113,7 +122,7 @@ rule
 end
 
 ---- header
-require_relative './lexer'
+require_relative 'lexer'
 
 ---- inner
   #//
@@ -121,19 +130,31 @@ require_relative './lexer'
   #//       keys are encountered.
   #//
   #//       from decoder.go: if we're at the root or we're directly within
-  #//                        a list, decode  to hashes, otherwise lists
+  #//                        a list, decode to hashes, otherwise lists
   #//
   #//       from object.go:  there is a flattened list structure
   #//
+  #//       if @duplicate_mode is set:
+  #//         - :array then duplicates will be appended to an array
+  #//         - :merge then duplicates will be deep merged into a hash
+  #//
   def flatten_objectlist(list)
-    list.each_with_object({}) do |a, h|
-      h[a.first] =
-        case a.last
-        when Hash
+    (list || {}).each_with_object({}) do |a, h|
+      if h.keys.include?(a.first)
+        case @duplicate_mode
+        when :array
+          if h[a.first].is_a?(Array)
+            h[a.first].push(a.last)
+          else
+            h[a.first] = [ h[a.first], a.last ]
+          end
+        when :merge
           deep_merge(h[a.first] || {}, a.last)
-        else
-          h[a.first] = a.last
+        else raise ArgumentError
         end
+      else
+        h[a.first] = a.last
+      end
     end
   end
 
@@ -145,10 +166,12 @@ require_relative './lexer'
   end
 
 
-  def parse(input)
-    @lexer = HCLLexer.new.lex(input)
+  def parse(input, duplicate_mode = :array)
+    @duplicate_mode = duplicate_mode
+    @lexer = HCL::Checker::Lexer.new.lex(input)
     do_parse
-    return @result
+
+    @result
   end
 
 

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "hcl/checker"
+require 'bundler/setup'
+require 'hcl/checker'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "hcl/checker"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/hcl-checker.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'hcl/checker/version'
 
@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'hcl-checker'
   spec.version       = HCL::Checker::VERSION
   spec.authors       = ['Marcelo Castellani']
-  spec.email         = ['marcelofc.rock@gmail.com']
+  spec.email         = ['marcelo@linux.com']
 
   spec.summary       = 'Hashicorp Configuration Language parser for Ruby'
   spec.description   = 'Hashicorp Configuration Language parser and checker for Ruby'
@@ -17,12 +17,23 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features)/})
   end
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.5.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  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 'bundler', '~> 2.2.10'
+  spec.add_development_dependency 'racc', '1.5.0'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
   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.add_development_dependency 'rspec', '~> 3.0'
+
+  spec.post_install_message = '
+Hello, me again. This version fixes: 
+
+- Add support for multiple elements of the same type
+- Fix bug where empty objects and empty lists were being parsed as nil
+- Update bundler version
+- Update nokogiri version
 
+Thank you :)
+'
 end