mux_tf 0.4.2 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0ea81053f5625bf3418e334d5d7c0d6b8a8d37ddedf53f0f8c8e5ab90d845a4
-  data.tar.gz: 05133bedb2342a2d74a630bd2fff5bd18ff1db2b26dadcf9788c79763ba4dce5
+  metadata.gz: 072dd927b3d88e4b33d94af099f40ffd49b7528f3f198aa3e21f363d210d3392
+  data.tar.gz: 5462e010c6b185cd55a1884fb92b0652b5c077a045706e8ff4ea01287bdb7b77
 SHA512:
-  metadata.gz: db6d757dd45d2e436f0ae475b9dc066d5a6f0b362eab0fe590b18257d620bc2c798fbe681c5533e89b6065a7c2765eccbebfc12bd6e7e1b347b581bcb94e4d60
-  data.tar.gz: 851a69520bcae89ca118e770920d85d04e446bddc2cd23877fe1ec73ef32a56c88a845752bdcad4c82ecc918f9037479acf17015323a53570aa6b25530e90c50
+  metadata.gz: c10933b1d5299de7b1c793c12dc3b192fb539d1f0544d9feee18368102493ef12966d48b03847424f005c3d5b1cf9a6f6e492c0deb76b7783355fa270b528ce7
+  data.tar.gz: adb0173ccf3b87924c0d9b933f1a1fa29e5363a1994eb95d9fc07d5ef9aabcfa6b9f1c4e6c5547d40a2213611589b8ed447f58923a9062307883c19827fed905

data/lib/mux_tf.rb

@@ -12,6 +12,7 @@ require "open3"
 require "piotrb_cli_utils"
 require "stateful_parser"
 
+require "active_support/dependencies/autoload"
 require "active_support/core_ext"
 
 require "paint"

data/lib/mux_tf/cli/current.rb

@@ -178,7 +178,8 @@ module MuxTf
           define_cmd("apply", summary: "Apply the current plan") do |_opts, _args, _cmd|
             status = tf_apply(filename: PLAN_FILENAME)
             if status.success?
-              throw :stop, :done
+              plan_status = run_plan
+              throw :stop, :done if plan_status == :ok
             else
               log "Apply Failed!"
             end
@@ -289,6 +290,7 @@ module MuxTf
           when :unknown
             # nothing
           end
+          plan_status
         end
 
         def run_upgrade

data/lib/mux_tf/plan_formatter.rb

@@ -16,8 +16,10 @@ module MuxTf
         parser = StatefulParser.new(normalizer: pastel.method(:strip))
         parser.state(:info, /^Acquiring state lock/)
         parser.state(:error, /Error locking state/, %i[none blank info])
+        parser.state(:refreshing, /^.+: Refreshing state... \[id=/, %i[none])
         parser.state(:refreshing, /Refreshing Terraform state in-memory prior to plan.../, %i[none blank info])
         parser.state(:refresh_done, /^----------+$/, [:refreshing])
+        parser.state(:refresh_done, /^$/, [:refreshing])
         parser.state(:plan_info, /Terraform will perform the following actions:/, [:refresh_done])
         parser.state(:plan_summary, /^Plan:/, [:plan_info])
 
@@ -75,7 +77,7 @@ module MuxTf
             when :plan_summary
               log line, depth: 2
             else
-              p [state, line]
+              p [state, pastel.strip(line)]
             end
           end
         }
@@ -124,6 +126,10 @@ module MuxTf
                 next
               end
               case stripped_line
+              when /^Downloading (?<repo>[^ ]+) (?<version>[^ ]+) for (?<module>[^ ]+)\.\.\./
+                print "D"
+              when /^- (?<module>[^ ]+) in (?<path>.+)$/
+                print "."
               when ""
                 puts
               else
@@ -180,6 +186,9 @@ module MuxTf
                 next
               end
               case stripped_line
+              when /^- Reusing previous version of (?<module>.+) from the dependency lock file$/
+                info = $LAST_MATCH_INFO.named_captures
+                log "- [FROM-LOCK] #{info["module"]}", depth: 2
               when /^- (?<module>.+) is built in to Terraform$/
                 info = $LAST_MATCH_INFO.named_captures
                 log "- [BUILTIN] #{info["module"]}", depth: 2

data/lib/mux_tf/plan_summary_handler.rb

@@ -3,7 +3,8 @@
 module MuxTf
   class PlanSummaryHandler
     extend TerraformHelpers
-    extend PiotrbCliUtils::Util
+    include TerraformHelpers
+    include PiotrbCliUtils::Util
 
     def self.from_file(file)
       data = data_from_file(file)

data/lib/mux_tf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.7
 platform: ruby
 authors:
 - Piotr Banasik
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - piotr@jane.app
 executables:
@@ -155,7 +155,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/piotrb/mux_tf
   source_code_uri: https://github.com/piotrb/mux_tf
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +170,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Terraform Multiplexing Scripts
 test_files: []