mux_tf 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c60cb54c7514e17f82865850165b25a3146086cc3906e024296d5d9e19b7a7f
-  data.tar.gz: c2715accbc4a4c1d326db5be541f947a9228ddbd2c36b6c026cbf528baa60498
+  metadata.gz: 1a5386f0053732c1613b294b19bd94890a3dc5dbea9a6a443a35e6ca78ca0d36
+  data.tar.gz: 263c0bbe4fe2de06e2833f5640ad7bfb0e69814a37a8a199a9e360c99308cf28
 SHA512:
-  metadata.gz: ab7c0591caa23fef662acb3a496a38bf8bbbd74fc2aeae8f1e83010f6412312ace34ac68ac2110d0c2ef5eaf01f34a0cdf69b784d3959bfa4a1b036d5dd96ba3
-  data.tar.gz: c2569420e3dc71a1a2a88fb8ecb636b8be5ad7990ed73612f20459678cebb5731576a37c3ff0830990c423a333fd879494de00a227ed984696e7c63d21c030f0
+  metadata.gz: 56b45e534766f0efcdad2b008ecc3d0c7fe016ae4a0fed5009ca2df9094832d218aa3793b081cbf9e78d59b1cb847a3b9038bd5de41fa18e9f9ecaf2f914dcd9
+  data.tar.gz: b9d94d51350c22a7c1004194877cf2314f84208394711a3edd16cbd640d86332c1d12966089c656d242ea40977bd3dd9a9bb45b1439e606550366c53a138929a

data/exe/tf_current

@@ -1,8 +1,15 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-$LOAD_PATH << File.expand_path(File.join(__dir__, '..', 'lib'))
+begin
+  $LOAD_PATH << File.expand_path(File.join(__dir__, "..", "lib"))
 
-require 'mux_tf'
+  require "mux_tf"
 
-MuxTf::Cli.run(:current, ARGV)
+  MuxTf::Cli.run(:current, ARGV)
+rescue Exception => e
+  warn e.full_message
+  warn "<press enter>"
+  gets
+  exit 1
+end

data/exe/tf_mux

@@ -1,8 +1,15 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-$LOAD_PATH << File.expand_path(File.join(__dir__, '..', 'lib'))
+begin
+  $LOAD_PATH << File.expand_path(File.join(__dir__, "..", "lib"))
 
-require 'mux_tf'
+  require "mux_tf"
 
-MuxTf::Cli.run(:mux, ARGV)
+  MuxTf::Cli.run(:mux, ARGV)
+rescue Exception => e
+  warn e.full_message
+  warn "<press enter>"
+  gets
+  exit 1
+end

data/exe/tf_plan_summary

@@ -1,8 +1,15 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-$LOAD_PATH << File.expand_path(File.join(__dir__, '..', 'lib'))
+begin
+  $LOAD_PATH << File.expand_path(File.join(__dir__, "..", "lib"))
 
-require 'mux_tf'
+  require "mux_tf"
 
-MuxTf::Cli.run(:plan_summary, ARGV)
+  MuxTf::Cli.run(:plan_summary, ARGV)
+rescue Exception => e
+  warn e.full_message
+  warn "<press enter>"
+  gets
+  exit 1
+end

data/lib/mux_tf.rb

@@ -1,30 +1,31 @@
 # frozen_string_literal: true
 
-require 'English'
+require "English"
 
-require 'shellwords'
-require 'optparse'
-require 'json'
-require 'open3'
+require "shellwords"
+require "optparse"
+require "json"
+require "open3"
 
-require 'piotrb_cli_utils'
-require 'stateful_parser'
+require "piotrb_cli_utils"
+require "stateful_parser"
 
-require 'active_support/core_ext'
+require "active_support/core_ext"
 
-require 'paint'
-require 'pastel'
-require 'tty-prompt'
-require 'tty-table'
-require 'dotenv'
+require "paint"
+require "pastel"
+require "tty-prompt"
+require "tty-table"
+require "dotenv"
 
