terraspace 0.6.19 → 0.6.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fc510d1165404c449bcc9e3fe0af371d979aa5babc28e8531097f3ccd50c6eb
-  data.tar.gz: 95a69d72a293c58ff9435a162dbb20383dc8ee6dea8e681a5b8ab672cf90bbd2
+  metadata.gz: d9ff791ca3b7b100a8f60caa7a8f8a81e97d45e10317b39643b924cfad6696f6
+  data.tar.gz: bd57524893eb19164b38bb8e4495a1577e5784094dd03329565c99200551fe56
 SHA512:
-  metadata.gz: c143d467df63cffe80862bec7ed0d06bc6edec50485b8a885d04a19f9f8d5a7a699dd494ff4daf074e303b50a1fc0f788340e6cd00bb42c875c834a05262b864
-  data.tar.gz: 90e43491736d1f3e43081d51bd9b0100a1641a3aaed71bac5eff71492a19298d0e56da762f79c07ff679e420509ce37e638974a643cc0633cde581c860e051fb
+  metadata.gz: 80ea2622c03f16a05450b2616a32988c128146cb91319e48bacba6a6ee04c2c6eeae9d006d2f446a5ab91bc1f44fc40e4cdef7ad25ca1b2ff8b42fc8c1703b72
+  data.tar.gz: 6c6ac8a06236ce3dfd827028f1681da5e9f7197c564c85cbf9d9188dd8940e9cdfe810663d33c505b01d05d68fa74fc6be475fb6ea329a21971a384bc094c261

data/CHANGELOG.md

@@ -3,6 +3,20 @@
 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.
 
+## [0.6.23] - 2021-12-18
+- [#167](https://github.com/boltops-tools/terraspace/pull/167) require active_support properly
+
+## [0.6.22] - 2021-12-16
+- [#165](https://github.com/boltops-tools/terraspace/pull/165) check if file command is installed
+- [#166](https://github.com/boltops-tools/terraspace/pull/166) add bundler as a dependency
+
+## [0.6.21] - 2021-12-16
+- [#164](https://github.com/boltops-tools/terraspace/pull/164) Use Activesupport All
+
+## [0.6.20] - 2021-12-14
+- [#162](https://github.com/boltops-tools/terraspace/pull/162) expand_string? interface method so plugins can decide whether or not to expand the string
+- improve seed generator column spacing
+
 ## [0.6.19] - 2021-11-24
 - [#149](https://github.com/boltops-tools/terraspace/pull/149) change default fallback mod strategy to Mod::Tf instead of Mod::Pass for ERB support
 - [#152](https://github.com/boltops-tools/terraspace/pull/152) fix naming typo in cli help

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

@@ -0,0 +1,35 @@
+require "open3"
+
+class Terraspace::Compiler::Strategy::Mod
+  class TextFile
+    include Terraspace::Util::Logging
+
+    def initialize(filename)
+      @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.
+
+          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
+    def file_installed?
+      system("type file > /dev/null 2>&1")
+    end
+  end
+end

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

@@ -1,5 +1,3 @@
-require "open3"
-
 module Terraspace::Compiler::Strategy
   class Mod < AbstractBase
     def run
@@ -16,10 +14,9 @@ module Terraspace::Compiler::Strategy
       "Terraspace::Compiler::Strategy::Mod::#{ext.camelize}".constantize rescue Mod::Pass
     end
 
-    # Thanks: https://stackoverflow.com/questions/2355866/ruby-how-to-determine-if-file-being-read-is-binary-or-text
+  private
     def text_file?(filename)
-      file_type, status = Open3.capture2e("file", filename)
-      status.success? && file_type.include?("text")
+      TextFile.new(filename).check
     end
   end
 end

data/lib/terraspace/plugin/expander/interface.rb

@@ -34,6 +34,7 @@ module Terraspace::Plugin::Expander
     #
     def expansion(string)
       return string unless string.is_a?(String) # in case of nil
+      return string unless expand_string?(string)
 
       string = string.dup
       vars = string.scan(/:\w+/) # => [":ENV", ":BUILD_DIR"]
@@ -43,6 +44,11 @@ module Terraspace::Plugin::Expander
       strip(string)
     end
 
+    # interface method
+    def expand_string?(string)
+      true
+    end
+
     # remove leading and trailing common separators.
     #
     # This is useful for when INSTANCE is not set.

data/lib/terraspace/seeder/content.rb

@@ -49,7 +49,7 @@ class Terraspace::Seeder
     end
 
     def rpad
-      all_vars.keys.map(&:size).max
+      all_vars.keys.map(&:size).max + 2
     end
     memoize :rpad
 

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.6.19"
+  VERSION = "0.6.23"
 end

data/lib/terraspace.rb

@@ -5,6 +5,7 @@ $:.unshift(File.expand_path("../", __FILE__))
 require "terraspace/autoloader"
 Terraspace::Autoloader.setup
 
+require "active_support"
 require "active_support/concern"
 require "active_support/core_ext/class"
 require "active_support/core_ext/hash"

data/spec/terraspace/seeder/content_spec.rb

@@ -37,8 +37,8 @@ describe Terraspace::Seeder::Content do
       result = content.build
       expected =<<~EOL
         # Required variables:
-        name    = "string"
-        azs     = [...] # list(string)
+        name      = "string"
+        azs       = [...] # list(string)
 
         # Optional variables:
         # project = "project-name"

data/terraspace.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
+  spec.add_dependency "bundler"
   spec.add_dependency "cli-format"
   spec.add_dependency "deep_merge"
   spec.add_dependency "dsl_evaluator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.6.19
+  version: 0.6.23
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2021-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: cli-format
   requirement: !ruby/object:Gem::Requirement
@@ -614,6 +628,7 @@ files:
 - lib/terraspace/compiler/strategy/mod/base.rb
 - lib/terraspace/compiler/strategy/mod/pass.rb
 - lib/terraspace/compiler/strategy/mod/rb.rb
+- lib/terraspace/compiler/strategy/mod/text_file.rb
 - lib/terraspace/compiler/strategy/mod/tf.rb
 - lib/terraspace/compiler/strategy/mod/tfvars.rb
 - lib/terraspace/compiler/strategy/tfvar.rb
@@ -852,7 +867,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: 'Terraspace: The Terraspace Framework'