terraspace 1.1.2 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ad5587827bc4c9dcbae4cd2a42904e69ccf930bfa1a04c7e65d753178ff94f7
-  data.tar.gz: 122e5fb3135447e92bf12e7f5947ee665f5f77e024e6aea5499ad63a184eceea
+  metadata.gz: 1645fa9d7679907d214d87b276d1282f0ae0fba29f1a2fff4019c4324a61b9c4
+  data.tar.gz: 26e2f27c70bf1872fce821778a80d20e3923b1dbf8e56013c88ee3d0c66ff002
 SHA512:
-  metadata.gz: 0b6a0f432037f072acad01d60efb86d6e06314cea7ff75556dfb0de4ec077fe2479b215867702c8c6a615358a17c4568f30cfcf4a45011233f03b9c595a258ec
-  data.tar.gz: ed255135382340d2a44cd04f863f8fc9d8bb6562b413e04024a13f6e4bb31c2b19f837dbb7c05ee1220210ee4bf0bd6ce4a5d4e5628fb23eab61dd8a338c6b5b
+  metadata.gz: 9a512a5c8c7d9b30959a967023be912979c2f666d510f95094cf1c531c00b3d52c11bca88528e72e62842484fdfa82d22c62edffe86d11a6a8ec11126117baba
+  data.tar.gz: 9f88a7337013171c4944f4c8b86067ba1df3a9e009cedb773fac0199cd35a7828c535439848abc9addec41cf918b7df0152c2d0360255ec8381a7df9ff87c000

data/CHANGELOG.md

@@ -3,6 +3,22 @@
 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.
 