-require_relative './mux_tf/version'
-require_relative './mux_tf/cli'
-require_relative './mux_tf/tmux'
-require_relative './mux_tf/terraform_helpers'
-require_relative './mux_tf/plan_formatter'
-require_relative './mux_tf/version_check'
-require_relative './mux_tf/yaml_cache'
+require_relative "./mux_tf/version"
+require_relative "./mux_tf/cli"
+require_relative "./mux_tf/tmux"
+require_relative "./mux_tf/terraform_helpers"
+require_relative "./mux_tf/plan_formatter"
+require_relative "./mux_tf/version_check"
+require_relative "./mux_tf/yaml_cache"
+require_relative "./mux_tf/plan_summary_handler"
 
 module MuxTf
 end

data/lib/mux_tf/cli/current.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bundler"
+
 module MuxTf
   module Cli
     module Current
@@ -8,13 +10,13 @@ module MuxTf
       extend PiotrbCliUtils::CriCommandSupport
       extend PiotrbCliUtils::CmdLoop
 
-      PLAN_FILENAME = 'foo.tfplan'
+      PLAN_FILENAME = "foo.tfplan"
 
       class << self
         def run(args)
           version_check
 
-          if args[0] == 'cli'
+          if args[0] == "cli"
             cmd_loop
             return
           end
@@ -22,12 +24,12 @@ module MuxTf
           folder_name = File.basename(Dir.getwd)
           log "Processing #{Paint[folder_name, :cyan]} ..."
 
-          ENV['TF_IN_AUTOMATION'] = '1'
-          ENV['TF_INPUT'] = '0'
+          ENV["TF_IN_AUTOMATION"] = "1"
+          ENV["TF_INPUT"] = "0"
 
           return launch_cmd_loop(:error) unless run_validate
 
-          if ENV['TF_UPGRADE']
+          if ENV["TF_UPGRADE"]
             upgrade_status, upgrade_meta = run_upgrade
             return launch_cmd_loop(:error) unless upgrade_status == :ok
           end
@@ -36,37 +38,37 @@ module MuxTf
 
           case plan_status
           when :ok
-            log 'no changes, exiting', depth: 1
+            log "no changes, exiting", depth: 1
           when :error
-            log 'something went wrong', depth: 1
+            log "something went wrong", depth: 1
             launch_cmd_loop(plan_status)
           when :changes
-            log 'Printing Plan Summary ...', depth: 1
+            log "Printing Plan Summary ...", depth: 1
             pretty_plan_summary(PLAN_FILENAME)
             launch_cmd_loop(plan_status)
           when :unknown
             launch_cmd_loop(plan_status)
           end
         rescue Exception => e # rubocop:disable Lint/RescueException
-          puts Paint['Unhandled Exception!', :red]
-          puts '=' * 20
+          puts Paint["Unhandled Exception!", :red]
+          puts "=" * 20
           puts e.full_message
           puts
-          puts '< press enter to continue >'
+          puts "< press enter to continue >"
           gets
           exit 1
         end
 
-      private
+        private
 
         def version_check
           if VersionCheck.has_updates?
-            log Paint["="*80, :yellow]
+            log Paint["=" * 80, :yellow]
             log "New version of #{Paint["mux_tf", :cyan]} is available!"
             log "You are currently on version: #{Paint[VersionCheck.current_gem_version, :yellow]}"
             log "Latest version found is: #{Paint[VersionCheck.latest_gem_version, :green]}"
-            log "Run `#{Paint["gem update mux_tf", :green]}` to update!"
-            log Paint["="*80, :yellow]
+            log "Run `#{Paint["gem install mux_tf", :green]}` to update!"
+            log Paint["=" * 80, :yellow]
           end
         end
 
@@ -77,7 +79,7 @@ module MuxTf
 
         def process_remedies(remedies)
           if remedies.delete? :init
-            log 'Running terraform init ...', depth: 2
+            log "Running terraform init ...", depth: 2
             tf_init
             remedies = PlanFormatter.process_validation(validate)
             process_remedies(remedies)
@@ -90,12 +92,12 @@ module MuxTf
         end
 
         def validate
