mux_tf 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7674eca8a264df1e58d37be750bc5681a40c55ba1b47de8027ab77eda156c506
-  data.tar.gz: d0bd742e109563bd51420c19d66ab11a45947778f200dc24fb0e1a2869f4b556
+  metadata.gz: 924f8b4cc0e90b4c636e3ffcc806c0e48036380ac81ee83b1dc21a437950e76e
+  data.tar.gz: 3bea784dc0db5091efa2dcba48c653b812d618b88c8dc04b997b59cc8e810e0c
 SHA512:
-  metadata.gz: 5eeab6c9a70ab1e7124722c93e7bd6cbc0af3148902d6a3d9ab58436a352b41e6c16064c4d2881648060a063ad1fae212198acf4da64f9052403612e9fc9a136
-  data.tar.gz: 7231f4def9919e26f091f5d2c5ac343923345addb9d4b55c7cb6687f324c526b301f255937f86653ec83b087b7244684ac9f122d04db020fb79d44469c9e1c3b
+  metadata.gz: 3dbd88ebf68ae0bb27116ce5b553a04668a746cfdd89ed1e646fc6f75961cf8c61d66f2a4ba46d0baaa17c6fdaa3b99704485632a5787a492037e75707e06b1a
+  data.tar.gz: bd9bf482078f080477f1871b02c256ad06b7bcb4e323adb8ee35fe056b9f8fd34bec4993c6b1611fac161b09b80db11c3d36395fdb42bef0d174e3ec666f8745

data/exe/tf_current

@@ -8,6 +8,9 @@ begin
   require "mux_tf"
 
   MuxTf::Cli.run(:current, ARGV)
+rescue Interrupt
+  warn "\nInterrupted"
+  exit 1
 rescue Exception => e # rubocop:disable Lint/RescueException
   warn e.full_message
   warn "<press enter>"

data/exe/tf_mux

@@ -8,6 +8,9 @@ begin
   require "mux_tf"
 
   MuxTf::Cli.run(:mux, ARGV)
+rescue Interrupt
+  warn "\nInterrupted"
+  exit 1
 rescue Exception => e # rubocop:disable Lint/RescueException
   warn e.full_message
   warn "<press enter>"

data/exe/tf_plan_summary

@@ -8,6 +8,9 @@ begin
   require "mux_tf"
 
   MuxTf::Cli.run(:plan_summary, ARGV)
+rescue Interrupt
+  warn "\nInterrupted"
+  exit 1
 rescue Exception => e # rubocop:disable Lint/RescueException
   warn e.full_message
   warn "<press enter>"

data/lib/mux_tf/cli/current.rb

@@ -47,14 +47,6 @@ module MuxTf
           when :unknown
             launch_cmd_loop(plan_status)
           end
-        rescue Exception => e # rubocop:disable Lint/RescueException
-          puts Paint["Unhandled Exception!", :red]
-          puts "=" * 20
-          puts e.full_message
-          puts
-          puts "< press enter to continue >"
-          gets
-          exit 1
         end
 
         def plan_filename

data/lib/mux_tf/plan_formatter.rb

@@ -9,8 +9,6 @@ module MuxTf
       def pretty_plan(filename, targets: []) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         pastel = Pastel.new
 
-        once = OnceHelper.new
-
         meta = {}
 
         parser = StatefulParser.new(normalizer: pastel.method(:strip))
@@ -23,6 +21,10 @@ module MuxTf
                      [:none, :blank, :info, :reading])
         parser.state(:refresh_done, /^----------+$/, [:refreshing])
         parser.state(:refresh_done, /^$/, [:refreshing])
+
+        parser.state(:output_info, /^Changes to Outputs:$/, [:refresh_done])
+        parser.state(:refresh_done, /^$/, [:output_info])
+
         parser.state(:plan_info, /Terraform will perform the following actions:/, [:refresh_done, :none])
         parser.state(:plan_summary, /^Plan:/, [:plan_info])
 
@@ -34,8 +36,12 @@ module MuxTf
 
         parser.state(:plan_error, /^╷|Error: /, [:refreshing, :refresh_done])
 
+        last_state = nil
+
         status = tf_plan(out: filename, detailed_exitcode: true, compact_warnings: true, targets: targets) { |raw_line|
           parser.parse(raw_line.rstrip) do |state, line|
+            first_in_state = last_state != state
+
             case state
             when :none
               if line.blank?
@@ -66,35 +72,35 @@ module MuxTf
               meta["error"] = "lock"
               log Paint[line, :red], depth: 2
             when :plan_error
-              once.for(state).once do puts end
+              puts if first_in_state
               meta["error"] = "refresh"
               log Paint[line, :red], depth: 2
             when :error_lock_info
               meta[$LAST_MATCH_INFO[1]] = $LAST_MATCH_INFO[2] if line =~ /([A-Z]+\S+)+:\s+(.+)$/
               log Paint[line, :red], depth: 2
             when :refreshing
-              once.for(state).once {
+              if first_in_state
                 log "Refreshing state ", depth: 2, newline: false
-              }.otherwise {
+              else
                 print "."
-              }
+              end
             when :plan_legend
-              once.for(state).once do puts end
+              puts if first_in_state
               log line, depth: 2
             when :refresh_done
-              once.for(state).once {
-                puts
-              }.otherwise {
-                # nothing
-              }
+              puts if first_in_state
             when :plan_info # rubocop:disable Lint/DuplicateBranch
-              once.for(state).once do puts end
+              puts if first_in_state
+              log line, depth: 2
+            when :output_info # rubocop:disable Lint/DuplicateBranch
+              puts if first_in_state
               log line, depth: 2
             when :plan_summary
               log line, depth: 2
             else
               p [state, pastel.strip(line)]
             end
+            last_state = state
           end
         }
         [status.status, meta]

data/lib/mux_tf/plan_summary_handler.rb

@@ -60,7 +60,7 @@ module MuxTf
           }
         else
           puts "[??] #{output_name}"
-          puts "UNKNOWN ACTIONS: #{v['actions'].inspect}"
+          puts "UNKNOWN OUTPUT ACTIONS: #{v['actions'].inspect}"
           puts "TODO: update plan_summary to support this!"
         end
       end
@@ -99,6 +99,13 @@ module MuxTf
             address: v["address"],
             deps: find_deps(data, v["address"])
           }
+        when %w[create delete]
+          parts << {
+            type: "resource",
+            action: "replace (create before delete)",
+            address: v["address"],
+            deps: find_deps(data, v["address"])
+          }
         when ["read"]
           parts << {
             type: "resource",
@@ -108,7 +115,7 @@ module MuxTf
           }
         else
           puts "[??] #{v['address']}"
-          puts "UNKNOWN ACTIONS: #{v['change']['actions'].inspect}"
+          puts "UNKNOWN RESOURCE ACTIONS: #{v['change']['actions'].inspect}"
           puts "TODO: update plan_summary to support this!"
         end
       end
@@ -354,6 +361,8 @@ module MuxTf
         :red
       when "replace" # rubocop:disable Lint/DuplicateBranch
         :red
+      when "replace (create before delete)" # rubocop:disable Lint/DuplicateBranch
+        :red
       when "read"
         :cyan
       else
@@ -370,6 +379,8 @@ module MuxTf
       when "delete"
         "-"
       when "replace"
+        "∓"
+      when "replace (create before delete)"
         "±"
       when "read"
         ">"

data/lib/mux_tf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MuxTf
-  VERSION = "0.10.0"
+  VERSION = "0.12.0"
 end

data/lib/mux_tf.rb

@@ -23,7 +23,6 @@ require "dotenv"
 
 require_relative "./mux_tf/version"
 require_relative "./mux_tf/plan_filename_generator"
-require_relative "./mux_tf/once_helper"
 require_relative "./mux_tf/resource_tokenizer"
 require_relative "./mux_tf/cli"
 require_relative "./mux_tf/tmux"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Piotr Banasik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-23 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -141,7 +141,6 @@ files:
 - lib/mux_tf/cli/current.rb
 - lib/mux_tf/cli/mux.rb
 - lib/mux_tf/cli/plan_summary.rb
-- lib/mux_tf/once_helper.rb
 - lib/mux_tf/plan_filename_generator.rb
 - lib/mux_tf/plan_formatter.rb
 - lib/mux_tf/plan_summary_handler.rb

data/lib/mux_tf/once_helper.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module MuxTf
-  class OnceHelper
-    # once = OnceHelper.new
-    # once.for(:phase).once { ... }.otherwise { ... }
-
-    class StateEvaluator
-      def initialize(once_helper, new_state)
-        if once_helper.state == new_state
-          @path = :otherwise
-        else
-          once_helper.state = new_state
-          @path = :once
-        end
-      end
-
-      def once
-        yield if @path == :then
-        self
-      end
-
-      def otherwise
-        yield if @path == :otherwise
-        self
-      end
-    end
-
-    def initialize
-      @state = nil
-    end
-
-    attr_accessor :state
-
-    def for(new_state)
-      StateEvaluator.new(self, new_state)
-    end
-  end
-end