terraspace 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c07e843df9e61e62be834feba56f4d5fa058f3dbb130ed7e15edca66ef23e22d
-  data.tar.gz: a7d7c3946e2485ccb369a5d76d413118aed14592750880a48990ca83cdca5bca
+  metadata.gz: 6ad5587827bc4c9dcbae4cd2a42904e69ccf930bfa1a04c7e65d753178ff94f7
+  data.tar.gz: 122e5fb3135447e92bf12e7f5947ee665f5f77e024e6aea5499ad63a184eceea
 SHA512:
-  metadata.gz: 026aa5128ce2bea7deb3e5b0fdb6e99c7cf50297c20f5292bbe6896dabb0ba995e62ecd14526ea2ea7e8e1a4be3895e29021620a89b26df49ad34ee0b95ffd1d
-  data.tar.gz: c2df058d2fe9848834fc4e166c1382ccb0e782170fb52f8fd264e4e948a1032916cc9d77662eac1969f4d2101e66b3655e07d944b217e5749581ac0d3ec04916
+  metadata.gz: 0b6a0f432037f072acad01d60efb86d6e06314cea7ff75556dfb0de4ec077fe2479b215867702c8c6a615358a17c4568f30cfcf4a45011233f03b9c595a258ec
+  data.tar.gz: ed255135382340d2a44cd04f863f8fc9d8bb6562b413e04024a13f6e4bb31c2b19f837dbb7c05ee1220210ee4bf0bd6ce4a5d4e5628fb23eab61dd8a338c6b5b

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 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.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/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

@@ -58,8 +58,9 @@ class Terraspace::Compiler::Strategy::Tfvar
     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

data/lib/terraspace/core.rb

@@ -59,7 +59,7 @@ 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

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport