train 3.5.2 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8533f5c6b2ed8cb7c4898c3a98acac69aedebcdb22dfc6b66a47690ab281a5dd
-  data.tar.gz: 17e47f9f6803277c7b3734bdc2baa355e802dee4a96f08669a83a62f27c77dcd
+  metadata.gz: e4e68414986172e73763ef89b9bfcac8903567fa2715e05ab11164960b00d3fc
+  data.tar.gz: e7643f6ada520f214fcd4f8656aca9a67fa88cabf313493d72ba04322b9267b8
 SHA512:
-  metadata.gz: be9577575746afe918255fbdbfd9540ee73283ed473f4d2e9d3cf2371d38d574796f1837b8a1b5307d00b1484b184623d0c2b4392a9407e13d6590233c0bd669
-  data.tar.gz: 0b6ac44728ea213d45c8b0436e5d5ef1f7e06e8b4b1be429b4a957d7e032b77b8f6a158bbf9535ea328b8ebbd9fadc13d2129df16d689370250bb336182658fc
+  metadata.gz: 3a12e33786c1bf058923e3a07c15b98e878ed0c2957f08e00175a509e001a5ebd8067e0c1fd46480e37e973cddbef5dda484cdb6247994ffb2b54498a2bed167
+  data.tar.gz: 2d21149eeef299ea18afcc68ec2c99a3bec2c3fce9d2e532aa6c4b44f294376da4b0692780f0f67b7605fe263e5750d7ff337ab4fbffb5dcdf4dfb4fceff52ea

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