terraspace 2.2.6 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bc4c132dc418e5405d199414e9c63cb554f9d86ea8f14234fc6e34794629482
-  data.tar.gz: 8dfe56b38173b3edba54c66b40d09035df2e398407663b61e683c3b0ff198b9a
+  metadata.gz: 5477cf33cd5e864e5b7117cdc129d4aaa96a9f6ff9255093e9499180e67068f8
+  data.tar.gz: 3dc0b9113b44f7e0d10019aeb22898b8045f8de0be3c60a756d9bda588847184
 SHA512:
-  metadata.gz: 1f6c2413de415095b0b72a00f9aa7f26da5d712babdd839af4c02d7b7a30376a90716fa40dd2e55f704a0efe8cd408abf398dee35712167c4e05c068ae52ba75
-  data.tar.gz: 4f008a2506d6aa1f3b449564e92dac9a78c6be27bb4b7776000dab5a3444d232f1df4c4ed6ed2bfd9e010810977019049c7c0a780b71d2c20584c96e40859b39
+  metadata.gz: 15da8006c07825c64446444c58e2efa4c22baeeda85da0abcf5d2d54e16e35e9929c6a636885a969fc12a9918ff74df90b34f88147141f0bc53c170061be0964
+  data.tar.gz: 499ebbabe6e904e6d3800c7d18b8b830c1130aee5faf07a317159d63e63eeeb96bf9483416efcf59a9d8753f5b0f09648b1595da56591751ce389d6d7710c3d7

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 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.
 
+## [2.2.8] - 2023-06-27
+- Fix exit status for fmt
+
+## [2.2.7] - 2023-06-07
+- [#308](https://github.com/boltops-tools/terraspace/pull/308) feat: add support for exit code in terraspace fmt command
+- [#310](https://github.com/boltops-tools/terraspace/pull/310) improve terraspace seed for map(string) variables
+- [#311](https://github.com/boltops-tools/terraspace/pull/311) erb processing for rb files in modules folder for dsl
+- [#312](https://github.com/boltops-tools/terraspace/pull/312) refactor terraspace new project Gemfile.tt
+- [#313](https://github.com/boltops-tools/terraspace/pull/313) cleanup terraspace fmt exit status return
+
 ## [2.2.6] - 2023-05-03
 - [#302](https://github.com/boltops-tools/terraspace/pull/302) update new project generator config/app.rb config.build.copy_modules
 

data/lib/templates/base/project/Gemfile.tt

@@ -1,12 +1,8 @@
 source "https://rubygems.org"
 
-<%=
-build_gemfile(
-  "terraspace",
-  "rspec-terraspace",
-  plugin_gem_name,
-)
-%>
+gem "terraspace", "~> <%= terraspace_minor_version %>"
+gem "<%= plugin_gem_name %>"
+gem "rspec-terraspace"
 
 # Uncomment the ci and vcs provider you wish to use. Should use both ci and vcs gem
 # Docs: https://terraspace.cloud/docs/ci/

data/lib/terraspace/cli/fmt/runner.rb

@@ -10,14 +10,17 @@ class Terraspace::CLI::Fmt
 
     def format!
       logger.info @dir.color(:green)
+
+      exit_status = nil
       Dir.chdir(@dir) do
         skip_rename
         begin
-          terraform_fmt
+          exit_status = terraform_fmt
         ensure
           restore_rename
         end
       end
+      exit_status
     end
 
     def skip_rename
@@ -35,9 +38,11 @@ class Terraspace::CLI::Fmt
     def sh(command)
       logger.debug("=> #{command}")
       success = system(command)
-      return if success
-      logger.info "WARN: There were some errors running terraform fmt for files in #{@dir}:".color(:yellow)
-      logger.info "The errors are shown above"
+      unless success
+        logger.info "WARN: There were some errors running terraform fmt for files in #{@dir}:".color(:yellow)
+        logger.info "The errors are shown above"
+      end
+      $?.exitstatus
     end
 
     def restore_rename

data/lib/terraspace/cli/fmt.rb

@@ -8,11 +8,14 @@ class Terraspace::CLI
       @mod_name = options[:mod]
     end
 
+    @@exit_status = 0
     def run
       logger.info "Formating terraform files"
       dirs.each do |dir|
-        format(dir)
+        exit_status = format(dir)
+        @@exit_status = exit_status if exit_status != 0
       end
+      exit(@@exit_status)
     end
 
     def format(dir)

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

@@ -3,21 +3,9 @@ class Terraspace::CLI::New
     include Helpers::PluginGem
 
   private
-    def build_gemfile(*list)
-      lines = []
-      list.compact.each do |name|
-        lines << gem_line(name)
-      end
-      lines.join("\n")
-    end
-
-    def gem_line(name)
-      if name == "terraspace"
-        major_version = Terraspace::VERSION.split('.').first
-        %Q|gem "#{name}", '~> #{major_version}'|
-      else
-        %Q|gem "#{name}"|
-      end
+    def terraspace_minor_version
+      major, minor, _ = Terraspace::VERSION.split('.')
+      [major, minor, '0'].join('.')
     end
   end
 end

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

@@ -10,7 +10,7 @@ module Terraspace::Compiler::Strategy
 
     def strategy_class(path)
       # Significant speed improvement
-      return Mod::Pass if copy_modules?
+      return Mod::Pass if copy_modules?(path)
 
       ext = File.extname(path).sub('.','')
       return Mod::Pass if ext.empty? # infinite loop without this
@@ -20,7 +20,8 @@ module Terraspace::Compiler::Strategy
     end
 
     @@copy_modules_warned = false
-    def copy_modules?
+    def copy_modules?(path)
+      return false if path.include?("/modules/") && path.ends_with?(".rb") # For DSL
       return false unless @options[:type_dir] == "modules"
 
       copy_modules = Terraspace.config.build.copy_modules

data/lib/terraspace/seeder/content.rb

@@ -39,7 +39,9 @@ class Terraspace::Seeder
     end
 
     def escape(type, value)
-      if type&.include?('(') # complex type
+      if type == "map(string)"
+        "{...} # #{type}"
+      elsif type&.include?('(') # complex type
         "[...] # #{type}"
       elsif %w[null any true false].include?(value)
         value # no quotes

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "2.2.6"
+  VERSION = "2.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.8
 platform: ruby
 authors:
 - Tung Nguyen
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -346,7 +346,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - tung@boltops.com
 executables:
@@ -950,7 +950,7 @@ 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:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -965,8 +965,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: 'Terraspace: The Terraspace Framework'
 test_files: