terraspace 2.2.4 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4703e9e81e2f5a450a6f02e790024ea326970a0055c0f351b8c1cc62f4f805c9
-  data.tar.gz: 17496c6eb2902ccf90af84145fa88c532d4ac53afdfebb931260cd887c9080b2
+  metadata.gz: 3bc4c132dc418e5405d199414e9c63cb554f9d86ea8f14234fc6e34794629482
+  data.tar.gz: 8dfe56b38173b3edba54c66b40d09035df2e398407663b61e683c3b0ff198b9a
 SHA512:
-  metadata.gz: fb49cea863d69660e36df977271942aff8801f518c30119697f2ca641c7257b266ec26931e790a1149e710229e5d7f988594067008cdc59584a4fb352f07a028
-  data.tar.gz: 58e52ee22af11bef98996a01662396f3f79b2ed1f05e46a435280e296aa9f2449bfd62f9a58849dd48c5e39c692ca160bebf1a8a8e10678fcf224e83788ffae9
+  metadata.gz: 1f6c2413de415095b0b72a00f9aa7f26da5d712babdd839af4c02d7b7a30376a90716fa40dd2e55f704a0efe8cd408abf398dee35712167c4e05c068ae52ba75
+  data.tar.gz: 4f008a2506d6aa1f3b449564e92dac9a78c6be27bb4b7776000dab5a3444d232f1df4c4ed6ed2bfd9e010810977019049c7c0a780b71d2c20584c96e40859b39

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 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.6] - 2023-05-03
+- [#302](https://github.com/boltops-tools/terraspace/pull/302) update new project generator config/app.rb config.build.copy_modules
+
+## [2.2.5] - 2023-05-02
+- [#301](https://github.com/boltops-tools/terraspace/pull/301) Speed boast copy modules
+
 ## [2.2.4] - 2023-04-19
 - [#293](https://github.com/boltops-tools/terraspace/pull/293) terrraspace import cli help fix
 - [#299](https://github.com/boltops-tools/terraspace/pull/299) fix expansion for the case of ENV var is not set

data/lib/templates/base/project/config/app.rb

@@ -2,10 +2,7 @@
 Terraspace.configure do |config|
   # config.logger.level = :info
 
-  # To enable Terraspace Cloud set config.cloud.org
-  # config.cloud.org = "ORG"          # required: replace with your org. only letters, numbers, underscore and dashes allowed
-  # config.cloud.project = "main"     # optional. main is the default project name. only letters, numbers, underscore and dashes allowed
-
-  # Uncomment to enable Cost Estimation. See: http://terraspace.cloud/docs/cloud/cost-estimation/
-  # config.cloud.cost.enabled = true
+  # copy_modules setting introduced 2.2.5 to speed up terraspace build
+  # See: https://terraspace.cloud/docs/config/reference
+  config.build.copy_modules = true
 end

data/lib/terraspace/app.rb

@@ -43,6 +43,9 @@ module Terraspace
       config.build.default_pass_files = ["/files/"]
       config.build.pass_files = []
       config.build.dependency_words = []
+      # copy_modules = nil  # => Will show a warning and default to true
+      # copy_modules = true # => Will be default in next major version
+      config.build.copy_modules = nil # speed improvement
 
       config.bundle = ActiveSupport::OrderedOptions.new
       config.bundle.logger = ts_logger

data/lib/terraspace/builder.rb

@@ -69,7 +69,7 @@ module Terraspace
       with_each_mod(type_dir) do |mod|
         is_root_module = mod.cache_dir == @mod.cache_dir
         next if is_root_module # handled by build_stacks
-        Compiler::Perform.new(mod).compile
+        Compiler::Perform.new(mod, type_dir: type_dir).compile
       end
     end
 

data/lib/terraspace/compiler/perform.rb

@@ -3,8 +3,9 @@ module Terraspace::Compiler
     include CommandsConcern
     include Basename
 
-    def initialize(mod)
-      @mod = mod
+    def initialize(mod, options={})
+      # options for type_dir
+      @mod, @options = mod, options
     end
 
     def compile
@@ -60,7 +61,7 @@ module Terraspace::Compiler
     end
 
     def compile_mod_file(src_path)
-      content = Strategy::Mod.new(@mod, src_path).run
+      content = Strategy::Mod.new(@mod, src_path, @options).run
       Writer.new(@mod, src_path: src_path).write(content)
     end
 

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

@@ -1,7 +1,8 @@
 module Terraspace::Compiler::Strategy
   class AbstractBase
-    def initialize(mod, src_path)
-      @mod, @src_path = mod, src_path
+    def initialize(mod, src_path, options={})
+      # options for type_dir
+      @mod, @src_path, @options = mod, src_path, options
     end
   end
 end

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

@@ -1,5 +1,7 @@
 module Terraspace::Compiler::Strategy
   class Mod < AbstractBase
+    include Terraspace::Util::Logging
+
     def run
       klass = strategy_class(@src_path)
       strategy = klass.new(@mod, @src_path) # IE: Terraspace::Compiler::Strategy::Mod::Rb.new
@@ -7,6 +9,9 @@ module Terraspace::Compiler::Strategy
     end
 
     def strategy_class(path)
+      # Significant speed improvement
+      return Mod::Pass if copy_modules?
+
       ext = File.extname(path).sub('.','')
       return Mod::Pass if ext.empty? # infinite loop without this
       return Mod::Pass if Terraspace.pass_file?(path) or !text_file?(path)
@@ -14,6 +19,39 @@ module Terraspace::Compiler::Strategy
       "Terraspace::Compiler::Strategy::Mod::#{ext.camelize}".constantize rescue Mod::Pass
     end
 
+    @@copy_modules_warned = false
+    def copy_modules?
+      return false unless @options[:type_dir] == "modules"
+
+      copy_modules = Terraspace.config.build.copy_modules
+      if copy_modules.nil? && @@copy_modules_warned == false
+        logger.info "WARN: config.build.copy_modules is not set. Defaulting to true.".color(:yellow)
+        logger.info <<~EOL
+        The terraspace building behavior is to copy modules from
+        the app/modules folder to the .terraspace-cache for speed.
+        Most do not need app/modules to be compiled.
+        Other files like app/stacks and tfvars files are still compiled.
+        This is a change from previous versions of Terraspace, where
+        all files were compiled.
+
+        You can turn this warning off by setting:
+
+        .terraspace/config.rb
+
+            Terraspace.configure do |config|
+              config.build.copy_modules = true
+            end
+
+        In future Terraspace versions, the default will be true.
+        There will be no warning message, but it will still be configurable.
+        EOL
+        copy_modules = true
+        @@copy_modules_warned = true
+      end
+
+      copy_modules
+    end
+
   private
     def text_file?(filename)
       TextFile.new(filename).check

data/lib/terraspace/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport