terraspace 1.1.1 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c07e843df9e61e62be834feba56f4d5fa058f3dbb130ed7e15edca66ef23e22d
-  data.tar.gz: a7d7c3946e2485ccb369a5d76d413118aed14592750880a48990ca83cdca5bca
+  metadata.gz: 91fe12476c2039a757ceb34e964609b8b5d0d922b08818f122088b5cd3989364
+  data.tar.gz: 01c7ec1d07c2a6be6da3d14e300c5dfb460a2b2595e511c4dc792e50530853f5
 SHA512:
-  metadata.gz: 026aa5128ce2bea7deb3e5b0fdb6e99c7cf50297c20f5292bbe6896dabb0ba995e62ecd14526ea2ea7e8e1a4be3895e29021620a89b26df49ad34ee0b95ffd1d
-  data.tar.gz: c2df058d2fe9848834fc4e166c1382ccb0e782170fb52f8fd264e4e948a1032916cc9d77662eac1969f4d2101e66b3655e07d944b217e5749581ac0d3ec04916
+  metadata.gz: 0fadfaa474138a8ef5f5856eb4b4cf5c3c998ecc6787c4ebbbc1c960e35b7949cf1ae6dd0b42bc0c6a8eba5b60007e57bc402c35a5ccd115a0172d1cbce67cb5
+  data.tar.gz: 26f8095beac1358e28c0eb516c7dafc5bf896a3076d7fb113e2bd0a97906b9ad3dfc7bd4816a7d844656fc7bf95e006f377b7b83407e4279bda614b2c4e35252

data/CHANGELOG.md

@@ -3,6 +3,27 @@
 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.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
+- [#203](https://github.com/boltops-tools/terraspace/pull/203) Fix ERB for windows
+- [#204](https://github.com/boltops-tools/terraspace/pull/204) improve file check
+- setup check terraform_bin windows support
+- slight layering improvement strip trailing slash, helps with custom layering
+
 ## [1.1.1] - 2022-02-02
 - [#199](https://github.com/boltops-tools/terraspace/pull/199) build required dependent stacks as part of terraspace up
 

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/cli/help/check_setup.md

@@ -1,9 +1,9 @@
 ## Example
 
     $ terraspace check_setup
-    Detected Terrspace version: 0.3.3
+    Detected Terraspace version: 0.3.3
     Detected Terraform bin: /home/ec2-user/.tfenv/bin/terraform
     Detected Terraform v0.13.2
     Terraspace requires Terraform v0.12.x and above
     You're all set!
-    $
+    $

data/lib/terraspace/cli/new/shim.rb

@@ -50,7 +50,7 @@ class Terraspace::CLI::New
 
   private
     def switch_ruby_version_line
-      rbenv_installed = system("type rbenv 2>&1 > /dev/null")
+      rbenv_installed = system("type rbenv > /dev/null 2>&1")
       if rbenv_installed
         'eval "$(rbenv init -)"'
       end

data/lib/terraspace/cli/setup/check.rb

@@ -11,7 +11,7 @@ class Terraspace::CLI::Setup
 
     # Used for the CLI
     def run
-      puts "Detected Terrspace version: #{Terraspace::VERSION}"
+      puts "Detected Terraspace version: #{Terraspace::VERSION}"
       if terraform_bin
         puts "Detected Terraform bin: #{terraform_bin}"
         puts "Detected #{terraform_version_message}"
@@ -65,8 +65,12 @@ class Terraspace::CLI::Setup
     end
 
     def terraform_bin
-      out = `type terraform 2>&1`.strip
-      return unless $?.success?
+      if Gem.win_platform?
+        out = "is terraform.exe".strip
+      else
+        out = `type terraform 2>&1`.strip
+        return unless $?.success?
+      end
       md = out.match(/is (.*)/)
       md[1] if md
     end

data/lib/terraspace/command.rb

@@ -30,7 +30,7 @@ module Terraspace
       include Terraspace::Util::Logging
 
       def dispatch(m, args, options, config)
-        # Terraspace.argv provides consistency when terraspace is being called by rspec-terrspace test harness
+        # Terraspace.argv provides consistency when terraspace is being called by rspec-terraspace test harness
         Terraspace.argv = args.clone # important to clone since Thor removes the first argv
 
         check_standalone_install!

data/lib/terraspace/compiler/strategy/mod/text_file.rb

@@ -8,28 +8,29 @@ class Terraspace::Compiler::Strategy::Mod
       @filename = filename
     end
 
-    @@already_reported = false
     def check
-      unless file_installed?
-        return true if @@already_reported
-        logger.warn <<~EOL.color(:yellow)
-          WARN: The command 'file' is not installed.
-          Unable to check if files are text or binary files as a part of the Terraspace compile processing.
-          Assuming all files are not binary file.
+      return true if Gem.win_platform? # assume text file if on windows
+      return true unless file_installed?
 
-          Please install the file command to remove this warning message.
-        EOL
-        @@already_reported = true
-        return true
-      end
       # Thanks: https://stackoverflow.com/questions/2355866/ruby-how-to-determine-if-file-being-read-is-binary-or-text
       file_type, status = Open3.capture2e("file", @filename)
       status.success? && file_type.include?("text")
     end
 
   private
+    @@has_file = nil
     def file_installed?
-      system("type file > /dev/null 2>&1")
+      return @@has_file unless @@has_file.nil?
+      @@has_file = system("type file > /dev/null 2>&1")
+      unless @@has_file
+        logger.warn <<~EOL.color(:yellow)
+          WARN: The command 'file' is not installed.
+          Unable to check if files are text or binary files as a part of the Terraspace compile processing.
+          Assuming all files are not binary file.
+          Please install the file command to remove this warning message.
+        EOL
+      end
+     @@has_file
     end
   end
 end

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,15 +56,12 @@ class Terraspace::Compiler::Strategy::Tfvar
           "#{tfvars_dir}/#{layer}.rb",
         ]
       end.flatten
-
-      layer_paths.select do |path|
-        File.exist?(path)
-      end
     end
 
     def full_layering
-      # layers is defined in Terraspace::Layering module
-      layers.inject([]) do |sum, layer|
+      # layers defined in Terraspace::Layering module
+      all = layers.map { |layer| layer.sub(/\/$/,'') } # strip trailing slash
+      all.inject([]) do |sum, layer|
         sum += layer_levels(layer) unless layer.nil?
         sum
       end
@@ -129,5 +131,18 @@ 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|
+        logger.debug "    #{pretty_path(path)}" if File.exist?(path) || ENV['TS_SHOW_ALL_LAYERS']
+      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"
@@ -59,24 +56,9 @@ module Terraspace
       end
     end
 
-    # Terraspace.argv provides consistency when terraspace is being called by rspec-terrspace test harness
+    # 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

@@ -5,8 +5,15 @@ class Module
   #    include Provider
   #    # etc
   #
+  # 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>'"
+  #
   def include_dir(dir)
-    calling_file = caller[0].split(':').first # IE: /home/ec2-user/environment/terraspace/lib/terraspace/compiler/dsl/syntax/mod.rb
+    caller_line = caller[0]
+    parts = caller_line.split(':')
+    calling_file = caller_line.match(/^[a-zA-Z]:/) ? parts[1] : parts[0]
     parent_dir = File.dirname(calling_file)
 
     full_dir = "#{parent_dir}/#{dir}"

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.1"
+  VERSION = "1.1.5"
 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.1
+  version: 1.1.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-02 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: