terraspace 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43880b8fc93060a328decf3fa5ac770253341995ec800e6d38b86f7696d5912
-  data.tar.gz: 9337cb32f020b54e5693aa2dde06960c22a8fd8755ff55bf1ebb0ebf4cd2fccf
+  metadata.gz: f6a2a88fa818f4181306424fffdba0416c2df409e464b632ea941e761b8ed275
+  data.tar.gz: eaf2ce61be5ff4b72f01e6f4ca9da7eb4ee573f42e5865319a90630659544c2e
 SHA512:
-  metadata.gz: '09047e18b86cf30f2a013c7c20f864ef3540120f7f70c12bae854f80f60f952a84e109811ab59aa078e331c0fc34134c9f84dd85f73d7dab5c08ee2208454c17'
-  data.tar.gz: 69eb21940249f6566de22d88dd33165d4265aed490deafc81659ac59d04f7c9b1436ae4b2cbdc09e74f6279e82fdbaa620001610fd2022584dcc599e23bda10e
+  metadata.gz: b6b38903334e7855e19517ec79059dd9887d85aa44819ed811af0deedaae8fbed5d8502546e675302c786604a7c110313a27b312a5489cff26071a9c784e8bd0
+  data.tar.gz: f117135d46f25c238e89a459666ade7fe4ef944726abae05fe9af4e6101e42198d5f91d39e06f42bfbb20f987f172ac4b677d08e3bf66c84272c0746751fdcfe

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 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.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
+- fix terraspace setup check when terraform is not installed
+
 ## [0.5.1] - 2020-11-17
 - [#56](https://github.com/boltops-tools/terraspace/pull/56) fix arg and hook generators
 - fix ci build

data/lib/terraspace/autoloader.rb

@@ -1,7 +1,5 @@
-if File.exist?("config/app.rb")
-  require "terraspace/bundle"
-  Terraspace::Bundle.setup
-end
+require "terraspace/bundle"
+Terraspace::Bundle.setup
 require "zeitwerk"
 
 module Terraspace

data/lib/terraspace/bundle.rb

@@ -8,6 +8,7 @@ module Terraspace
     #
     def setup
       return unless gemfile?
+      return unless terraspace_project?
       Kernel.require "bundler/setup"
       Bundler.setup # Same as Bundler.setup(:default)
     rescue LoadError => e
@@ -16,12 +17,17 @@ module Terraspace
 
     def require
       return unless gemfile?
+      return unless terraspace_project?
       Kernel.require "bundler/setup"
       Bundler.require(*bundler_groups)
     rescue LoadError => e
       handle_error(e)
     end
 
+    def terraspace_project?
+      File.exist?("config/app.rb")
+    end
+
     def handle_error(e)
       puts e.message
       return if e.message.include?("already activated")

data/lib/terraspace/cli/check_setup.rb

@@ -39,6 +39,11 @@ class Terraspace::CLI
     end
 
     def ok?
+      unless terraform_bin
+        puts "Terraform not installed. Unable to detect a terraform command. Please double check that terraform is installed."
+        exit 1
+      end
+
       version = terraform_version_message.sub(/.*v/,'') # => 0.12.24
       unless version.match(/\d+\.\d+\.\d+/) # just parse did not find the version number
         puts "WARN: Unable to get the terraform version".color(:yellow)

data/lib/terraspace/command.rb

@@ -30,6 +30,7 @@ module Terraspace
       include Terraspace::Util::Logging
 
       def dispatch(m, args, options, config)
+        check_standalone_install!
         check_project!(args.first)
 
         # Allow calling for help via:
@@ -58,8 +59,41 @@ module Terraspace
         super
       end
 
+      def check_standalone_install!
+        return unless opt?
+        version_manager = "rvm" if rvm?
+        version_manager = "rbenv" if rbenv?
+        if rbenv? || rvm?
+          puts <<~EOL.color(:yellow)
+            WARN: It looks like a standalone Terraspace install and #{version_manager} is also in use.
+            Different gems from the standalone Terraspace install and #{version_manager} can cause all kinds of trouble.
+            Please install Terraspace as a gem instead and remove the standalone Terraspace /opt/terraspace installation.
+            See: https://terraspace.cloud/docs/install/gem/
+          EOL
+        end
+      end
+
+      def opt?
+        paths = ENV['PATH'].split(':')
+        opt = paths.detect { |p| p.include?('/opt/terraspace') }
+        opt && File.exist?('/opt/terraspace')
+      end
+
+      def rvm?
+        paths = ENV['PATH'].split(':')
+        rvm = paths.detect { |p| p.include?('/rvm/') || p.include?('/.rvm/') }
+        rvm && system("type rvm > /dev/null 2>&1")
+      end
+
+      def rbenv?
+        paths = ENV['PATH'].split(':')
+        rbenv = paths.detect { |p| p.include?('/rbenv/') || p.include?('/.rbenv/') }
+        rbenv && system("type rbenv > /dev/null 2>&1")
+      end
+
       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 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)

data/lib/terraspace/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport