tfdsl 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 558de3af9e9e0d5739a3b11318662ddcbc973e8b7cd52c3b1c4a3806f45a9267
-  data.tar.gz: a6de4b68078b31e44f585575e102bc2f88a1880583db63e8ac49dddd251fec5c
+  metadata.gz: 87d14dbb280f759b3e8a28be2e70f5893d4d18173245bf612c8ec63c0f70b61e
+  data.tar.gz: 902faacd228f429f154b427f03741764b84ac7d23588b85ff15cbc38d78f9099
 SHA512:
-  metadata.gz: d136fcaf31c7b1f86619bc7771cc24724a55b09c947966da7cb6708c014b781894dc29643dd67b0983dc85c70fbd5d5a872d438514bb0a297c6783015736d45d
-  data.tar.gz: 716b456702dc6bf00c960a4d198c0eef420aac2224c9b9657679950185cb140725695783060c5c1b1649996ce2270b15536e91135a05d1499895be0e7bbe61f4
+  metadata.gz: bb25b4cba94784ce4da1ffcb584603a4eb0e7abf1ff70e4ad1ca895c0461496374d12a0ce3106920bdc7e26c646ea4664d7eef317ac8c8beb83a36815be4b932
+  data.tar.gz: 8eb5b34029b9db9e9bdadaf744667794aa1e2cb0553a204a6ca8961980b9699a694be3c218cdf1bb2919338701c9e1d287cf4f0b1e45a172e6cf25acfad5e89b

data/.rubocop.yml

@@ -1,3 +1,5 @@
+Style/ConditionalAssignment:
+  Enabled: false
 Layout/IndentArray:
   Enabled: false
 Style/ClassVars:
@@ -6,6 +8,7 @@ Style/ClassVars:
 Metrics/AbcSize:
   Exclude: 
     - lib/**/formatter.rb
+    - lib/**/data_formatter.rb
 Metrics/MethodLength:
   Max: 35 
 Metrics/LineLength:

data/.travis.yml

@@ -1,7 +1,9 @@
----
-sudo: false
 language: ruby
-cache: bundler
 rvm:
