terraspace 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfffe08e9ea588c9c01b6e6bfb0c3399047391acf17eac9d74c8d4643ba4722b
-  data.tar.gz: f887084702cab528ef80c786bbacf5ce5e7e7f56938b96bce2cc4c85da8d0549
+  metadata.gz: 7bd8fdab16c165766aaf3ab1d6cb3fdf2011d8ed02ac7bf713bc7dd51de862ea
+  data.tar.gz: b6364f9921e3330096b6a3276d6e35cf5ad26a27d70f911afac3dc33e2c4287e
 SHA512:
-  metadata.gz: fe9ec67940c66eaf3f091b2e9dc7eaec2252ad8e1b134c11faaf4fc03befdb840c2e5222cf6204d879d6b5f0221f506457245910c236785c0caee8c58528352d
-  data.tar.gz: 725d3091bad4ea62ccb7e9fbb49dcb124c235e5ec810278b301fa859ba3c9721f8b616528cb777dd5e17a233b66bc6804ecef605b922364e8634b3e16a4204c9
+  metadata.gz: 2066770e8e6d31dc93986d3684f065f1b9f087e1b266cd01b999ad9f4d878bd497fce0efe656586d7b3fafa94ce859d7c8c4112be034d63a30393e46c0307d9c
+  data.tar.gz: b65e842ae15a0a08f6fa64c440155ac9961f8ed52a6f1ecb4d020806943b2860cb7c7073cd344a2e33ebe5984f2c05abdea2f75e2cb2da4f9323d799920f6ee8

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.2.4]
+- fix version check for some versions of terraform
+
 ## [0.2.3]
 * #37 config.clean_cache option
 

data/lib/terraspace/cli/check_setup.rb

@@ -23,15 +23,21 @@ class Terraspace::CLI
     end
 
     def check_required_version!
-      puts "Terraspace requires Terraform v#{REQUIRED_TERRAFORM_VERSION}.x"
+      puts "Terraspace requires Terraform v#{REQUIRED_TERRAFORM_VERSION}.x and above"
       if ok?
         puts "You're all set!"
       else
-        puts "The installed version of terraform may not work with terraspace. Recommend using terraform v#{REQUIRED_TERRAFORM_VERSION}.x"
-        exit 1
+        puts "The installed version of terraform may not work with terraspace."
+        puts "Recommend using at least terraform v#{REQUIRED_TERRAFORM_VERSION}.x"
+        puts "If you would like to bypass this check. Use TS_VERSION_CHECK=0" unless check_command?
+        exit 1 unless ENV['TS_VERSION_CHECK'] == '0'
       end
     end
 
+    def check_command?
+      ARGV[0] == "check_setup"
+    end
+
     def ok?
       version = terraform_version_message.sub(/.*v/,'') # => 0.12.24
       major, minor, _ = version.split('.')
@@ -47,7 +53,8 @@ class Terraspace::CLI
     end
     memoize :terraform_bin
 
-    # First line contains the Terraform version info:
+    # Sometimes Terraform shows the version info on the first line and sometimes on the bottom line.
+    # Account for that by finding the line.
     #
     #     $ terraform --version
     #     Terraform v0.12.24
@@ -56,7 +63,7 @@ class Terraspace::CLI
     #     is 0.12.26. You can update by downloading from https://www.terraform.io/downloads.html
     #
     def terraform_version_message
-      `terraform --version`.split("\n").first.strip
+      `terraform --version`.split("\n").find { |l| l =~ /^Terraform / }.strip
     end
     memoize :terraform_version_message
 

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport