train 3.4.9 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc696c31df0f0804e64448c11d94c1be7d7a89daa005ebfbe63ad858de6f6626
-  data.tar.gz: d063e9309efe6ec3a4d825678cac8302309b05b5fabe7eb7a3aff2a6239d3eac
+  metadata.gz: 19b9885778f6b955bb1239371e5192ef25e7ddd21f79a87117f38bc185b213f3
+  data.tar.gz: b43c04a718b9a3c9b8eac6b33b20f90a5f53d0576691a009942965b9c07eea33
 SHA512:
-  metadata.gz: c629414eef77c95408ff641862fa992f530ffaed1f48418cc712854d79044589d675f2b80d0f2bdfa0e758ae9a40cd3a5687601f9c0b69e67cb4297efd6e1c67
-  data.tar.gz: 2f2ac0b2f029ced0c9df62d60c3f17f5ae22517a335e9d22a5f8d3c1f3ed2284ea215b43e2bcd5158507f9af82596fa2aaed0e73b3b73dcbdf8dac92d8b9cbbc
+  metadata.gz: 82891e944073a70eefd4d3146863bde5897a5651710717a05e58818dd4d559de56d5e59182978b639fa58fd7b8ec14f1ae0a44a745766c860f76e4792b683616
+  data.tar.gz: d948d3df1b04c90f7739f8637ee4ef49b858ad3aa26ca62dde98e43086c6887b5f82d69e2c38f6b4bb5766d3e89d9609f48f2be9e99cea53d851770e6c275fc6

data/lib/train/transports/docker.rb

@@ -6,6 +6,7 @@ module Train::Transports
 
     include_options Train::Extras::CommandWrapper
     option :host, required: true
+    option :docker_url, required: false
 
     def connection(state = {}, &block)
       opts = merge_options(options, state || {})
@@ -53,10 +54,21 @@ class Train::Transports::Docker
     def initialize(conf)
       super(conf)
       @id = options[:host]
+
+      docker_url = options[:docker_url]
+      if RUBY_PLATFORM =~ /windows|mswin|msys|mingw|cygwin/
+        # Docker Desktop for windows. Must override socket location.
+        # https://docs.docker.com/desktop/faqs/#how-do-i-connect-to-the-remote-docker-engine-api
+        # docker_socket ||= "npipe:////./pipe/docker_engine" # # Doesn't require a settings change, but also doesn't work
+        docker_url ||= "tcp://localhost:2375"
+      end
+      Docker.url = docker_url if docker_url
+
       @container = ::Docker::Container.get(@id) ||
         raise("Can't find Docker container #{@id}")
       @cmd_wrapper = nil
       @cmd_wrapper = CommandWrapper.load(self, @options)
+      @probably_windows = nil
     end
 
     def close
@@ -78,6 +90,8 @@ class Train::Transports::Docker
         Train::File::Remote::Aix.new(self, path)
       elsif os.solaris?
         Train::File::Remote::Unix.new(self, path)
+      elsif os.windows?
+        Train::File::Remote::Windows.new(self, path)
       else
         Train::File::Remote::Linux.new(self, path)
       end
@@ -85,10 +99,16 @@ class Train::Transports::Docker
 
     def run_command_via_connection(cmd, &_data_handler)
       cmd = @cmd_wrapper.run(cmd) unless @cmd_wrapper.nil?
+
+      # Cannot use os.windows? here because it calls run_command_via_connection,
+      # causing infinite recursion during initial platform detection
+      if sniff_for_windows?
+        invocation = cmd_run_command(cmd)
+      else
+        invocation = sh_run_command(cmd)
+      end
       stdout, stderr, exit_status = @container.exec(
-        [
-          "/bin/sh", "-c", cmd
-        ]
+        invocation, user: @options[:user]
       )
       CommandResult.new(stdout.join, stderr.join, exit_status)
     rescue ::Docker::Error::DockerError => _
@@ -97,5 +117,23 @@ class Train::Transports::Docker
       # @TODO: differentiate any other error
       raise
     end
+
+    def sh_run_command(cmd)
+      ["/bin/sh", "-c", cmd]
+    end
+
+    def cmd_run_command(cmd)
+      ["cmd.exe", "/s", "/c", cmd]
+    end
+
+    def sniff_for_windows?
+      return @probably_windows unless @probably_windows.nil?
+
+      # Run a command using /bin/sh, which should fail under Windows
+      stdout, _stderr, _exit_status = @container.exec(
+        sh_run_command("true"), user: @options[:user]
+      )
+      @probably_windows = !!stdout.detect { |l| l.include? "failure in a Windows system call" }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 3.6.2
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 3.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 3.6.2
 - !ruby/object:Gem::Dependency
   name: train-winrm
   requirement: !ruby/object:Gem::Requirement