-          log 'Validating module ...', depth: 1
+          log "Validating module ...", depth: 1
           tf_validate.parsed_output
         end
 
         def create_plan(filename)
-          log 'Preparing Plan ...', depth: 1
+          log "Preparing Plan ...", depth: 1
           exit_code, meta = PlanFormatter.pretty_plan(filename)
           case exit_code
           when 0
@@ -111,13 +113,13 @@ module MuxTf
         end
 
         def launch_cmd_loop(status)
-          return if ENV['NO_CMD']
+          return if ENV["NO_CMD"]
 
           case status
           when :error, :unknown
-            log Paint['Dropping to command line so you can fix the issue!', :red]
+            log Paint["Dropping to command line so you can fix the issue!", :red]
           when :changes
-            log Paint['Dropping to command line so you can review the changes.', :yellow]
+            log Paint["Dropping to command line so you can review the changes.", :yellow]
           end
           cmd_loop(status)
         end
@@ -138,7 +140,7 @@ module MuxTf
           end
 
           run_cmd_loop(prompt) do |cmd|
-            throw(:stop, :no_input) if cmd == ''
+            throw(:stop, :no_input) if cmd == ""
             args = Shellwords.split(cmd)
             root_cmd.run(args, {}, hard_exit: false)
           end
@@ -159,90 +161,98 @@ module MuxTf
         end
 
         def plan_cmd
-          define_cmd('plan', summary: 'Re-run plan') do |_opts, _args, _cmd|
+          define_cmd("plan", summary: "Re-run plan") do |_opts, _args, _cmd|
             run_validate && run_plan
           end
         end
 
         def apply_cmd
-          define_cmd('apply', summary: 'Apply the current plan') do |_opts, _args, _cmd|
+          define_cmd("apply", summary: "Apply the current plan") do |_opts, _args, _cmd|
             status = tf_apply(filename: PLAN_FILENAME)
             if status.success?
               throw :stop, :done
             else
-              log 'Apply Failed!'
+              log "Apply Failed!"
             end
           end
         end
 
         def shell_cmd
-          define_cmd('shell', summary: 'Open your default terminal in the current folder') do |_opts, _args, _cmd|
-            log Paint['Launching shell ...', :yellow]
-            log Paint['When it exits you will be back at this prompt.', :yellow]
-            system ENV['SHELL']
+          define_cmd("shell", summary: "Open your default terminal in the current folder") do |_opts, _args, _cmd|
+            log Paint["Launching shell ...", :yellow]
+            log Paint["When it exits you will be back at this prompt.", :yellow]
+            system ENV["SHELL"]
           end
         end
 
         def force_unlock_cmd
-          define_cmd('force-unlock', summary: 'Force unlock state after encountering a lock error!') do
+          define_cmd("force-unlock", summary: "Force unlock state after encountering a lock error!") do
             prompt = TTY::Prompt.new(interrupt: :noop)
 
             table = TTY::Table.new(header: %w[Field Value])
-            table << ['Lock ID', @plan_meta['ID']]
-            table << ['Operation', @plan_meta['Operation']]
-            table << ['Who', @plan_meta['Who']]
-            table << ['Created', @plan_meta['Created']]
+            table << ["Lock ID", @plan_meta["ID"]]
+            table << ["Operation", @plan_meta["Operation"]]
+            table << ["Who", @plan_meta["Who"]]
+            table << ["Created", @plan_meta["Created"]]
 
             puts table.render(:unicode, padding: [0, 1])
 
-            if @plan_meta && @plan_meta['error'] == 'lock'
-              done = catch(:abort) do
-                if @plan_meta['Operation'] != 'OperationTypePlan'
+            if @plan_meta && @plan_meta["error"] == "lock"
+              done = catch(:abort) {
+                if @plan_meta["Operation"] != "OperationTypePlan"
                   throw :abort unless prompt.yes?(
-                    "Are you sure you want to force unlock a lock for operation: #{@plan_meta['Operation']}",
+                    "Are you sure you want to force unlock a lock for operation: #{@plan_meta["Operation"]}",
                     default: false
                   )
                 end
 
                 throw :abort unless prompt.yes?(
-                  'Are you sure you want to force unlock this lock?',
+                  "Are you sure you want to force unlock this lock?",
                   default: false
                 )
 
-                status = tf_force_unlock(id: @plan_meta['ID'])
+                status = tf_force_unlock(id: @plan_meta["ID"])
                 if status.success?
-                  log 'Done!'
+                  log "Done!"
                 else
                   log Paint["Failed with status: #{status}", :red]
                 end
 
                 true
-              end
+              }
 
-              log Paint['Aborted', :yellow] unless done
+              log Paint["Aborted", :yellow] unless done
             else
-              log Paint['No lock error or no plan ran!', :red]
+              log Paint["No lock error or no plan ran!", :red]
             end
           end
         end
 
         def upgrade_cmd
-          define_cmd('upgrade', summary: 'Upgrade modules/plguins') do |_opts, _args, _cmd|
+          define_cmd("upgrade", summary: "Upgrade modules/plguins") do |_opts, _args, _cmd|
             status, meta = run_upgrade
             if status != :ok
               log meta.inspect unless meta.empty?
-              log 'Upgrade Failed!'
+              log "Upgrade Failed!"
             end
           end
         end
 
         def interactive_cmd
-          define_cmd('interactive', summary: 'Apply interactively') do |_opts, _args, _cmd|
-            status = run_shell([tf_plan_summrary_cmd, PLAN_FILENAME, '-i'], return_status: true)
-            if status != 0
-              log 'Interactive Apply Failed!'
-            else
-              run_plan
+          define_cmd("interactive", summary: "Apply interactively") do |_opts, _args, _cmd|
+            plan = PlanSummaryHandler.from_file(PLAN_FILENAME)
+            begin
+              abort_message = catch :abort do
+                plan.run_interactive
+              end
+              if abort_message
+                log Paint["Aborted: #{abort_message}", :red]
+              else
+                run_plan
+              end
+            rescue Exception => e
+              log e.full_message
+              log "Interactive Apply Failed!"
             end
           end
         end
@@ -252,11 +262,11 @@ module MuxTf
 
           case plan_status
           when :ok
-            log 'no changes', depth: 1
+            log "no changes", depth: 1
           when :error
-            log 'something went wrong', depth: 1
+            log "something went wrong", depth: 1
           when :changes
-            log 'Printing Plan Summary ...', depth: 1
+            log "Printing Plan Summary ...", depth: 1
             pretty_plan_summary(PLAN_FILENAME)
           when :unknown
             # nothing
@@ -278,16 +288,15 @@ module MuxTf
           end
         end
 
-        def tf_plan_summrary_cmd
-          @tf_plan_summrary_cmd ||= File.expand_path(File.join(__dir__, '..', '..', '..', 'exe', 'tf_plan_summary'))
-        end
-
         def pretty_plan_summary(filename)
-          run_with_each_line([tf_plan_summrary_cmd, filename]) do |raw_line|
-            log raw_line.rstrip, depth: 2
+          plan = PlanSummaryHandler.from_file(filename)
+          plan.flat_summary.each do |line|
+            log line, depth: 2
           end
+          log "", depth: 2
+          log plan.summary, depth: 2
         end
+      end
     end
   end
-  end
 end

data/lib/mux_tf/cli/mux.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bundler"
+
 module MuxTf
   module Cli
     module Mux
@@ -7,49 +9,70 @@ module MuxTf
       extend PiotrbCliUtils::ShellHelpers
 
       class << self
+        def with_clean_env
+          backup = {}
+          Bundler.with_original_env do
+            ENV.keys.grep(/^(RBENV_|RUBYLIB)/).each do |key|
+              backup[key] = ENV[key]
+              ENV.delete(key)
+            end
+            yield
+          end
+        ensure
+          backup.each do |k, v|
+            ENV[k] = v
+          end
+        end
+
         def run(_args)
-          Dotenv.load('.env.mux')
+          Dotenv.load(".env.mux")
 
-          log 'Enumerating folders ...'
+          log "Enumerating folders ..."
           dirs = enumerate_terraform_dirs
 
