terraspace 0.5.6 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e58f700f76a198ca29730aa7f8dfa70a009dd8fefc11e49c9796d060f01d6e1
-  data.tar.gz: 81b4dfd9f3280335608feebcdace38ebc97f9dd2739272e10f7482feb95ed2f7
+  metadata.gz: 7ab8d16e8890ccbd14785cdc20245e47a126593337d0330bfecbb902336a32d8
+  data.tar.gz: 51f9b735befd7ea059ff6541414e3f80631a9bc5b511fc69f4e1f489e6f9a72e
 SHA512:
-  metadata.gz: 71c1f99ec511b8f846d19978ba614e18801a267badc7df6d16b54113f7b9a9aafe959b3035af06e4efd46c6d2735af597532540edd849791b9b62f51f69087af
-  data.tar.gz: afd0feb506627ce32f7bd986db7c4b41a995ddf744a1be9198a56a6928d2a1642b249925622c1de83eee65fd49307672a520aea4f446d0fadb9afb95c40c064d
+  metadata.gz: b3d6fca3b2b9b2fcdabd48d6b093e7a3dcfafe4f53a482dc7fffb3a001bca89a743b294b12ccc92e2cb7010799e0d147e402406afaa93de48149d94fd9c894f3
+  data.tar.gz: 5a36c2d3d9f847989f639829be9fae0b5b1a9a6e48f636478b1560a94a45fca2ff74db5800ebaa8ed97977c2b5e83a72a99292f8737c6737ebabd1ba748bd026

data/.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 Please fill out one of the templates on https://github.com/boltops-tools/terraspace/issues/new/choose
 
-If you want to ask a question please do so on sites like StackOverflow.
+If you want to ask a question please do so in the Terraspace category in the BoltOps Community forum: https://community.boltops.com
 
-To be sensitive to everyone's time, we may close issues asking questions without comment. Here are some additional options also https://terraspace.cloud/support/ 👌
+To be sensitive to everyone's time, we may close issues asking questions without comment. Posting your questions in the Terraspace community forum is the best place. It also benefits others by making the questions easier to find. Here are some additional options also https://terraspace.cloud/support/ 👌
 
 Thank you!

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -15,7 +15,8 @@ issue may be closed without comment. If you repeatedly fail to provide enough
 details, you may be blocked from ever submitting issues to Terraspace again.
 Please use your best judgment. 👍
 
-If you are unsure this is a bug in Terraspace, please consider asking your question at sites like StackOverflow.
+If you are unsure this is a bug in Terraspace, please consider asking your question at:
+https://community.boltops.com
 
 Thanks!
 -->
@@ -26,8 +27,8 @@ Thanks!
 Make sure that you've done all of these.  To mark a checkbox done, replace [ ] with [x]. Or after you create the issue you can click the checkbox.
 -->
 
-- [ ] Upgrade Terraspace: Are you using the latest version of Terraspace? This allows Terraspace to fix issues fast.
-- [ ] Reproducibility: Are you reporting a bug others will be able to reproduce and not asking a question. If you're unsure or want to ask a question, do so on StackOverflow.
+- [ ] Upgrade Terraspace: Are you using the latest version of Terraspace? This allows Terraspace to fix issues fast. There's an Upgrading Guide: https://terraspace.cloud/docs/misc/upgrading/
+- [ ] Reproducibility: Are you reporting a bug others will be able to reproduce and not asking a question. If you're unsure or want to ask a question, do so on https://community.boltops.com
 - [ ] Code sample: Have you put together a code sample to reproduce the issue and make it available?  Code samples help speed up fixes dramatically. If it's an easily reproducible issue, then code samples are not needed. If you're unsure, please include a code sample.
 
 ## My Environment

data/.github/ISSUE_TEMPLATE/question.md

@@ -7,8 +7,8 @@ assignees: ''
 
 ---
 
-The Terraspace issue tracker IS NOT for usage questions! Please post your question at sites like StackOverflow.
+The Terraspace issue tracker IS NOT for usage questions! Please post your question on our dedicated forum at https://community.boltops.com
 
 To be sensitive to everyone's time, we may close issues asking questions without comment. If you repeatedly post questions in the issues tracker, you may be blocked from ever submitting issues to Terraspace again. Please use your best judgment. 👍
 
-Here are some additional options also https://terraspace.cloud/support/ 😁
+Posting your questions in the Terraspace community forum benefits others by grouping questions in a dedicated place. Here are some additional options also https://terraspace.cloud/support/ 😁

data/CHANGELOG.md

@@ -3,6 +3,23 @@
 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.11] - 2021-02-11
+- [#76](https://github.com/boltops-tools/terraspace/pull/76) dont use auto generated plan when both yes and plan options used
+- fix plan path when 2 stacks of same name run at the same time
+
+## [0.5.10] - 2020-12-11
+- [#69](https://github.com/boltops-tools/terraspace/pull/69) require singleton earlier
+
+## [0.5.9] - 2020-12-11
+- [#68](https://github.com/boltops-tools/terraspace/pull/68) require singleton
+- fix graphviz check for format text, improve graphviz install help message
+
+## [0.5.8] - 2020-12-04
+- [#67](https://github.com/boltops-tools/terraspace/pull/67) fix find placeholder stack so config/terraform only builds for stacks
+
+## [0.5.7] - 2020-12-02
+- [#64](https://github.com/boltops-tools/terraspace/pull/64) fix completion_script
+
 ## [0.5.6] - 2020-11-30
 - [#61](https://github.com/boltops-tools/terraspace/pull/61) allow envs and regions check feature
 - fix terraspace build before hook

data/lib/terraspace.rb

@@ -19,6 +19,7 @@ require "memoist"
 require "rainbow/ext/string"
 require "render_me_pretty"
 require "set"
+require "singleton"
 require "terraspace/ext"
 require "terraspace/version"
 

data/lib/terraspace/all/grapher.rb

@@ -109,13 +109,12 @@ module Terraspace::All
 
     # Check if Graphiz is installed and prints a user friendly message if it is not installed.
     def check_graphviz!
+      return if @options[:format] == 'text'
+
       installed = system("type dot > /dev/null 2>&1") # dot is a command that is part of the graphviz package
       return if installed
       logger.error "ERROR: It appears that the Graphviz is not installed.  Please install it to use the graph command.".color(:red)
-      if RUBY_PLATFORM =~ /darwin/
-        logger.error "You can install Graphviz with homebrew:"
-        logger.error "    brew install graphviz"
-      end
+      install_instructions
       logger.info <<~EOL
         Also consider:
 
@@ -125,5 +124,23 @@ module Terraspace::All
       EOL
       exit 1
     end
+
+    def install_instructions
+      installer = if RUBY_PLATFORM =~ /darwin/
+        "brew"
+      elsif system("type yum > /dev/null 2>&1")
+        "yum"
+      elsif system("type apt-get > /dev/null 2>&1")
+        "apt-get"
+      end
+
+      return unless installer
+      logger.error <<~EOL
+        You can install Graphviz with:
+
+            #{installer} install graphviz
+
+      EOL
+    end
   end
 end

data/lib/terraspace/cli/build/placeholder.rb

@@ -18,17 +18,17 @@ module Terraspace::CLI::Build
       mod = @options[:mod]
       if !mod or %w[placeholder].include?(mod)
         logger.info "Building one of the modules to get backend.tf info"
-        mod = find_mod
+        mod = find_stack
       end
       Terraspace::Builder.new(@options.merge(mod: mod, init: false)).run # generate and init
       Terraspace::Mod.new(mod, @options) # mod metadata
     end
 
     # Used by: terraspace build placeholder
-    def find_mod
-      mod_path = Dir.glob("{app,vendor}/{modules,stacks}/*").last
+    def find_stack
+      mod_path = Dir.glob("{app,vendor}/stacks/*").last
       unless mod_path
-        logger.info "No modules or stacks found."
+        logger.info "No stacks found."
         exit 0
       end
       File.basename(mod_path) # mod name

data/lib/terraspace/{completer.rb → cli/completer.rb}

@@ -1,74 +1,69 @@
-=begin
-Code Explanation:
-
-There are 3 types of things to auto-complete:
-
-  1. command: the command itself
-  2. parameters: command parameters.
-  3. options: command options
-
-Here's an example:
-
-  mycli hello name --from me
-
-  * command: hello
-  * parameters: name
-  * option: --from
-
-When command parameters are done processing, the remaining completion words will be options.  We can tell that the command params are completed based on the method arity.
-
-## Arity
-
-For example, say you had a method for a CLI command with the following form:
-
-  ufo scale service count --cluster dev
-
-It's equivalent ruby method:
-
-  scale(service, count) = has an arity of 2
-
-So typing:
-
-  ufo scale service count [TAB] # there are 3 parameters including the "scale" command according to Thor's CLI processing.
-
-So the completion should only show options, something like this:
-
-  --noop --verbose --cluster
-
-## Splat Arguments
-
-When the ruby method has a splat argument, it's arity is negative.  Here are some example methods and their arities.
-
-   ship(service) = 1
-   scale(service, count) = 2
-   ships(*services) = -1
-   foo(example, *rest) = -2
-
-Fortunately, negative and positive arity values are processed the same way. So we take simply take the absolute value of the arity and process it the same.
-
-Here are some test cases, hit TAB after typing the command:
-
-  terraspace completion
-  terraspace completion hello
-  terraspace completion hello name
-  terraspace completion hello name --
-  terraspace completion hello name --noop
-
-  terraspace completion
-  terraspace completion sub:goodbye
-  terraspace completion sub:goodbye name
-
-## Subcommands and Thor::Group Registered Commands
-
-Sometimes the commands are not simple thor commands but are subcommands or Thor::Group commands. A good specific example is the ufo tool.
-
-  * regular command: ufo ship
-  * subcommand: ufo docker
-  * Thor::Group command: ufo init
-
-Auto-completion accounts for each of these type of commands.
-=end
-module Terraspace
+# begin
+# Code Explanation:
+#
+# There are 3 types of things to auto-complete:
+#
+#   1. command: the command itself
+#   2. parameters: command parameters.
+#   3. options: command options
+#
+# Here's an example:
+#
+#   mycli hello name --from me
+#
+#   * command: hello
+#   * parameters: name
+#   * option: --from
+#
+# When command parameters are done processing, the remaining completion words will be options.  We can tell that the command params are completed based on the method arity.
+#
+# ## Arity
+#
+# For example, say you had a method for a CLI command with the following form:
+#
+#   terraspace up STACK
+#
+# It's equivalent ruby method:
+#
+#   up(mod) = has an arity of 1
+#
+# So typing:
+#
+#   terraspace up [TAB] # there is parameter including the "scale" command according to Thor's CLI processing.
+#
+# So the completion should only show options, something like this:
+#
+#   --noop --verbose --cluster
+#
+# ## Splat Arguments
+#
+# When the ruby method has a splat argument, it's arity is negative.  Here are some example methods and their arities.
+#
+#   up(mod) = 1
+#   scale(service, count) = 2
+#   bundle(*args) = -1
+#   foo(example, *rest) = -2
+#
+# Fortunately, negative and positive arity values are processed the same way. So we take simply take the absolute value of the arity and process it the same.
+#
+# Here are some test cases, hit TAB after typing the command:
+#
+#   terraspace completion
+#   terraspace completion up
+#   terraspace completion up name
+#   terraspace completion up name --
+#   terraspace completion up name --noop
+#
+# ## Subcommands and Thor::Group Registered Commands
+#
+# Sometimes the commands are not simple thor commands but are subcommands or Thor::Group commands. A good specific example is the terraspace tool.
+#
+#   * regular command: terraspace up
+#   * subcommand: terraspace all
+#   * Thor::Group command: terraspace new project
+
+# Auto-completion accounts for each of these type of commands.
+class Terraspace::CLI
   class Completer
     def initialize(command_class, *params)
       @params = params
@@ -132,7 +127,6 @@ module Terraspace
 
     def params_completion
       offset = @params.size - 1
-      offset_params = command_params[offset..-1]
       command_params[offset..-1].first
     end
 

data/lib/terraspace/{completer → cli/completer}/script.rb

@@ -1,6 +1,6 @@
-class Terraspace::Completer::Script
+class Terraspace::CLI::Completer::Script
   def self.generate
     bash_script = File.expand_path("script.sh", File.dirname(__FILE__))
-    logger.info "source #{bash_script}"
+    puts "source #{bash_script}"
   end
 end

data/lib/terraspace/cli/up.rb

@@ -1,10 +1,12 @@
+require 'securerandom'
+
 class Terraspace::CLI
   class Up < Base
     include TfcConcern
 
     def run
       build
-      if @options[:yes] && !tfc?
+      if @options[:yes] && !@options[:plan] && !tfc?
         plan
         Commander.new("apply", @options.merge(plan: plan_path)).run
       else
@@ -25,8 +27,8 @@ class Terraspace::CLI
     end
 
     def plan_path
-      @@timestamp ||= Time.now.utc.strftime("%Y%m%d%H%M%S")
-      "#{Terraspace.tmp_root}/plans/#{@mod.name}-#{@@timestamp}.plan"
+      @@random ||= SecureRandom.hex
+      "#{Terraspace.tmp_root}/plans/#{@mod.name}-#{@@random}.plan"
     end
   end
 end

data/lib/terraspace/mod.rb

@@ -19,7 +19,7 @@ module Terraspace
 
     def placeholder(name)
       if name == "placeholder"
-        Terraspace::CLI::Build::Placeholder.new(@options).find_mod
+        Terraspace::CLI::Build::Placeholder.new(@options).find_stack
       else
         name
       end

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.5.6"
+  VERSION = "0.5.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.11
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -481,6 +481,9 @@ files:
 - lib/terraspace/cli/cloud.rb
 - lib/terraspace/cli/cloud/runs.rb
 - lib/terraspace/cli/commander.rb
+- lib/terraspace/cli/completer.rb
+- lib/terraspace/cli/completer/script.rb
+- lib/terraspace/cli/completer/script.sh
 - lib/terraspace/cli/down.rb
 - lib/terraspace/cli/help.rb
 - lib/terraspace/cli/help/all/down.md
@@ -608,9 +611,6 @@ files:
 - lib/terraspace/compiler/strategy/tfvar/rb.rb
 - lib/terraspace/compiler/strategy/tfvar/tfvars.rb
 - lib/terraspace/compiler/writer.rb
-- lib/terraspace/completer.rb
-- lib/terraspace/completer/script.rb
-- lib/terraspace/completer/script.sh
 - lib/terraspace/core.rb
 - lib/terraspace/dependency/graph.rb
 - lib/terraspace/dependency/helper/base.rb
@@ -835,7 +835,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: 'Terraspace: The Terraspace Framework'