+## [1.1.6] - 2022-02-21
+- [#213](https://github.com/boltops-tools/terraspace/pull/213) ability to show layers for debugging
+
+## [1.1.5] - 2022-02-21
+- [#212](https://github.com/boltops-tools/terraspace/pull/212) ability to show layers for debugging
+- show layers for debugging with logger level debug and TS_SHOW_ALL_LAYERS=1
+- stringify_keys layer friendly names map
+
+## [1.1.4] - 2022-02-21
+- [#210](https://github.com/boltops-tools/terraspace/pull/210) write files without magic conversion, fixes #209
+- cleanup argv and root
+- write files without magic conversion, fixes #209
+
+## [1.1.3] - 2022-02-17
+- [#207](https://github.com/boltops-tools/terraspace/pull/207) dont fork when all.concurrency = 1
+
 ## [1.1.2] - 2022-02-17
 - [#200](https://github.com/boltops-tools/terraspace/pull/200) fix terraspace typos
 - [#202](https://github.com/boltops-tools/terraspace/pull/202) Windows support: fix include_dir for windows

data/lib/terraspace/all/runner.rb

@@ -41,18 +41,27 @@ module Terraspace::All
       concurrency = Terraspace.config.all.concurrency
       batch.sort_by(&:name).each_slice(concurrency) do |slice|
         slice.each do |node|
-          pid = fork do
-            build_stack(node.name)
-            run_terraspace(node.name)
+          if fork?
+            pid = fork do
+              deploy_stack(node)
+            end
+            @pids[pid] = node.name # store mod_name mapping
+          else
+            deploy_stack(node)
           end
-          @pids[pid] = node.name # store mod_name mapping
         end
       end
+      return unless fork?
       wait_for_child_proccess
       summarize     # also reports lower-level error info
       report_errors # reports finall errors and possibly exit
     end
 
+    def deploy_stack(node)
+      build_stack(node.name)
+      run_terraspace(node.name)
+    end
+
     def build_modules
       builder = Terraspace::Builder.new(@options.merge(mod: "placeholder", clean: true, quiet: true, include_stacks: :none))
       builder.build(modules: true)
@@ -109,7 +118,7 @@ module Terraspace::All
     end
 
     def run_terraspace(mod_name)
-      set_log_path!(mod_name)
+      set_log_path!(mod_name) if fork?
       name = command_map(@command)
       o = @options.merge(mod: mod_name, yes: true, build: false, input: false, log_to_stderr: true)
       o.merge!(quiet: false) if @command == "init" # noisy so can filter and summarize output
@@ -123,6 +132,10 @@ module Terraspace::All
       end
     end
 
+    def fork?
+      Terraspace.config.all.concurrency > 1
+    end
+
     def set_log_path!(mod_name)
       command = terraspace_command(mod_name)
       path = log_path(mod_name)

data/lib/terraspace/compiler/strategy/tfvar/layer.rb

@@ -32,6 +32,7 @@ class Terraspace::Compiler::Strategy::Tfvar
     extend Memoist
     include Terraspace::Layering
     include Terraspace::Plugin::Expander::Friendly
+    include Terraspace::Util
 
     def initialize(mod)
       @mod = mod
@@ -40,7 +41,11 @@ class Terraspace::Compiler::Strategy::Tfvar
     def paths
       project_paths = full_paths(project_tfvars_dir)
       stack_paths   = full_paths(stack_tfvars_dir)
-      project_paths + stack_paths
+      paths = project_paths + stack_paths
+      show_layers(paths)
+      paths.select do |path|
+        File.exist?(path)
+      end
     end
     memoize :paths
 
@@ -51,10 +56,6 @@ class Terraspace::Compiler::Strategy::Tfvar
           "#{tfvars_dir}/#{layer}.rb",
         ]
       end.flatten
-
-      layer_paths.select do |path|
-        File.exist?(path)
-      end
     end
 
     def full_layering
@@ -130,5 +131,20 @@ class Terraspace::Compiler::Strategy::Tfvar
       empty = Dir.glob("#{seed_dir}/*").empty?
       empty ? mod_dir : seed_dir
     end
+
+    @@shown_layers = {}
+    def show_layers(paths)
+      return unless @mod.resolved
+      return if @@shown_layers[@mod.name]
+      logger.debug "Layers for #{@mod.name}:"
+      paths.each do |path|
+        next unless path.include?('.tfvars')
+        show = File.exist?(path) || ENV['TS_SHOW_ALL_LAYERS']
+        logger.debug "    #{pretty_path(path)}" if show
+      end
+      logger.debug ""
+      @@shown_layers[@mod.name] = true
+    end
+
   end
 end

data/lib/terraspace/compiler/strategy/tfvar.rb

@@ -1,5 +1,7 @@
 module Terraspace::Compiler::Strategy
   class Tfvar
+    extend Memoist
+
     def initialize(mod)
       @mod = mod
       @order = 0
@@ -24,6 +26,7 @@ module Terraspace::Compiler::Strategy
     def layer_paths
       Layer.new(@mod).paths
     end
+    memoize :layer_paths
 
     # Tact on number to ensure that tfvars will be processed in desired order.
     # Also name auto.tfvars so it will automatically load

data/lib/terraspace/compiler/writer.rb

@@ -34,7 +34,7 @@ module Terraspace::Compiler
       if content.respond_to?(:path) # IO filehandle
         FileUtils.cp(content.path, dest_path) # preserves permission
       else # just content
-        IO.write(dest_path, content)
+        IO.write(dest_path, content, mode: "wb")
       end
       logger.debug "Created #{Terraspace::Util.pretty_path(dest_path)}"
     end

data/lib/terraspace/core.rb

@@ -11,11 +11,8 @@ module Terraspace
     def root
       @@root ||= ENV['TS_ROOT'] || Dir.pwd
     end
-
     # allow testing frameworks to switch roots
-    def root=(v)
-      @@root = v
-    end
+    cattr_writer :root
 
     def cache_root
       ENV['TS_CACHE_ROOT'] || config.build.cache_root || "#{root}/.terraspace-cache"
@@ -61,22 +58,7 @@ module Terraspace
 
     # Terraspace.argv provides consistency when terraspace is being called by rspec-terraspace test harness
     # So use Terraspace.argv instead of ARGV constant
-    def argv=(argv)
-      @@argv = argv
-    end
-
-    def argv
-      @@argv
-    end
-
-    @@check_project = true
-    def check_project
-      @@check_project
-    end
-
-    # allow testing frameworks to disable
-    def check_project=(v)
-      @@check_project = v
-    end
+    cattr_accessor :argv
+    cattr_accessor :check_project, default: true
   end
 end

data/lib/terraspace/ext/core/module.rb

@@ -8,7 +8,7 @@ class Module
   # Caller lines are different for OSes:
   #
   #   windows: "C:/Ruby31-x64/lib/ruby/gems/3.1.0/gems/terraspace-1.1.1/lib/terraspace/builder.rb:34:in `build'"
-  #   linux: "/home/ec2-user/.rvm/gems/ruby-3.0.3/gems/terraspace-1.1.1//lib/terraspace/compiler/dsl/syntax/mod.rb:4:in `<module:Mod>'"
+  #   linux: "/home/ec2-user/.rvm/gems/ruby-3.0.3/gems/terraspace-1.1.1/lib/terraspace/compiler/dsl/syntax/mod.rb:4:in `<module:Mod>'"
   #
   def include_dir(dir)
     caller_line = caller[0]

data/lib/terraspace/plugin/expander/friendly.rb

@@ -5,7 +5,8 @@ module Terraspace::Plugin::Expander
     #   Terraspace::Plugin::Expander::Interface
     def friendly_name(name)
       return '' if name.nil?
-      Terraspace.config.layering.names[name.to_sym] || name
+      names = Terraspace.config.layering.names.stringify_keys
+      names[name.to_s] || name
     end
   end
 end

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "1.1.2"
+  VERSION = "1.1.6"
 end

data/terraspace.gemspec

@@ -12,6 +12,10 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://terraspace.cloud"
   spec.license       = "Apache-2.0"
 
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/boltops-tools/terraspace"
+  spec.metadata["changelog_uri"] = "https://github.com/boltops-tools/terraspace/blob/master/CHANGELOG.md"
+
   spec.files         = File.directory?('.git') ? `git ls-files`.split($/) : Dir.glob("**/*")
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -870,7 +870,10 @@ files:
 homepage: https://terraspace.cloud
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  homepage_uri: https://terraspace.cloud
+  source_code_uri: https://github.com/boltops-tools/terraspace
+  changelog_uri: https://github.com/boltops-tools/terraspace/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: