train 3.5.4 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ab5b05d9f070f46d6447e23dc7dd9a4fc2981f9f8bd330391cfcb729093f97e
-  data.tar.gz: 44f1c231c100201860f3076b0aa338bc3f8054f8779070f1df045806e3bddf25
+  metadata.gz: 7cc8b0938a9260b0b811cc132c94c8db514c59ab5fcabf88c07de31cdcc90f18
+  data.tar.gz: 4a9404300b20e64dcfb65b1fdba7b92b992cdb2153952643abdc08870e8d4e0d
 SHA512:
-  metadata.gz: 436cc1af1db2f8206d1c8c7295030b4ef5cb9d9fca983646de7686af4844a8959471a46e065d2c91bf9d2578cb34010415b2da3fe23f290028918ab8684781bb
-  data.tar.gz: f1907e45cf7eee624fb8ded3d2f25fbb1b20cc65611efb48a975fc5a064525fdadfe28c1ab0c2051b55b8b133760e3470cb01632fc0ee844ec4065f16435ed97
+  metadata.gz: 85d5ffd5072c547c66fbadc86affdb1bcd305ad76b4c8ed9658e65bafdd0d936faadbe1071081447c3ab86f5085cca90c5b2a42fbfa7353c3c4e66fdabedb05a
+  data.tar.gz: 3925c95d221b89e40810df95652ec91e2716957e92f60a2a69b872079b90719e96dfde2d88f53d23741f69cb8cf46f7aa40838394a2f5a809c910a497f31d905

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
-        ], user: @options[:user]
+        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.4
+  version: 3.7.2
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-05-24 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.4
+        version: 3.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.7.2
 - !ruby/object:Gem::Dependency
   name: train-winrm
   requirement: !ruby/object:Gem::Requirement
@@ -44,20 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3.1
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="