mux_tf 0.12.0 → 0.14.0

data/lib/mux_tf/terraform_helpers.rb

@@ -3,6 +3,7 @@
 module MuxTf
   module TerraformHelpers
     include PiotrbCliUtils::ShellHelpers
+    include PiotrbCliUtils::Util
 
     ResultStruct = Struct.new("TerraformResponse", :status, :success?, :output, :parsed_output, keyword_init: true)
 
@@ -39,13 +40,14 @@ module MuxTf
       stream_or_run_terraform(cmd, &block)
     end
 
-    def tf_plan(out:, color: true, detailed_exitcode: nil, compact_warnings: false, input: nil, targets: [], &block)
+    def tf_plan(out:, color: true, detailed_exitcode: nil, compact_warnings: false, input: nil, targets: [], json: false, &block) # rubocop:disable Metrics/CyclomaticComplexity
       args = []
       args += ["-out", out]
       args << "-input=#{input.inspect}" unless input.nil?
       args << "-compact-warnings" if compact_warnings
       args << "-no-color" unless color
       args << "-detailed-exitcode" if detailed_exitcode
+      args << "-json" if json
       if targets && !targets.empty?
         targets.each do |target|
           args << "-target=#{target}"
@@ -53,10 +55,10 @@ module MuxTf
       end
 
       cmd = tf_prepare_command(["plan", *args], need_auth: true)
-      stream_or_run_terraform(cmd, &block)
+      stream_or_run_terraform(cmd, split_streams: json, &block)
     end
 
-    def tf_show(file, json: false)
+    def tf_show(file, json: false, capture: false)
       if json
         args = ["show", "-json", file]
         cmd = tf_prepare_command(args, need_auth: true)
@@ -64,7 +66,11 @@ module MuxTf
       else
         args = ["show", file]
         cmd = tf_prepare_command(args, need_auth: true)
-        run_terraform(cmd)
+        if capture
+          capture_terraform(cmd)
+        else
+          run_terraform(cmd)
+        end
       end
     end
 
@@ -83,9 +89,9 @@ module MuxTf
       end
     end
 
-    def stream_or_run_terraform(args, &block)
+    def stream_or_run_terraform(args, split_streams: false, &block)
       if block
-        stream_terraform(args, &block)
+        stream_terraform(args, split_streams: split_streams, &block)
       else
         run_terraform(args)
       end
@@ -100,8 +106,43 @@ module MuxTf
                        })
     end
 
-    def stream_terraform(args, &block)
-      status = run_with_each_line(args, &block)
+    def run_with_each_line_ex(command)
+      output_queue = Thread::Queue.new
+      output_queue << [:command, JSON.dump(command)]
+      command = join_cmd(command)
+      Open3.popen3(command) do |_stdin, stdout, stderr, wait_thr|
+        stdout_thread = Thread.new do
+          until stdout.eof?
+            raw_line = stdout.gets
+            output_queue << [:stdout, raw_line]
+          end
+        rescue IOError
+          # ignore
+        end
+        stderr_thread = Thread.new do
+          until stderr.eof?
+            raw_line = stderr.gets
+            output_queue << [:stderr, raw_line]
+          end
+        rescue IOError
+          # ignore
+        end
+        Thread.new do
+          stdout_thread.join
+          stderr_thread.join
+          output_queue.close
+        end
+        yield(output_queue.pop) until output_queue.closed?
+        wait_thr.value # Process::Status object returned.
+      end
+    end
+
+    def stream_terraform(args, split_streams: false, &block)
+      status = if split_streams
+                 run_with_each_line_ex(args, &block)
+               else
+                 run_with_each_line(args, &block)
+               end
       # status is a Process::Status
       ResultStruct.new({
                          status: status.exitstatus,
@@ -120,7 +161,9 @@ module MuxTf
                          parsed_output: parsed_output
                        })
     rescue JSON::ParserError
-      fail_with "Execution Failed! - #{result.inspect}"
+      message = "Execution failed with exit code: #{result.status}"
+      message += "\nOutput:\n#{result.output}" if result.output != ""
+      fail_with message
     end
   end
 end

data/lib/mux_tf/tmux.rb

@@ -4,6 +4,8 @@ require "shellwords"
 
 module MuxTf
   module Tmux
+    extend PiotrbCliUtils::Util
+
     class << self
       def session_running?(name)
         tmux("has-session -t #{name.inspect} 2>/dev/null", raise_on_error: false)

data/lib/mux_tf/version.rb

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

data/lib/mux_tf.rb

@@ -20,17 +20,25 @@ require "pastel"
 require "tty-prompt"
 require "tty-table"
 require "dotenv"
+require "hashdiff"
+require "awesome_print"
+require "diff/lcs"
+require "diff/lcs/string"
+require "diff/lcs/hunk"
 
-require_relative "./mux_tf/version"
-require_relative "./mux_tf/plan_filename_generator"
-require_relative "./mux_tf/resource_tokenizer"
-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"
+require_relative "mux_tf/version"
+require_relative "mux_tf/coloring"
+require_relative "mux_tf/plan_filename_generator"
+require_relative "mux_tf/resource_tokenizer"
+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"
+require_relative "mux_tf/plan_utils"
 
 module MuxTf
+  ROOT = File.expand_path(File.join(__dir__, ".."))
 end

data/mux_tf.gemspec

@@ -30,8 +30,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport", "< 7.0.0"
+  spec.add_dependency "awesome_print"
+  spec.add_dependency "diff-lcs"
   spec.add_dependency "dotenv"
-  spec.add_dependency "paint"
+  spec.add_dependency "hashdiff"
   spec.add_dependency "pastel"
   spec.add_dependency "piotrb_cli_utils", "~> 0.1.0"
   spec.add_dependency "stateful_parser", "~> 0.1.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Piotr Banasik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.0.0
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paint
+  name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,9 +169,11 @@ files:
 - lib/mux_tf/cli/current.rb
 - lib/mux_tf/cli/mux.rb
 - lib/mux_tf/cli/plan_summary.rb
+- lib/mux_tf/coloring.rb
 - lib/mux_tf/plan_filename_generator.rb
 - lib/mux_tf/plan_formatter.rb
 - lib/mux_tf/plan_summary_handler.rb
+- lib/mux_tf/plan_utils.rb
 - lib/mux_tf/resource_tokenizer.rb
 - lib/mux_tf/terraform_helpers.rb
 - lib/mux_tf/tmux.rb