mux_tf 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d3511e5badfa499bd43efb92048717c8d597633229c4e135a51c0d57ea56d84
-  data.tar.gz: 3a2feb35ce3d7a9c4f2781b2ace26eb08ed41da0ba047b33a8b4882363878914
+  metadata.gz: 1a5386f0053732c1613b294b19bd94890a3dc5dbea9a6a443a35e6ca78ca0d36
+  data.tar.gz: 263c0bbe4fe2de06e2833f5640ad7bfb0e69814a37a8a199a9e360c99308cf28
 SHA512:
-  metadata.gz: 7559eca291ace43436b5f38ea72823187573c85e7b51029861bf98a4e3b88b9144f0997a915a9ab1e9cb581ddc04807b9a9da569dd233a47207007fae5939b57
-  data.tar.gz: 15d909df002d4ff344e2966eb2a54d3943407f6d9e910daebc84781de233f215bfa282067f7cf3eaf702811553785e785be9c5d8a437908e8b0f30d1efa911b8
+  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/cli/mux.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bundler"
+
 module MuxTf
   module Cli
     module Mux
@@ -7,6 +9,21 @@ 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")
 
@@ -38,9 +55,13 @@ module MuxTf
           end
 
           log "Starting new session ..."
-          Tmux.new_session project
+          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"
 
@@ -68,6 +89,8 @@ module MuxTf
 
           puts "\e]0;tmux: #{project}\007"
 
+          sleep 5
+
           log "Attaching ..."
           Tmux.attach(project, cc: !!ENV["MUXP_CC_MODE"])
           log "Done!"

data/lib/mux_tf/plan_summary_handler.rb

@@ -177,7 +177,7 @@ module MuxTf
       resource, parent_address = find_config(data["configuration"], "root_module", address, [])
       if resource
         deps = []
-        resource["expressions"].each do |_k, v|
+        resource["expressions"]&.each do |_k, v|
           deps << v["references"] if v.is_a?(Hash) && v["references"]
         end
         result += deps.map { |s| (parent_address + [s]).join(".") }

data/lib/mux_tf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mux_tf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Piotr Banasik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport