tfdsl 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74b2359139fb844e569e91739fbb44bacb3a87d5d73e3f0781dbcb9385039b21
-  data.tar.gz: d9ca949f72e36b678bd7e2e0cbe3a1184e33d59afb10c5b1d5852a4f991a0ca3
+  metadata.gz: 188ff59f9e8c63a9d7123ed9900db3079a74b17f16926b11cebf3863db5cbf41
+  data.tar.gz: 45d14091543dfe0e02512247dffbcf97550432715c357e2ab382c62482a9856d
 SHA512:
-  metadata.gz: 329600e4d9a1c456ccf5183922eff633927c1ef5af7796c8d3b15bcaba56fb6ff0645cdd890574f97ee4d8997981dc642d7b9d43075a9e10b48b94dcbfa44bd9
-  data.tar.gz: 8913fe645797e29407a59510d452c6123e07224e47548c16e3a0c178b6944f99f42f9a6a6ac57be7d24a1dc722ad45599650e6cea8c23e15ef5457c15a2bf23a
+  metadata.gz: 71f58ea39f028ddb1dfc1ddf06388e02975bb0583bd3da4db9571e6ea14b10d8f60ec66b7bc19824417e106a3d961c52414b98913c7b265ad272d9aab3357b49
+  data.tar.gz: 4dff89253f6ede3be10703f0a1a7ee41d43ffbeac17de45f69ee8c9b8fc7a187451ab5288ad37b6d2a8f5514a70ff87a9fd487cca46013e163263e631b194cb7

data/.rubocop.yml

@@ -18,6 +18,10 @@ Metrics/LineLength:
     - test/**/*
 Layout/ElseAlignment:
   Enabled: false
+Metrics/CyclomaticComplexity:
+  Max: 10
+Metrics/PerceivedComplexity: 
+  Max: 10
 Metrics/BlockLength:
   Exclude:
     - '*.gemspec' 

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - "2.5.0"
   - "2.6.0"
 sudo: false
 cache: bundler

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    tfdsl (0.1.5)
+    tfdsl (0.1.10)
+      deep_merge (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -16,6 +17,7 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
+    deep_merge (1.2.1)
     docile (1.3.1)
     jaro_winkler (1.5.2)
     json (2.1.0)
@@ -31,7 +33,7 @@ GEM
     pry-coolline (0.2.5)
       coolline (~> 0.5)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rubocop (0.63.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -62,7 +64,7 @@ DEPENDENCIES
   minitest (~> 5.0)
   pry (~> 0.12)
   pry-coolline (~> 0.2)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rubocop (~> 0.63)
   simplecov (~> 0.16)
   tfdsl!

data/lib/tfdsl/block.rb

@@ -50,7 +50,7 @@ module TFDSL
       labels = [__type__] + labels if !__type__.empty? && depth.zero?
 
       labels.each do |l|
-        ref[l] = {}
+        ref[l] = {} if ref[l].nil?
         ref = ref[l]
       end
 
@@ -64,13 +64,16 @@ module TFDSL
       __blocks__.each do |b|
         json = b.to_json_repr depth + 1
         if b.__labels__.empty?
-          ref[b.__type__] = json
+          if ref[b.__type__].nil?
+            ref[b.__type__] = json
+          else
+            ref[b.__type__] = [ref[b.__type__], json].flatten
+          end
         else
           ref[b.__type__] = [] if ref[b.__type__].nil?
           ref[b.__type__] << json
         end
       end
-
       block['tmp']
     end
   end

data/lib/tfdsl/formatter.rb

@@ -55,6 +55,9 @@ module TFDSL
     end
 
     def safe_quote(str)
+      # Don't escape when string is interpolation
+      return str if str =~ /^\s*\$\{/
+
       str.gsub(/([^\\])"/, '\1\"').gsub(/([^\\])"/, '\1\"')
     end
 

data/lib/tfdsl/stack.rb

@@ -1,3 +1,4 @@
+require 'deep_merge'
 module TFDSL
   # This class is the representation of a terraform stack, or in another words
   # is a collection of terraform configuration blocks
@@ -27,9 +28,9 @@ module TFDSL
       @objects.each do |obj|
         key = KindTranslator.kind obj.class
         stack[key] = {} if stack[key].nil?
-        stack[key] = stack[key].merge obj.to_json_repr
+        stack[key] = stack[key].deep_merge obj.to_json_repr
       end
-      stack.to_json
+      JSON.pretty_generate(stack)
     end
   end
 end

data/lib/tfdsl/template.rb

@@ -7,20 +7,25 @@ module TFDSL
       template = <<-TEXT.gsub(/^ {6}/, '')
       <%=name%> = <%=DataFormatter.new.format value%>
       TEXT
-      ERB.new(template, nil, '-').result(binding).strip
+      ERB.new(template, trim_mode: '-').result(binding).strip
     end
 
     def map(name, value)
       template = <<-TEXT.gsub(/^ {6}/, '')
       <%=name%> = <%=DataFormatter.new.format value%>
       TEXT
-      ERB.new(template, nil, '-').result(binding).strip
+      ERB.new(template, trim_mode: '-').result(binding).strip
     end
 
     def child_block(value)
       labels = value.__labels__.nil? ? [] : value.__labels__
       labels_str = labels.map { |l| %("#{l}") }.join ' '
       type = value.__type__.nil? ? '' : %( #{value.__type__} )
+
+      # This is just to get ride of the warning of unused variables
+      # The variable are used, but as part of binding
+      _ = "#{labels_str}, #{type}"
+
       template = <<-TEXT.gsub(/^ {6}/, '')
       <%=type%><%=labels_str%> {
       <%- unless value.to_s.empty? -%>
@@ -28,14 +33,14 @@ module TFDSL
       <%- end -%>
       }
       TEXT
-      ERB.new(template, nil, '-').result(binding).strip
+      ERB.new(template, trim_mode: '-').result(binding).strip
     end
 
     def value(name, value)
       template = <<-TEXT.gsub(/^ {6}/, '')
       <%=name%> = "<%=value%>"
       TEXT
-      ERB.new(template, nil, '-').result(binding).strip
+      ERB.new(template, trim_mode: '-').result(binding).strip
     end
   end
 end

data/lib/tfdsl/version.rb

@@ -1,3 +1,3 @@
 module TFDSL
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.10'.freeze
 end

data/tfdsl.gemspec

@@ -31,12 +31,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'deep_merge', '~> 1.2'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'pry', '~> 0.12'
   spec.add_development_dependency 'pry-coolline', '~> 0.2'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 0.63'
   spec.add_development_dependency 'simplecov', '~> 0.16'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tfdsl
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Tiago Lopo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement