terraspace 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6a2a88fa818f4181306424fffdba0416c2df409e464b632ea941e761b8ed275
-  data.tar.gz: eaf2ce61be5ff4b72f01e6f4ca9da7eb4ee573f42e5865319a90630659544c2e
+  metadata.gz: 3046cd50c2a592878bc84dce2fdf21f00fbcf93e4a4fd47a57fe59fbab87adf5
+  data.tar.gz: 154ec374284a4758b3e45111653e67d7540ad0ed02661cabd2b5dfa1f79ad35c
 SHA512:
-  metadata.gz: b6b38903334e7855e19517ec79059dd9887d85aa44819ed811af0deedaae8fbed5d8502546e675302c786604a7c110313a27b312a5489cff26071a9c784e8bd0
-  data.tar.gz: f117135d46f25c238e89a459666ade7fe4ef944726abae05fe9af4e6101e42198d5f91d39e06f42bfbb20f987f172ac4b677d08e3bf66c84272c0746751fdcfe
+  metadata.gz: ab3def1c9c10a952aef42cbea27de2c645627c69af0ae452baceef36c15ed6f87abd43ab2cda16b0d1f76bc0080a50eb75d802ef6f540e77c13a7796a46ba78f
+  data.tar.gz: 2b6e9314e91cd27ef3e19e3a827006dbc081ae8a7ad0d38da445482bc503f978d38575470836f91b1a9a10799fb707d8dacb895818b94a513e46a64f14cbf1da

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.5.3] - 2020-11-27
+- [#60](https://github.com/boltops-tools/terraspace/pull/60) fix terraspace check_setup, use type and allow to run outside project
+- improve terraform is not installed message
+
 ## [0.5.2] - 2020-11-27
 - [#59](https://github.com/boltops-tools/terraspace/pull/59) only run bundler/setup within terraspace project and check standalone install
 - fix terraspace help

data/lib/terraspace/cli/check_setup.rb

@@ -17,7 +17,7 @@ class Terraspace::CLI
         puts "Detected #{terraform_version_message}"
         check_required_version!
       else
-        puts "Terraform not installed. Unable to detect a terraform command. Please double check that terraform is installed."
+        puts terraform_is_not_installed
         exit 1
       end
     end
@@ -38,9 +38,16 @@ class Terraspace::CLI
       ARGV[0] == "check_setup"
     end
 
+    def terraform_is_not_installed
+      <<~EOL
+        Terraform not installed. Unable to detect a terraform command. Please double check that terraform is installed.
+        See: https://terraform.cloud/docs/install/terraform/
+      EOL
+    end
+
     def ok?
       unless terraform_bin
-        puts "Terraform not installed. Unable to detect a terraform command. Please double check that terraform is installed."
+        puts terraform_is_not_installed
         exit 1
       end
 
@@ -57,7 +64,8 @@ class Terraspace::CLI
     end
 
     def terraform_bin
-      bin_path = `which terraform 2>&1`.strip
+      out = `type terraform 2>&1`.strip
+      bin_path = out.match(/is (.*)/)[1]
       bin_path if $?.success?
     end
     memoize :terraform_bin

data/lib/terraspace/command.rb

@@ -94,7 +94,7 @@ module Terraspace
       def check_project!(command_name)
         return if subcommand?
         return if command_name.nil?
-        return if %w[-h -v completion completion_script help new test version].include?(command_name)
+        return if %w[-h -v check_setup completion completion_script help new test version].include?(command_name)
         return if File.exist?("#{Terraspace.root}/config/app.rb")
         logger.error "ERROR: It doesnt look like this is a terraspace project. Are you sure you are in a terraspace project?".color(:red)
         ENV['TS_TEST'] ? raise : exit(1)

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Tung Nguyen