hcl_parser 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8205c8bf81717770d753d6d0965a0892416c8b0bc6c84b7dd08d4ddfe19116a
-  data.tar.gz: 9549a9834df1a02fe39a91bde951c16ab5e14fe4eed88ab2b0e0352dba014a81
+  metadata.gz: c68e7a4474d1b96b0da7990388f077728a3c11ae198dae2a6f6863cc8c9abc0c
+  data.tar.gz: 37a31807784ddf3d81472d9834da1b41a9eb337bdbebfd2e273e41deac457986
 SHA512:
-  metadata.gz: adc3a6ea90ade6a327eff78da11219661876ac59195e803ad1803752e880e81b774454b68521d0a3232c7147280c1728881b1ae3a9229f2c29bbc571320d9f62
-  data.tar.gz: 72b869125b2700a4931c33bb65fcf0134718f7c5a475d2582e12b92837c73c0c32c518469b09bb6d9188954dd28676a9321040c505b9c01d4373b0f84ce7b47a
+  metadata.gz: 4f1870f3f238bdb0074ff6718945697a44bfe5390231b684598202fe4b47633af565fa5e025e6813c63600af248066d84a0e209163a6184193e66a95e668bca8
+  data.tar.gz: 97c932c7b10ed1afd4eee68afb94b3cf193c766efe9016606d40463456f0c93fe133ac5e2320d7e889d0f5f5d8493ac2d9b8ac85d1bd33f2a00d5cce307cdb6a

data/.gitignore

@@ -6,6 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-
+/Gemfile.lock
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
+
+## [0.2.2] - 2022-08-26
+- [#5](https://github.com/boltops-tools/hcl_parser/pull/5) handle single line variable
+
+## [0.2.1] - 2021-11-28
+- [#2](https://github.com/boltops-tools/hcl_parser/pull/2) improve complex type parser: handle any
+
+## [0.2.0] - 2021-11-25
+- [#1](https://github.com/boltops-tools/hcl_parser/pull/1) Complex types
+
+## [0.1.0]
+* Initial release

data/lib/hcl_parser/loader.rb

@@ -17,6 +17,76 @@ module HclParser
     def code
       return @code if @code
       @code = fix_quotes(@raw)
+      @code = rewrite_complex_types(@code)
+    end
+
+    def rewrite_complex_types(raw)
+      lines = raw.split("\n")
+      results = []
+
+      variable_start_found = false
+      variable_start_index = nil
+      variable_end_index = nil
+      rewrite_lines = false
+
+      lines.each_with_index do |l,i|
+        # We dont rewrite lines until the next line/iteration
+        # This is actually the next iteration since we set rewrite_lines = true previously
+        # in rewrite_lines = complex_type_lines?(lookahead_lines)
+        if rewrite_lines
+          if complex_type_line?(l)
+            # Doesnt matter what the default value is as long as there is one
+            # Doing this in case the default value spans multiple lines
+            results << '  default = "any"'
+          elsif simple_default_assignment?(l)
+            results << l
+          else
+            results << "# #{l}"
+          end
+        else
+          results << l
+        end
+        # End of logic in the next iteration
+
+        # Start of logic in the current iteration
+        variable_start_found = l.match(/^variable /)
+        if variable_start_found
+          variable_start_index = i
+          variable_end_index = variable_end_index(lines, variable_start_index)
+          lookahead_lines = lines[variable_start_index..variable_end_index]
+          rewrite_lines = complex_type_lines?(lookahead_lines)
+        end
+
+        # Disable rewriting before reaching the end of the variable definition so: i + 1
+        if variable_end_index == i + 1
+          variable_start_index = nil
+          variable_end_index = nil
+          rewrite_lines = false
+        end
+      end
+
+      results.join("\n")
+    end
+
+    def simple_default_assignment?(line)
+      line.match(/default\s*=\s*("|'|null)/)
+    end
+
+    def complex_type_lines?(lines)
+      !!lines.find do |l|
+        complex_type_line?(l)
+      end
+    end
+
+    def complex_type_line?(l)
+      l.match(/object\(/) || l.match(/=\s*"any/)
+    end
+
+    def variable_end_index(lines, variable_start_index)
+      lines.each_with_index do |l,i|
+        next unless i >= variable_start_index
+        return i if l.match(/^}/) || l.match(/{\s*}/)
+      end
     end
 
     def empty?

data/lib/hcl_parser/version.rb

@@ -1,3 +1,3 @@
 module HclParser
-  VERSION = "0.1.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcl_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2022-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rhcl
@@ -47,8 +47,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.21
 signing_key: 
 specification_version: 4
 summary: HCL Variables Parser

data/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: .
-  specs:
-    hcl_parser (0.1.0)
-      rhcl
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    deep_merge (1.2.1)
-    diff-lcs (1.3)
-    rake (12.3.3)
-    rhcl (0.1.0)
-      deep_merge
-    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.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  hcl_parser!
-  rake (~> 12.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.1.4