opswalrus 1.0.102 → 1.0.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cca021b1f893590122d04d39fe29b0a3543438df33e16b1061b7a8db9ac3ddc7
-  data.tar.gz: f5de23d139bd4bb8533159760e62ef3e7e25153c47e45c610ef8a2df219b43a7
+  metadata.gz: dcc7b4d3e59f51ac90c2025c27345d0f9da65095c6d4406cbb522d3eca800f74
+  data.tar.gz: 5ab46800dd863a1d58635eafdf83755497d60b505b4b35ac50a61c5022f8cf6b
 SHA512:
-  metadata.gz: 0bd03838bb556158b41f0c237719ee427ea6d0de3f46afb7370e66dd1f8f8ed04a5111fa6c9be8ad8242e2a1076d5e64a019f31a9c633c9b8123ea780ccaf737
-  data.tar.gz: 227b14b284ba96f3697570c335c5b53d724a1f751fa4f55727d9905da46d32da605e483f8789bfca2b7ac303f67f0179a2664a8307747687f47f4b7f6e351052
+  metadata.gz: 53ddd2218bc5a22a7144fdb04ee65c57acb79ab63c661815d2f170a2f64c37e40136f1efad9b115f3249b29b67d0f7242ebcd1f72a9f2275282b5fdee9543582
+  data.tar.gz: 39dca248da2b08cf0f96b1ca53d5fa56139dbec7747e7f4f6415f77cbe92674c995844a7a659eee69d9ae5d435b077458c2d22ff5cf07591ae4eda9c46cff3a8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.102)
+    opswalrus (1.0.103)
       activesupport (~> 7.0)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)

data/lib/opswalrus/host.rb

@@ -122,25 +122,12 @@ module OpsWalrus
     end
 
     def _zip_copy_and_run_ops_bundle(local_host, block)
-      # copy over ops bundle zip file
-      zip_bundle_path = @runtime_env.zip_bundle_path
-      upload_success = @_host.upload(zip_bundle_path, "tmpops.zip")
-      raise Error, "Unable to upload ops bundle to remote host" unless upload_success
-
-      stdout, _stderr, exit_status = @_host.run_ops(:bundle, "unzip tmpops.zip", in_bundle_root_dir: false)
-      raise Error, "Unable to unzip ops bundle on remote host: #{stdout}" unless exit_status == 0
-      tmp_bundle_root_dir = stdout.strip
-      @_host.set_ssh_session_tmp_bundle_root_dir(tmp_bundle_root_dir)
+      @_host._initialize_session(local_host)
 
-      # we run the block in the context of the host proxy object, s.t. `self` within the block evaluates to the host proxy object
+      # we run the block in the context of the host proxy object, s.t. `self` within the block evaluates to the host proxy object (i.e. self)
       retval = instance_exec(local_host, &block)    # local_host is passed as the argument to the block
 
-      # todo: cleanup
-      if tmp_bundle_root_dir =~ /tmp/   # sanity check the temp path before we blow away something we don't intend
-        @_host.execute(:rm, "-rf", "tmpops.zip", tmp_bundle_root_dir)
-      else
-        @_host.execute(:rm, "-rf", "tmpops.zip")
-      end
+      @_host._cleanup_session
 
       retval
     end
@@ -217,6 +204,9 @@ module OpsWalrus
 
       if reconnected
         initial_reconnect_delay + (Time.now - t1)
+
+        # initialize session again
+        @_host._initialize_session(local_host)
       end
     end
 
@@ -574,6 +564,28 @@ module OpsWalrus
       @tmp_bundle_root_dir = tmp_bundle_root_dir
     end
 
+    # returns the temporary bundle root directory
+    def _initialize_session
+      # copy over ops bundle zip file
+      zip_bundle_path = @runtime_env.zip_bundle_path
+      upload_success = @_host.upload(zip_bundle_path, "tmpops.zip")
+      raise Error, "Unable to upload ops bundle to remote host" unless upload_success
+
+      stdout, _stderr, exit_status = @_host.run_ops(:bundle, "unzip tmpops.zip", in_bundle_root_dir: false)
+      raise Error, "Unable to unzip ops bundle on remote host: #{stdout}" unless exit_status == 0
+      tmp_bundle_root_dir = stdout.strip
+      set_ssh_session_tmp_bundle_root_dir(tmp_bundle_root_dir)
+    end
+
+    def _cleanup_session
+      # todo: cleanup
+      if @tmp_bundle_root_dir =~ /tmp/   # sanity check the temp path before we blow away something we don't intend
+        @_host.execute(:rm, "-rf", "tmpops.zip", @tmp_bundle_root_dir)
+      else
+        @_host.execute(:rm, "-rf", "tmpops.zip")
+      end
+    end
+
     def clear_ssh_session
       @runtime_env = nil
       @ops_file_script = nil

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.102"
+  VERSION = "1.0.103"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.102
+  version: 1.0.103
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport