hcl-checker 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e04f6380f29c819a40b0d84b1e7a49372b8201b5
-  data.tar.gz: 6ba793e199f075a89f34a8822a5a111679153b91
+  metadata.gz: 9e120cd46c80de3764fa4e5842c9fec7472931b9
+  data.tar.gz: e0a590bf486fd5e9800a43f4c92bb854002fa88e
 SHA512:
-  metadata.gz: 73643697b5caeff32bf49ed9b674f514f2098cdfc0827383ec9c22c9e0a99dad8f4555381f6568e4e44d23927d593a63b1f87bd8d6e58721d059ed8e9d80648b
-  data.tar.gz: ec8aa1242014e252fe27914b4ca0ebabccce99d972871958d5b7d5ac93d075850864fc9672d8682e51d325cfc2ac4b35d3312f98c35fd94ff39e2354bee86fe6
+  metadata.gz: d28e21092462fae8c51f89e59c6c71144932b95703c00e769713a144e762bcaa618b0af7c4d190598c285906582c3bd3f3ef7f0447c20681368048d69f50a334
+  data.tar.gz: 010365b5ccfafbeaed12fbfdb52fac26dbc381201ef868b17baff5f68c4f07780c4b917bf9bec5c61b6f7c23b9e4fa6b5cd11b143785517c81dcd0e1a78b3e24

data/Gemfile.lock

@@ -1,13 +1,32 @@
 PATH
   remote: .
   specs:
-    hcl-checker (1.0.1)
+    hcl-checker (1.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
+    filesize (0.1.1)
+    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)
+    rb-readline (0.5.5)
+    rex (2.0.12)
+      filesize (~> 0)
+      jsobfu (~> 0)
+      json (~> 2)
+      metasm (~> 1)
+      nokogiri (~> 1)
+      rb-readline (~> 0)
+    rexical (1.0.5)
+    rkelly-remix (0.0.7)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -28,7 +47,10 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   hcl-checker!
+  racc (= 1.4.14)
   rake (~> 10.0)
+  rex (= 2.0.12)
+  rexical (= 1.0.5)
   rspec (~> 3.0)
 
 BUNDLED WITH

data/README.md

@@ -33,6 +33,7 @@ hcl_string = 'provider "aws" {
     secret_key = "${var.aws_secret_key}"
 }
 
+# This is a awesome comment
 resource "aws_vpc" "default" {
   cidr_block = "10.0.0.0/16"
   enable_dns_hostnames = true
@@ -57,6 +58,13 @@ You can parse the `hcl_string` into a `Hash` with `parse` method.
  => {"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
+ => "Parse error at  \"eec8b16c-ee89-4ea0-bdcc-d094300a42e8\" , (invalid token: ,)"
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run
@@ -69,12 +77,14 @@ release a new version, update the version number in `version.rb`, and then run
 git commits and tags, and push the `.gem` file to
 [rubygems.org](https://rubygems.org).
 
-### Lexer
-  - Built using the `rexical` library (https://github.com/tenderlove/rexical)
-  
-### Parser
-  - Built using the `racc` library (https://github.com/tenderlove/racc)
+### Building grammar
 
+```
+$ bundle exec rake build_grammar
+Building Lexer....done
+Building Parser....done
+```
+  
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at

data/Rakefile

@@ -7,12 +7,13 @@ RSpec::Core::RakeTask.new do |c|
   c.rspec_opts = options
 end
 
-desc "Generate HCL Lexer"
-task :lexer do
+desc "Generate Grammar files for HCL"
+task :build_grammar do
+  print 'Building Lexer'
   `rex  ./assets/lexer.rex -o ./lib/hcl/lexer.rb`
+  print "....done\n"
+  print 'Building Parser'
+  `racc ./assets/parse.y -o ./lib/hcl/parser.rb`
+  print "....done\n\n"
 end
 
-desc "Generate HCL Parser"
-task :parser do
-  `racc ./assets/parse.y -o ./lib/parser.rb`
-end

data/assets/lexer.rex

@@ -99,7 +99,7 @@ inner
         next
       end
 
-      result += text
+      result += text.to_s
     end until nested == 0 && text =~ %r{\"\z}
 
     result.chop

data/assets/parse.y

@@ -135,7 +135,8 @@ require_relative './lexer'
 
 
   def on_error(error_token_id, error_value, value_stack)
-    header = "parse error found on value: #{error_value}"
+    error_message = value_stack.to_s.split(',').last.gsub(']', '')
+    header = "Parse error at #{error_message} #{error_value} (invalid token: #{error_value})"
     raise Racc::ParseError, header
   end
 

data/hcl-checker.gemspec

@@ -21,4 +21,8 @@ Gem::Specification.new do |spec|
   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 'rex', '2.0.12'
+  spec.add_development_dependency 'rexical', '1.0.5'
+
 end

data/lib/hcl/checker/version.rb

@@ -1,5 +1,5 @@
 module HCL
   module Checker
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/lib/hcl/checker.rb

@@ -4,6 +4,10 @@ require_relative 'parser'
 
 module HCL
   module Checker
+    class << self
+      attr_accessor :last_error
+    end
+
     def self.valid?(value)
       ret = HCLParser.new.parse(value)
       return true if ret.is_a? Hash
@@ -14,8 +18,11 @@ module HCL
 
     def self.parse(value)
       HCLParser.new.parse(value)
+    rescue Racc::ParseError => e
+      self.last_error = e.message
+      return false
     rescue
-      nil
+      false
     end
   end
 end

data/lib/hcl/lexer.rb

@@ -159,7 +159,7 @@ class HCLLexer
         result += text.chop + @ss.getch
         next
       end
-      result += text
+      result += text.to_s
     end until nested == 0 && text =~ %r{\"\z}
     result.chop
   end

data/lib/hcl/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.12
+# This file is automatically generated by Racc 1.4.14
 # from Racc grammer file "".
 #
 
@@ -34,7 +34,8 @@ module_eval(<<'...end parse.y/module_eval...', 'parse.y', 115)
 
 
   def on_error(error_token_id, error_value, value_stack)
-    header = "parse error found on value: #{error_value}"
+    error_message = value_stack.to_s.split(',').last.gsub(']', '')
+    header = "Parse error at #{error_message} #{error_value} (invalid token: #{error_value})"
     raise Racc::ParseError, header
   end
 
@@ -69,20 +70,20 @@ module_eval(<<'...end parse.y/module_eval...', 'parse.y', 115)
 
 racc_action_table = [
     20,    26,    25,    36,    26,    25,     5,    21,     6,    13,
-    33,    24,    35,    26,    25,    30,     5,    12,     6,    33,
-     5,    34,     6,    -9,    16,    28,    17,     5,    13,     6,
-    -8,    10,    18 ]
+    33,    24,    35,    26,    25,    30,     5,    18,     6,    33,
+     5,    28,     6,    12,    16,    34,    17,     5,    13,     6,
+    -9,    -8,    10 ]
 
 racc_action_check = [
-    12,    12,    12,    29,    24,    24,     3,    12,     3,    12,
-    24,    12,    29,    36,    36,    24,    27,     7,    27,    36,
-    13,    27,    13,     6,     9,    13,     9,     0,     9,     0,
-     5,     1,    10 ]
+    12,    12,    12,    29,    24,    24,     0,    12,     0,    12,
+    24,    12,    29,    36,    36,    24,    13,    10,    13,    36,
+    27,    13,    27,     7,     9,    27,     9,     3,     9,     3,
+     6,     5,     1 ]
 
 racc_action_pointer = [
-    20,    31,   nil,    -1,   nil,    22,    15,     9,   nil,    17,
-    32,   nil,    -2,    13,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     1,   nil,   nil,     9,   nil,    -2,
+    -1,    32,   nil,    20,   nil,    23,    22,    15,   nil,    17,
+    17,   nil,    -2,     9,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,     1,   nil,   nil,    13,   nil,    -2,
    nil,   nil,   nil,   nil,   nil,   nil,    10,   nil ]
 
 racc_action_default = [
@@ -92,18 +93,18 @@ racc_action_default = [
    -21,   -22,   -25,   -26,    -6,   -20,   -24,   -23 ]
 
 racc_goto_table = [
-    11,     3,    14,    31,    19,    22,     2,    23,    15,    29,
-     1,   nil,   nil,   nil,    27,    37,   nil,   nil,   nil,   nil,
+    11,     3,    14,    31,    15,    22,    29,    19,     2,     1,
+    23,   nil,   nil,   nil,    27,    37,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,    11 ]
 
 racc_goto_check = [
-     4,     3,     5,    12,     7,     5,     2,     8,     9,    11,
-     1,   nil,   nil,   nil,     3,    12,   nil,   nil,   nil,   nil,
+     4,     3,     5,    12,     9,     5,    11,     7,     2,     1,
+     8,   nil,   nil,   nil,     3,    12,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,     4 ]
 
 racc_goto_pointer = [
-   nil,    10,     6,     1,    -3,    -7,   nil,    -8,    -5,    -1,
-   nil,   -15,   -21 ]
+   nil,     9,     8,     1,    -3,    -7,   nil,    -5,    -2,    -5,
+   nil,   -18,   -21 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,     4,   nil,     7,    32,   nil,     8,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcl-checker
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Marcelo Castellani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.14
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.14
+- !ruby/object:Gem::Dependency
+  name: rex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.12
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.12
+- !ruby/object:Gem::Dependency
+  name: rexical
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 description: Hashicorp Configuration Language parser and checker for Ruby
 email:
 - marcelo.castellani@totvs.com.br