tfw 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee246c67eff046643315775f2f09403be31558715e06bbf8137cf604c85655d5
-  data.tar.gz: 8a64df7e4208173c3aa1f9d0fab34582ab54932a1d3a498dbf2a5b10abeaa297
+  metadata.gz: f7f44ae3f98d836eea0497fa0ff14b7494efb507effba9638f45d136907c0916
+  data.tar.gz: 2abbaf5b7b20431740e2939bd4fe9bd5b2288da248cc3247b2b64b5c6cde7bac
 SHA512:
-  metadata.gz: a7f311faae818ad8cfb639fb8637af40cda9fec6f359951bda4e30c2fdb020730f49ee5e211718e5acdf56b977027daaaa3d8b0a89a5413d1c6222a95664ab74
-  data.tar.gz: 4e5ebd6186b2bd49e7ef448a23f3ee731a96b576d7c97f75c2fd53fee3be087a9a506d2da0a6cced33e5e32a2671020e62aaa7baa7bda7ab50ff4b7a811577e9
+  metadata.gz: e5ff9d50d25a4490c1bd6f5bb1880920662f90dc230a7b80061627c7b0d00a13eede386c77982d164a859d06f3ae5e0225f625ecf1a4a873b05ed49354703b89
+  data.tar.gz: 3212278049b99074ca8ff204abff4bc0c5c4c5e7aa1039bf48fd9fb1b92ab301df2a140b91ce9593acf2a81e2ca5d38be0e24e0bf8e4a0b4177e372245fb6740

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tfw (0.1.7)
+    tfw (0.1.8)
       tfdsl (= 0.1.6)
 
 GEM
@@ -27,7 +27,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rubocop (0.79.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -56,7 +56,7 @@ DEPENDENCIES
   coveralls (~> 0.8)
   minitest (~> 5.0)
   pry (~> 0.12)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rubocop (~> 0.79)
   tfw!
 

data/exe/tfw-test

@@ -0,0 +1,23 @@
+#! /usr/bin/env/ruby
+# frozen_string_literal: true
+
+require 'simplecov'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
+  SimpleCov::Formatter::HTMLFormatter
+])
+
+SimpleCov.minimum_coverage 90
+SimpleCov.start
+
+require 'minitest'
+
+old_dir = Dir.pwd
+Dir.chdir './test'
+
+files = Dir.glob('**/*_test.rb').map { |f| File.expand_path f }
+Dir.chdir old_dir
+
+files.each { |f| require f }
+
+Minitest.run ['-vp']

data/lib/tfw/module.rb

@@ -13,7 +13,7 @@ module TFW
         raise "#{e} must be specified for module" if instance_variable_get("@#{e}").nil?
       end
 
-      @stack = TFW.get_stack_for_dir @source, @input
+      @stack = TFW.get_stack_for_dir @source, @input, TFDSL::Stack.new
     end
   end
 end

data/lib/tfw/state.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# Singleton class to keep the stack
+class State
+  include Singleton
+
+  def initialize
+    @stack = TFDSL::Stack.new
+  end
+
+  def stack(&block)
+    @stack.instance_eval(&block) if block_given?
+    @stack
+  end
+
+  def reset
+    @stack = TFDSL::Stack.new
+  end
+end

data/lib/tfw/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TFW
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/tfw.rb

@@ -3,6 +3,8 @@
 require 'tfw/version'
 require 'tfdsl'
 require 'json'
+require 'singleton'
+require_relative 'tfw/state'
 
 # TFW is a Terraform Wrapper which uses terraform DSL for Ruby
 module TFW
@@ -20,17 +22,19 @@ module TFW
     !ENV['TFW_AS_JSON'].nil?
   end
 
-  def get_stack_for_dir(dir, input = nil)
+  def get_stack_for_dir(dir, input = nil, stack = State.instance.stack)
+    configure_methods_using_stack stack
+    configure_input_method input
+
     files = Dir.glob "#{dir}/*.rb"
-    stack = TFDSL.stack do
-      instance_variable_set '@_input', input
-      files.sort.each { |f| instance_eval File.read(f), f }
-    end
+    files.sort.each { |f| load f }
+    configure_methods_using_stack State.instance.stack
     stack
   end
 
   def cli(args)
     build_config
+    State.instance.reset
     run_terraform args
   end
 
@@ -94,6 +98,18 @@ module TFW
     end
   end
 
+  def configure_methods_using_stack(stack)
+    %w[provider variable locals tfmodule datsource resource output terraform].each do |name|
+      TOPLEVEL_BINDING.eval('self').define_singleton_method name do |*args, &block|
+        stack.method(name).call(*args, &block)
+      end
+    end
+  end
+
+  def configure_input_method(input)
+    TOPLEVEL_BINDING.eval('self').define_singleton_method('tfw_module_input') { input }
+  end
+
   def pretty_json(json)
     JSON.pretty_generate JSON.parse(json)
   end

data/tfw.gemspec

@@ -41,6 +41,6 @@ Gem::Specification.new do |spec|
   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 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 0.79'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tfw
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Tiago Lopo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tfdsl
@@ -86,14 +86,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
@@ -113,6 +113,7 @@ email:
 - tiagolopo@yahoo.com.br
 executables:
 - tfw
+- tfw-test
 extensions: []
 extra_rdoc_files: []
 files:
@@ -129,9 +130,11 @@ files:
 - bin/console
 - bin/setup
 - exe/tfw
+- exe/tfw-test
 - lib/tfw.rb
 - lib/tfw/module.rb
 - lib/tfw/setters.rb
+- lib/tfw/state.rb
 - lib/tfw/version.rb
 - tfw.gemspec
 homepage: https://github.com/tlopo-ruby/tfw