-          fail_with 'Error: - no subfolders detected! Aborting.' if dirs.empty?
+          fail_with "Error: - no subfolders detected! Aborting." if dirs.empty?
 
-          tasks = dirs.map do |dir|
+          tasks = dirs.map { |dir|
             {
               name: dir,
               cwd: dir,
-              cmd: File.expand_path(File.join(__dir__, '..', '..', '..', 'exe', 'tf_current'))
+              cmd: File.expand_path(File.join(__dir__, "..", "..", "..", "exe", "tf_current"))
             }
-          end
+          }
 
           project = File.basename(Dir.getwd)
 
-          if ENV['MUX_TF_AUTH_WRAPPER']
-            log 'Warming up AWS connection ...'
-            words = Shellwords.shellsplit(ENV['MUX_TF_AUTH_WRAPPER'])
-            result = capture_shell([*words, 'aws', 'sts', 'get-caller-identity'], raise_on_error: true)
+          if ENV["MUX_TF_AUTH_WRAPPER"]
+            log "Warming up AWS connection ..."
+            words = Shellwords.shellsplit(ENV["MUX_TF_AUTH_WRAPPER"])
+            result = capture_shell([*words, "aws", "sts", "get-caller-identity"], raise_on_error: true)
             p JSON.parse(result)
           end
 
           if Tmux.session_running?(project)
-            log 'Killing existing session ...'
+            log "Killing existing session ..."
             Tmux.kill_session(project)
           end
 
-          log 'Starting new session ...'
-          Tmux.new_session project
-          Tmux.select_pane 'initial'
+          log "Starting new session ..."
+          with_clean_env do
+            Tmux.new_session project
+          end
+          Tmux.select_pane "initial"
+
+          # Tmux.set "remain-on-exit", "on"
 
-          Tmux.set_hook 'pane-exited', 'select-layout tiled'
-          Tmux.set_hook 'window-pane-changed', 'select-layout tiled'
+          Tmux.set_hook "pane-exited", "select-layout tiled"
+          Tmux.set_hook "window-pane-changed", "select-layout tiled"
 
-          Tmux.set 'mouse', 'on'
+          Tmux.set "mouse", "on"
+
+          window_id = Tmux.list_windows.first[:id]
 
           unless tasks.empty?
             tasks.each do |task|
               log "launching task: #{task[:name]} ...", depth: 2
-              Tmux.split_window :horizontal, "#{project}:1", cmd: task[:cmd], cwd: task[:cwd]
+              Tmux.split_window :horizontal, "#{project}:#{window_id}", cmd: task[:cmd], cwd: task[:cwd]
               Tmux.select_pane task[:name]
               Tmux.tile!
               task[:commands]&.each do |cmd|
@@ -58,17 +81,19 @@ module MuxTf
             end
           end
 
-          log 'Almost done ...'
+          log "Almost done ..."
 
-          initial_pane = Tmux.find_pane('initial')
+          initial_pane = Tmux.find_pane("initial")
           Tmux.kill_pane initial_pane[:id]
           Tmux.tile!
 
           puts "\e]0;tmux: #{project}\007"
 
-          log 'Attaching ...'
-          Tmux.attach(project, cc: !!ENV['MUXP_CC_MODE'])
-          log 'Done!'
+          sleep 5
+
+          log "Attaching ..."
+          Tmux.attach(project, cc: !!ENV["MUXP_CC_MODE"])
+          log "Done!"
         end
 
         private
@@ -76,9 +101,9 @@ module MuxTf
         def enumerate_terraform_dirs
           ignored = []
 
-          ignored += ENV['MUX_IGNORE'].split(',') if ENV['MUX_IGNORE']
+          ignored += ENV["MUX_IGNORE"].split(",") if ENV["MUX_IGNORE"]
 
-          dirs = Dir['**/*/.terraform'].map { |n| n.gsub(%r{/\.terraform}, '') }
+          dirs = Dir["**/*/.terraform"].map { |n| n.gsub(%r{/\.terraform}, "") }
           dirs.reject! { |d| d.in?(ignored) }
 
           dirs