-  - 2.5.3
-before_install: gem install bundler -v 1.16.6
+  - "2.5.0"
+  - "2.6.0"
+sudo: false
+cache: bundler
+script: bundle exec rake $TASK
+env:
+ - TASK=test_with_coveralls

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tfdsl (0.1.0)
+    tfdsl (0.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -10,6 +10,12 @@ GEM
     coderay (1.1.2)
     coolline (0.5.0)
       unicode_utils (~> 1.4)
+    coveralls (0.8.22)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
     docile (1.3.1)
     jaro_winkler (1.5.2)
     json (2.1.0)
@@ -40,6 +46,10 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (0.19.4)
+    tins (1.20.2)
     unicode-display_width (1.4.1)
     unicode_utils (1.4.0)
 
@@ -48,6 +58,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
+  coveralls (~> 0.8)
   minitest (~> 5.0)
   pry (~> 0.12)
   pry-coolline (~> 0.2)
@@ -57,4 +68,4 @@ DEPENDENCIES
   tfdsl!
 
 BUNDLED WITH
-   1.16.6
+   1.17.2

data/README.md

@@ -1,15 +1,20 @@
+[![Gem Version](https://badge.fury.io/rb/tfdsl.svg)](http://badge.fury.io/rb/tfdsl)
+[![Build Status](https://travis-ci.org/tlopo-ruby/tfdsl.svg?branch=master)](https://travis-ci.org/tlopo-ruby/tfdsl)
+[![Code Climate](https://codeclimate.com/github/tlopo-ruby/tfdsl/badges/gpa.svg)](https://codeclimate.com/github/tlopo-ruby/tfdsl)
+[![Coverage Status](https://coveralls.io/repos/github/tlopo-ruby/tfdsl/badge.svg?branch=master)](https://coveralls.io/github/tlopo-ruby/tfdsl?branch=master)
+
 # TFDSL
 
 A Chef like DSL for Terraform.
 
-Terraform use HCL for its configuration, which is better than json or yaml in my opinion, but still not quite as flexible as Chef DSL, so here it's a chef like DSL for terraform.
+Terraform uses HCL for its configuration, which is better than json or yaml in my opinion, but still not quite as flexible as Chef DSL, so here it's a chef like DSL for terraform.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'terraform_dsl'
+gem 'tfdsl'
 ```
 
 And then execute:
@@ -29,7 +34,7 @@ require 'tfdsl'
 stack = TFDSL.stack do
   resource 'aws_vpc', 'main' do
     cidr_block '10.0.0.0/16'
-    instance_tenacy 'dedicated'
+    instance_tenancy 'dedicated'
     tags do
       Name 'main'
     end
@@ -49,6 +54,28 @@ resource "aws_vpc" "main" {
   }
 }
 ```
+
+## Ruby Reserved Words
+
+Since some terraform object names use Ruby reserved words, we had to do some slight modifications on how resources are named. 
+We use `datasource` for `data` and `tfmodule` for `module`
+
+Example:
+
+In ruby
+```ruby
+datasource 'aws_ami', 'web' do
+...
+end
+```
+In HCL
+```hcl
+data 'aws_ami' 'web' {
+...
+}
+```
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/Rakefile

@@ -1,6 +1,7 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rubocop/rake_task'
+require 'coveralls/rake/task'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
@@ -9,4 +10,7 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task default: %i[rubocop test]
+task test_with_coveralls: [:default, 'coveralls:push']
+
 RuboCop::RakeTask.new
+Coveralls::RakeTask.new

data/lib/tfdsl/data_formatter.rb

@@ -0,0 +1,63 @@
+module TFDSL
+  # This will format hash maps, lists and elements in HCL format
+  class DataFormatter
+    def initialize
+      @sio = StringIO.new
+      @indent = ' ' * 4
+    end
+
+    def format(input, level = 0, last = false, parent_is_list = false)
+      if input.class == Hash
+        handle_hash input, level, last, parent_is_list
+      elsif input.class == Array
+        handle_list input, level, last, parent_is_list
+      else
+        handle_element input, level, last, parent_is_list
+      end
+
+      return @sio.string if level.zero?
+    end
+
+    def handle_element(input, _level, last, parent_is_list)
+      if last
+        @sio << %("#{input}"\n)
+      elsif parent_is_list
+        @sio << %("#{input}",\n)
+      else
+        @sio << %("#{input}"\n)
+      end
+    end
+
+    def handle_list(input, level, _last, _parent_is_list)
+      @sio << "[\n#{@indent * (level + 1)}"
+      input.each_with_index do |e, i|
+        if i == input.size - 1
+          format e, level + 1, true, true
+        else
+          format e, level + 1, false, true
+        end
+
+        @sio << @indent * (level + 1) unless i == input.size - 1
+      end
+      @sio << "#{@indent * level}]\n"
+    end
+
+    def handle_hash(input, level, last, _parent_is_list)
+      @sio << "{\n"
+      input.each_with_index do |e, i|
+        k, v = e
+        @sio << "#{@indent * (level + 1)}#{k} = "
+        if i == input.size - 1
+          format v, level + 1, true
+        else
+          format v, level + 1
+        end
+      end
+      if last || level.zero?
+        @sio << @indent * level + "}\n"
+      else
+        @sio << @indent * level + "},\n"
+      end
+    end
+  end
+end

data/lib/tfdsl/template.rb

@@ -5,22 +5,14 @@ module TFDSL
 
     def list(name, value)
       template = <<-TEXT.gsub(/^ {6}/, '')
-      <%=name%> = [
-      <%-value.each_with_index do |v,index| -%>
-          "<%=v%>"<%=index != value.size - 1 ? ',' : '' %>
-      <%-end-%>
-      ]
+      <%=name%> = <%=DataFormatter.new.format value%>
       TEXT
       ERB.new(template, nil, '-').result(binding).strip
     end
 
     def map(name, value)
       template = <<-TEXT.gsub(/^ {6}/, '')
-      <%=name%> = {
-      <%-value.each do |k,v| -%>
-          <%=k%> = "<%=v%>"
-      <%-end-%>
-      }
+      <%=name%> = <%=DataFormatter.new.format value%>
       TEXT
       ERB.new(template, nil, '-').result(binding).strip
     end

data/lib/tfdsl/version.rb

@@ -1,3 +1,3 @@
 module TFDSL
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/lib/tfdsl.rb

@@ -9,6 +9,7 @@ module TFDSL
   LIB_DIR = "#{__dir__}/tfdsl/".freeze
 
   require "#{LIB_DIR}/template"
+  require "#{LIB_DIR}/data_formatter"
   require "#{LIB_DIR}/formatter"
   require "#{LIB_DIR}/block"
   require "#{LIB_DIR}/resource"

data/tfdsl.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tfdsl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tiago Lopo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-16 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +142,7 @@ files:
 - bin/setup
 - lib/tfdsl.rb
 - lib/tfdsl/block.rb
+- lib/tfdsl/data_formatter.rb
 - lib/tfdsl/data_source.rb
 - lib/tfdsl/formatter.rb
 - lib/tfdsl/locals.rb
@@ -160,8 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A chef like DSL for terraform