train 3.4.8 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d64d5af6d893613ddb870aaaa600aabf3f608c1a7b7dc637fa863f225bcc8ab
-  data.tar.gz: e6cd669d74d05f17258dbeae2c465324cde5233ecae88374656de458233a3803
+  metadata.gz: 704c34b6ad721a82fb9259b3f3c41a550e5bc626d694d0c9e83e61d09d2cdbeb
+  data.tar.gz: 9bfaf284eb3eef55fc30660cc986a6805cb5a6c5fcc6bc8874faf967da69b8bd
 SHA512:
-  metadata.gz: 45ba429bec7ffaf84244331b1de57c44f00ce7501f5c666f76b72b5c657d3c91413e60a5b1e47aecfc393ee5f39f035cfd74bd4eabaf121e0765b164515e23c7
-  data.tar.gz: fd83bc6590e974dea6f408969c8990a3de2baa481496f2e892b253f1c278d23dc51bf60b6d21d2e29de7aa24e0668cb8f0d54339719e35d847de6a6b574fc333
+  metadata.gz: 617b0f37fd9b14baa18bf8b6ae568e19870412116cd8cf82886e5c452452a42be066764e6b801b5756e20cb28cff09406f646044a10a7ab404a63fe65e76712e
+  data.tar.gz: 531f7fef3b970d54422985424acb67ff8bbc828174acfea4ceb73385d44d34719715d891abd880a687da374f0035b647acf7be45b1817f2c5f460539631e42f3

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.8
+  version: 3.6.0
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-04-07 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.8
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.8
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: train-winrm
   requirement: !ruby/object:Gem::Requirement