mux_tf 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2059d5a9b1ef29b18001ec132ca66409559731f4e081c0116f697343862c99cd
-  data.tar.gz: efc55d59858ca48cb5091cd6a1daae9e20113c0fe5fb894fb145b1245155061f
+  metadata.gz: 0fa8aa05ed298ad8e22d12b7fdab99ac1cf4f5a1fe8d947c01bf3a47249b8b77
+  data.tar.gz: 9f65f9b7f183c80be4af4fa5e4c84f4396e0aecc9469f5f3dc20a4c2abef35ab
 SHA512:
-  metadata.gz: 17cc6edb73e3bc1bd0b5f962d03536653ff881ea125552a20d1795fbce93f15018f0a9ae803d3bb5bc76c03e90ee5293711e62e431ca49204006b9072c7ae9e3
-  data.tar.gz: 7158a4041788e471f448394bd0c4bee365a320ae426c51ba54f99fee2de33bb3c9eaa1a449d63304da473c79cbb77953c3a2d8fbda4e4f9c1232a021de643834
+  metadata.gz: 7b65a09e45cdf7997a6f8b79f29061f49456f456b8d5063abd4e588230075e66ce945f0fbd3e8e6a0a2dd05a2c6d66c23a74569180bf48380810b474a64ed42b
+  data.tar.gz: 17ae22572a91f31b6305f2637639fb21e6fa433fe20aa6bb9c07db7071ffe9ddf83cf3afe6425e98c223b9fd906a9323660febbe9282c0246b0290d3ceea5d96

data/lib/mux_tf/once_helper.rb

@@ -0,0 +1,39 @@
+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
+          once_helper.state = new_state
+          @path = :once
+        else
+          @path = :otherwise
+        end
+      end
+
+      def once(&block)
+        if @path == :then
+          yield
+        end
+      end
+
+      def otherwise(&block)
+        if @path == :otherwise
+          yield
+        end
+      end
+    end
+
+    def initialize
+      @state = nil
+    end
+
+    attr_accessor :state
+
+    def for(new_state)
+      StateEvaluator.new(self, new_state)
+    end
+  end
+end

data/lib/mux_tf/plan_formatter.rb

@@ -9,14 +9,15 @@ module MuxTf
       def pretty_plan(filename, targets: [])
         pastel = Pastel.new
 
-        phase = :init
+        once = OnceHelper.new
 
         meta = {}
 
         parser = StatefulParser.new(normalizer: pastel.method(:strip))
         parser.state(:info, /^Acquiring state lock/)
         parser.state(:error, /(╷|Error locking state|Error:)/, %i[none blank info reading])
-        parser.state(:reading, /: (Reading...|Read complete after)/, %i[none info])
+        parser.state(:reading, /: (Reading...|Read complete after)/, %i[none info reading])
+        parser.state(:none, /^$/, [:reading])
         parser.state(:refreshing, /^.+: Refreshing state... \[id=/, %i[none info reading])
         parser.state(:refreshing, /Refreshing Terraform state in-memory prior to plan.../, %i[none blank info reading])
         parser.state(:refresh_done, /^----------+$/, [:refreshing])
@@ -24,6 +25,9 @@ module MuxTf
         parser.state(:plan_info, /Terraform will perform the following actions:/, [:refresh_done, :none])
         parser.state(:plan_summary, /^Plan:/, [:plan_info])
 
+        parser.state(:plan_legend, /^Terraform used the selected providers to generate the following execution$/)
+        parser.state(:none, /^$/, [:plan_legend])
+
         parser.state(:error_lock_info, /Lock Info/, [:error])
         parser.state(:error, /^$/, [:error_lock_info])
 
@@ -40,9 +44,9 @@ module MuxTf
               end
             when :reading
               clean_line = pastel.strip(line)
-              if clean_line.match /^(.+): Reading...$/
+              if clean_line.match(/^(.+): Reading...$/)
                 log "Reading: #{$LAST_MATCH_INFO[1]} ...", depth: 2
-              elsif clean_line.match /^(.+): Read complete after (.+)(?: \[(.+)\])$/
+              elsif clean_line.match(/^(.+): Read complete after ([^\[]+)(?: \[(.+)\])?$/)
                 if $LAST_MATCH_INFO[3]
                   log "Reading Complete: #{$LAST_MATCH_INFO[1]} after #{$LAST_MATCH_INFO[2]} [#{$LAST_MATCH_INFO[3]}]", depth: 3
                 else
@@ -61,10 +65,7 @@ module MuxTf
               meta["error"] = "lock"
               log Paint[line, :red], depth: 2
             when :plan_error
-              if phase != :plan_error
-                puts
-                phase = :plan_error
-              end
+              once.for(state).once { puts }
               meta["error"] = "refresh"
               log Paint[line, :red], depth: 2
             when :error_lock_info
@@ -73,20 +74,22 @@ module MuxTf
               end
               log Paint[line, :red], depth: 2
             when :refreshing
-              if phase != :refreshing
-                phase = :refreshing
+              once.for(state).once {
                 log "Refreshing state ", depth: 2, newline: false
-              else
+              }.otherwise {
                 print "."
-              end
+              }
+            when :plan_legend
+              once.for(state).once { puts }
+              log line, depth: 2
             when :refresh_done
-              if phase != :refresh_done
-                phase = :refresh_done
+              once.for(state).once {
                 puts
-              else
-                # nothing
-              end
+              }.otherwise {
+                #nothing
+              }
             when :plan_info
+              once.for(state).once { puts }
               log line, depth: 2
             when :plan_summary
               log line, depth: 2
@@ -120,10 +123,10 @@ module MuxTf
 
         parser = StatefulParser.new(normalizer: pastel.method(:strip))
 
-        parser.state(:modules_init, /^Initializing modules\.\.\./)
+        parser.state(:modules_init, /^Initializing modules\.\.\./, [:none, :backend])
         parser.state(:modules_upgrade, /^Upgrading modules\.\.\./)
         parser.state(:backend, /^Initializing the backend\.\.\./, [:none, :modules_init, :modules_upgrade])
-        parser.state(:plugins, /^Initializing provider plugins\.\.\./, [:backend])
+        parser.state(:plugins, /^Initializing provider plugins\.\.\./, [:backend, :modules_init])
 
         parser.state(:plugin_warnings, /^$/, [:plugins])
         parser.state(:backend_error, /Error:/, [:backend])

data/lib/mux_tf/version.rb

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

data/lib/mux_tf.rb

@@ -20,6 +20,7 @@ require "tty-table"
 require "dotenv"
 
 require_relative "./mux_tf/version"
+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.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Piotr Banasik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -141,6 +141,7 @@ 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_formatter.rb
 - lib/mux_tf/plan_summary_handler.rb
 - lib/mux_tf/resource_tokenizer.rb
@@ -171,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Terraform Multiplexing Scripts