specinfra 2.83.2 → 2.83.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb64f982a1db9c07f65e29062f40f76d2dbd06cc
-  data.tar.gz: 6e35fcccef10ee85f2798d5cd55dd35415a97007
+  metadata.gz: 58cbd695ca792e709adf09757a8b98c9a8ae232e
+  data.tar.gz: 6456b8a3ec20b871fec8f2f9213047168ffb2f9d
 SHA512:
-  metadata.gz: 667d26731d168fd905f3235f135bb7cf12098908b4114e3a7b2938518e5fb2e2574a12ae9f85006856a1ced27e708070d144f1e7ec299160482daadd9b91c247
-  data.tar.gz: cfe99453702b4169825605f8c98fba7bd7cbf35331df9fc142ee824acafb433a9c71800104e95446b8fa080b6797617bddf7d8629b1fb22fe24f78f9e48f36ae
+  metadata.gz: e4e9801b8d4bf4c504f43e3356240523970e58818f85c0647ed4a2dc2b7e701af323619d270150a0aef349d15dd9f66c3c898d4b0f83ef893d9d078e3593e578
+  data.tar.gz: 2d3b11cdf49a821746666230da0980377aaff8e3061e458fdfa76bfc4e5b1ed8d5eba8c19bc886988733f288c436549f7788670216676805cd2c26836e24602f

data/lib/specinfra/backend/docker.rb

@@ -17,7 +17,7 @@ module Specinfra
           @base_image = get_or_pull_image(image)
 
           create_and_start_container
-          ObjectSpace.define_finalizer(self, proc { cleanup_container })
+          ObjectSpace.define_finalizer(self, self.class.__send__(:finalizer_for, @container))
         elsif container = get_config(:docker_container)
           @container = ::Docker::Container.get(container)
         else
@@ -25,6 +25,25 @@ module Specinfra
         end
       end
 
+      class << self
+        protected
+
+        # Get a finalizer for given container.
+        #
+        # @param [::Docker::Container, nil] container
+        #
+        # @return [Proc]
+        def finalizer_for(container)
+          proc do
+            # noinspection RubyNilAnalysis
+            unless container.nil?
+              container.stop
+              container.delete
+            end
+          end
+        end
+      end
+
       def run_command(cmd, opts={})
         cmd = build_command(cmd)
         run_pre_command(opts)
@@ -77,8 +96,7 @@ module Specinfra
       end
 
       def cleanup_container
-        @container.stop
-        @container.delete
+        self.class.__send__(:finalizer_for, @container).call
       end
 
       def current_image

data/lib/specinfra/command/linux/base/inventory.rb

@@ -30,7 +30,7 @@ class Specinfra::Command::Linux::Base::Inventory < Specinfra::Command::Base::Inv
 
     def get_block_device
       block_device_dirs = '/sys/block/*/{size,removable,device/{model,rev,state,timeout,vendor},queue/rotational}'
-      "for f in $(ls #{block_device_dirs}); do echo -e \"${f}\t$(cat ${f})\"; done"
+      %Q[bash -c 'for f in $(ls #{block_device_dirs}); do echo -e "${f}\t$(cat ${f})"; done']
     end
 
     def get_system_product_name

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.83.2"
+  VERSION = "2.83.4"
 end

data/spec/command/linux/inventory_spec.rb

@@ -16,5 +16,5 @@ end
 
 describe get_command(:get_inventory_block_device) do
   block_device_dirs = '/sys/block/*/{size,removable,device/{model,rev,state,timeout,vendor},queue/rotational}'
-  it { should eq "for f in $(ls #{block_device_dirs}); do echo -e \"${f}\t$(cat ${f})\"; done" }
+  it { should eq %Q[bash -c 'for f in $(ls #{block_device_dirs}); do echo -e "${f}\t$(cat ${f})"; done'] }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.83.2
+  version: 2.83.4
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp