terraspace 1.0.0 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bd234dcdf6144ab75b3dd1a0c462500a1dd3acd630a2cf9bf7b45b9454c8d8b
-  data.tar.gz: ed32cdf8d20fa2d36b820703d795cc592cf475ae61803a28534786eab12c1fa7
+  metadata.gz: f265061c3973d32dcbea50e12b291ee22041dc2e5bc2cf2521907dd4d74b0703
+  data.tar.gz: 97e6064b47fe37f11660fe05512e1750b23f96cd7bc7ea1bef0aa512884922de
 SHA512:
-  metadata.gz: 03a5562ca555795061fad7f2aea07645994099417a7f367df3c37a1dd7749b38530a2a3caa6ca05eac12c853db587a84df0370473728268a96f24ffb713ac20b
-  data.tar.gz: 6b16be5fbc3b1a3f3a1a792314996a942dcf87ce458abb0ac2a13a7bb8dacc73827c3e04387102b65719dfc57c80df97e8353f73b9705ab825d43e1ebd4548ab
+  metadata.gz: bb0ccae4efe36fae839a755561e9b6829b998c4ec653f7a9a24c8a67a6e9da9ff9e5b81ad1134018edceed75b5859e12cce280819e2792a203da7a65f4997087
+  data.tar.gz: '0269f857a01274f4c9b64b051c724fff030582e2d62b9222da04ae0828e7770160645a4dee01a0a0c791921197d08ce87f420e5fa24678e961e76fb267c9377b'

data/CHANGELOG.md

@@ -3,6 +3,18 @@
 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.0.4] - 2022-01-21
+- [#193](https://github.com/boltops-tools/terraspace/pull/193) improve all include_stacks and exclude_stacks option
+
+## [1.0.3] - 2022-01-20
+- [#192](https://github.com/boltops-tools/terraspace/pull/192) run super-early boot hooks before dotenv load
+
+## [1.0.2] - 2022-01-17
+- [#190](https://github.com/boltops-tools/terraspace/pull/190) update terraspace-bundler gem depedency to 0.5.0
+
+## [1.0.1] - 2022-01-15
+- [#189](https://github.com/boltops-tools/terraspace/pull/189) dotenv support
+
 ## [1.0.0] - 2022-01-08
 Highlights:
 - Non-cloud provider support

data/lib/templates/base/project/.gitignore

@@ -13,6 +13,7 @@ terraform.tfvars
 # Common ruby files
 *.gem
 *.rbc
+.env*
 .idea
 /.bundle
 /.config

data/lib/terraspace/booter.rb

@@ -2,6 +2,7 @@ module Terraspace
   module Booter
     def boot
       run_hooks
+      Dotenv.new.load!
       Terraspace::Bundle.require # load plugins
       load_plugin_default_configs
       Terraspace::App::Inits.run_all

data/lib/terraspace/compiler/select.rb

@@ -1,28 +1,84 @@
 module Terraspace::Compiler
   class Select
+    include Terraspace::Util::Logging
+
     def initialize(path)
       @path = path
       @stack_name = extract_stack_name(path)
     end
 
     def selected?
-      all = Terraspace.config.all
-      # Key difference between include_stacks vs all.include_stacks option is that
-      # the option can be nil. The local variable is guaranteed to be an Array.
-      # This simplifies the logic.
-      include_stacks = all.include_stacks || []
-      ignore_stacks  = all.ignore_stacks  || []
-
-      if all.include_stacks.nil?
-        !ignore_stacks.include?(@stack_name)
+      ignore_stacks_deprecation_warning
+      if include_stacks.nil? && exclude_stacks.nil?
+        true
+      elsif include_stacks.nil?
+        !exclude_stacks.include?(@stack_name)
+      elsif exclude_stacks.nil?
+        include_stacks.include?(@stack_name)
       else
-        stacks = include_stacks - ignore_stacks
+        stacks = include_stacks - exclude_stacks
         stacks.include?(@stack_name)
       end
     end
 
+    def include_stacks
+      include_option(:include_stacks)
+    end
+
+    def exclude_stacks
+      include_option(:exclude_stacks)
+    end
+
+    def include_option(name)
+      option = all[name]  # IE: include_stacks or exclude_stacks
+      option ||= all[:ignore_stacks] if name == :exclude_stacks
+      case option
+      when nil
+        return nil
+      when Array
+        return option
+      when -> (c) { c.respond_to?(:public_instance_methods) && c.public_instance_methods.include?(:call) }
+        object= option.new
+      when -> (c) { c.respond_to?(:call) }
+        object = option
+      else
+        raise "Invalid option for config.all.#{name}"
+      end
+
+      if object
+        result = object.call(@stack_name)
+        unless result.is_a?(Array) || result.is_a?(NilClass)
+          message = "ERROR: The config.all.#{name} needs to return an Array or nil"
+          logger.info message.color(:yellow)
+          logger.info <<~EOL
+            The config.all.#{name} when assigned a class, object, or proc must implement
+            the call method and return an Array or nil.
+            The current return value is a #{result.class}
+          EOL
+          raise message
+        end
+      end
+      result
+    end
+
+  private
+    def all
+      Terraspace.config.all
+    end
+
     def extract_stack_name(path)
       path.sub(%r{.*(app|vendor)/stacks/}, '')
     end
+
+    @@ignore_stacks_deprecation_warning = nil
+    def ignore_stacks_deprecation_warning
+      return unless all.ignore_stacks
+      return if @@ignore_stacks_deprecation_warning
+      puts <<~EOL.color(:yellow)
+        DEPRECATED:  config.all.ignore_stacks
+        Instead use: config.all.exclude_stacks
+      EOL
+      @@ignore_stacks_deprecation_warning = true
+    end
   end
 end

data/lib/terraspace/dotenv.rb

@@ -0,0 +1,25 @@
+require 'dotenv'
+
+module Terraspace
+  class Dotenv
+    def load!
+      ::Dotenv.load(*files)
+    end
+
+    # dotenv files with the following precedence:
+    #
+    # - .env.dev.local - Highest precedence
+    # - .env.dev
+    # - .env.local
+    # - .env - Lowest precedence
+    #
+    def files
+      [
+        ".env.#{Terraspace.env}.local",
+        ".env.#{Terraspace.env}",
+        ".env.local",
+        ".env",
+      ].compact
+    end
+  end
+end

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "1.0.0"
+  VERSION = "1.0.4"
 end

data/terraspace.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bundler"
   spec.add_dependency "cli-format"
   spec.add_dependency "deep_merge"
+  spec.add_dependency "dotenv"
   spec.add_dependency "dsl_evaluator"
   spec.add_dependency "eventmachine-tail"
   spec.add_dependency "graph"
@@ -30,13 +31,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rainbow"
   spec.add_dependency "render_me_pretty"
   spec.add_dependency "rexml"
-  spec.add_dependency "terraspace-bundler", "~> 0.4.4"
+  spec.add_dependency "terraspace-bundler", ">= 0.5.0"
   spec.add_dependency "thor"
   spec.add_dependency "tty-tree"
   spec.add_dependency "zeitwerk"
 
   # core baseline plugins
-  spec.add_dependency "rspec-terraspace", "~> 0.3.0"
+  spec.add_dependency "rspec-terraspace", ">= 0.3.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dsl_evaluator
   requirement: !ruby/object:Gem::Requirement
@@ -182,16 +196,16 @@ dependencies:
   name: terraspace-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -238,16 +252,16 @@ dependencies:
   name: rspec-terraspace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -635,6 +649,7 @@ files:
 - lib/terraspace/dependency/helper/output.rb
 - lib/terraspace/dependency/node.rb
 - lib/terraspace/dependency/registry.rb
+- lib/terraspace/dotenv.rb
 - lib/terraspace/ext.rb
 - lib/terraspace/ext/bundler.rb
 - lib/terraspace/ext/core/module.rb