tfdsl 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53563b8b3088da24df347a50b3b4e2395693adcece9a8b989551319a2c578bbb
-  data.tar.gz: 37b84c6ff14faa80f7937ba523f283ab69d4785a139a1093164d1b5a247c09d3
+  metadata.gz: 3e3ed7ad4bd1cea523d00c34a641f04ddb53ef3c9162aac8d119af7e1024b02a
+  data.tar.gz: f2741e78405e6f64a87b73bf238bb87f5f3e8b76c65b9eedc92d93f2536302c4
 SHA512:
-  metadata.gz: cab4005373305f9952341bd0f18f030b29e120c0587171f21ca2b8eb2cbc7d5f4eb491e439dc2dd5c671adb44d6fdd3e55f56f51ad3a0e0cb8635806bfe04b54
-  data.tar.gz: dd2d9e075827b24af100ee179ac58022bd43553e6ec3241980650afc5266f5d9f5e4b629e01514f496b6bdc6b6ba6234d9d1074f51ed3ed3f6e5dcacd50e3e68
+  metadata.gz: 326079630322cca9e9219ec70d5038cb29d45f2b2032ed4a5f230d26c9f5f6bd8ac378d5b3fc3ba358dcc7cdd205db5cd10f64632e8d2e9f1192a2f559c606a5
+  data.tar.gz: 7a2e4062d919909b291b6562556f87f2dce6b926aa23838e56b027fd32287f2e954a45f46ebb23e2c078d5a0619d7eb774df231bb2f20168bdf8f4d4ae924526

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/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    tfdsl (0.1.6)
+    tfdsl (0.1.11)
+      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

@@ -11,6 +11,10 @@ module TFDSL
 
     def method_missing(method_name, *args, &block)
       super if [:respond_to_missing?].include? method_name
+      return method_missing_handler(method_name, *args, &block)
+    end
+
+    def method_missing_handler(method_name, *args, &block)
       method = method_name.to_s.gsub(/=$/, '')
 
       if block_given?
@@ -25,6 +29,10 @@ module TFDSL
       return instance_variable_get "@#{method}" if args.empty?
     end
 
+    def timeout(*args, &block)
+      method_missing_handler :timeout, *args,  &block
+    end
+
     def respond_to_missing?(_method_name, _include_private = true)
       true
     end
@@ -50,7 +58,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 +72,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/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.6'.freeze
+  VERSION = '0.1.11'.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.6
+  version: 0.1.11
 platform: ruby
 authors:
 - Tiago Lopo
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-10-15 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
@@ -161,7 +175,7 @@ homepage: https://github.com/tlopo-ruby/tfdsl.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,8 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A chef like DSL for terraform
 test_files: []