r-train 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d2fed9f8df330e399ebcdc9fb4bf54d54e211c6
-  data.tar.gz: 188c391502ea0ec079707863f5d36a70ee76d388
+  metadata.gz: 1d0d1580a540541055d89da66ae4d90b97e85162
+  data.tar.gz: b228d1944aa2b7201223ad47897033ca6e6a531c
 SHA512:
-  metadata.gz: bcc3d7a32ba560692852d0d43079d5b2e743ac2a0f4a1acf975adeb99709f915d40a5a21c3fb0862fe5d82394ccf0310dd0f2a7ff21fe66f01ab320b505e4d67
-  data.tar.gz: dbb31f983a9ae7011a1a74df2cc322cbc59357d8fc88419a7435533591e501901064aa69576578d53a7e0e455a45314684f752bcff6c6e957add4d20c89249be
+  metadata.gz: d189e9a16f00e5921e7cdd3c15610c35ccdfa70cc969ec82e59e440b2dae214dd92ae65dbd89f5e9dbdc2b8bbf29cd53aedef8dab73bd6cbbadc2b1f321c9f20
+  data.tar.gz: 4a78e3f8dd1b22e3405003e882de552bf7c62ee1c70e491dd36c673248859c0aa566f9043248428d99ce0b52b7f65c7f8151b550ed68ea5f3e5b6e51ae39e905

data/CHANGELOG.md

@@ -1,30 +1,51 @@
 # Change Log
 
-## [0.9.4](https://github.com/chef/train/tree/0.9.4) (2016-01-15)
-[Full Changelog](https://github.com/chef/train/compare/v0.9.3...0.9.4)
+## [0.9.5](https://github.com/chef/train/tree/0.9.5) (2016-01-25)
+[Full Changelog](https://github.com/chef/train/compare/v0.9.4...0.9.5)
+
+**Implemented enhancements:**
+
+- use minitest for windows tests [\#56](https://github.com/chef/train/pull/56) ([chris-rock](https://github.com/chris-rock))
+- use negotiate auth for winrm and not basic\_auth [\#55](https://github.com/chef/train/pull/55) ([mwrock](https://github.com/mwrock))
+- bugfix: pin net-ssh 2.9 in gem file [\#54](https://github.com/chef/train/pull/54) ([chris-rock](https://github.com/chris-rock))
+- Add appveyor and Windows test [\#53](https://github.com/chef/train/pull/53) ([chris-rock](https://github.com/chris-rock))
+- Deprecating winrm-tansport gem [\#46](https://github.com/chef/train/pull/46) ([mwrock](https://github.com/mwrock))
 
 **Fixed bugs:**
 
-- bugfix: command wrapper always return nil [\#50](https://github.com/chef/train/pull/50) ([chris-rock](https://github.com/chris-rock))
+- Cannot install train on Windows with ChefDK if username \>9 chars in length due to spec filename lengths in docker-api gem. [\#28](https://github.com/chef/train/issues/28)
+- Properly wrap commands in powershell for local backend [\#57](https://github.com/chef/train/pull/57) ([chris-rock](https://github.com/chris-rock))
+- Copying https://github.com/test-kitchen/test-kitchen/pull/919 to this repo [\#52](https://github.com/chef/train/pull/52) ([tyler-ball](https://github.com/tyler-ball))
 
-**Merged pull requests:**
+## [v0.9.4](https://github.com/chef/train/tree/v0.9.4) (2016-01-15)
+[Full Changelog](https://github.com/chef/train/compare/v0.9.3...v0.9.4)
+
+**Implemented enhancements:**
 
 - 0.9.3 is empty on Windows [\#48](https://github.com/chef/train/pull/48) ([tyler-ball](https://github.com/tyler-ball))
 - Updating to the latest release of net-ssh to consume https://github.com/net-ssh/net-ssh/pull/280 [\#47](https://github.com/chef/train/pull/47) ([tyler-ball](https://github.com/tyler-ball))
 
+**Fixed bugs:**
+
+- bugfix: command wrapper always return nil [\#50](https://github.com/chef/train/pull/50) ([chris-rock](https://github.com/chris-rock))
+
+**Merged pull requests:**
+
+- 0.9.4 [\#51](https://github.com/chef/train/pull/51) ([chris-rock](https://github.com/chris-rock))
+
 ## [v0.9.3](https://github.com/chef/train/tree/v0.9.3) (2016-01-03)
 [Full Changelog](https://github.com/chef/train/compare/v0.9.2...v0.9.3)
 
 **Implemented enhancements:**
 
+- introduce `mounted` as a separate method to retrieve the content [\#44](https://github.com/chef/train/pull/44) ([chris-rock](https://github.com/chris-rock))
 - Support for local transport on Windows [\#43](https://github.com/chef/train/pull/43) ([chris-rock](https://github.com/chris-rock))
 - Split integration test preparation from executing [\#42](https://github.com/chef/train/pull/42) ([chris-rock](https://github.com/chris-rock))
+- Support for AIX and targeted SSH testing [\#41](https://github.com/chef/train/pull/41) ([foobarbam](https://github.com/foobarbam))
 
 **Merged pull requests:**
 
 - 0.9.3 [\#45](https://github.com/chef/train/pull/45) ([chris-rock](https://github.com/chris-rock))
-- introduce `mounted` as a separate method to retrieve the content [\#44](https://github.com/chef/train/pull/44) ([chris-rock](https://github.com/chris-rock))
-- Support for AIX and targeted SSH testing [\#41](https://github.com/chef/train/pull/41) ([foobarbam](https://github.com/foobarbam))
 
 ## [v0.9.2](https://github.com/chef/train/tree/v0.9.2) (2015-12-11)
 [Full Changelog](https://github.com/chef/train/compare/v0.9.1...v0.9.2)

data/README.md

@@ -89,6 +89,25 @@ puts conn.file('/proc/version').content
 conn.close
 ```
 
+# Testing
+
+We perform `unit`, `integration` and `windows` tests.
+
+* `unit` tests ensure the intended behaviour of the implementation
+* `integration` tests run against VMs and docker containers
+* `windows` tests that run on appveyor for windows integration tests
+
+## Windows
+
+```
+# run windows tests
+bundle exec rake test:windows
+
+# run single tests
+bundle exec ruby -I .\test\windows\ .\test\windows\local_test.rb
+```
+
+
 # Kudos and Contributors
 
 Train is heavily based on the work of:

data/Rakefile

@@ -33,6 +33,12 @@ namespace :test do
     sh('sh', '-c', "cd #{path} && config=test-runner.yaml ruby -I ../../lib docker_test.rb tests/*")
   end
 
+  task :windows do
+    Dir.glob('test/windows/*_test.rb').all? do |file|
+      sh(Gem.ruby, '-w', '-I .\test\windows', file)
+    end or fail 'Failures'
+  end
+
   task :vm do
     concurrency = ENV['CONCURRENCY'] || 4
     path = File.join(File.dirname(__FILE__), 'test', 'integration')

data/lib/train/extras/command_wrapper.rb

@@ -99,12 +99,20 @@ module Train::Extras
     def initialize(backend, options)
       @backend = backend
       validate_options(options)
+    end
 
-      @prefix = 'powershell '
+    def run(script)
+      # wrap the script to ensure we always run it via powershell
+      # especially in local mode, we cannot be sure that we get a Powershell
+      # we may just get a `cmd`.
+      # TODO: we may want to opt for powershell.exe -command instead of `encodeCommand`
+      "powershell -encodedCommand #{WinRM::PowershellScript.new(safe_script(script)).encoded}"
     end
 
-    def run(command)
-      @prefix + command
+    # reused from https://github.com/WinRb/WinRM/blob/master/lib/winrm/command_executor.rb
+    # suppress the progress stream from leaking to stderr
+    def safe_script(script)
+      "$ProgressPreference='SilentlyContinue';" + script
     end
 
     def to_s

data/lib/train/transports/ssh_connection.rb

@@ -20,6 +20,7 @@
 
 require 'net/ssh'
 require 'net/scp'
+require 'timeout'
 
 class Train::Transports::SSH
   # A Connection instance can be generated and re-generated, given new

data/lib/train/transports/winrm.rb

@@ -35,7 +35,7 @@ module Train::Transports
   # @author Matt Wrock <matt@mattwrock.com>
   # @author Salim Afiune <salim@afiunemaya.com.mx>
   # @author Fletcher Nichol <fnichol@nichol.ca>
-  class WinRM < Train.plugin(1) # rubocop:disable Metrics/ClassLength
+  class WinRM < Train.plugin(1)
     name 'winrm'
 
     autoload :Connection, 'train/transports/winrm_connection'
@@ -89,7 +89,7 @@ module Train::Transports
       opts[:endpoint] = "#{scheme}://#{opts[:host]}:#{port}/#{path}"
     end
 
-    WINRM_TRANSPORT_SPEC_VERSION = '~> 1.0'.freeze
+    WINRM_FS_SPEC_VERSION = '~> 0.3'.freeze
 
     # Builds the hash of options needed by the Connection object on
     # construction.
@@ -100,9 +100,9 @@ module Train::Transports
     def connection_options(opts)
       {
         logger:                   logger,
-        winrm_transport:          :plaintext,
-        disable_sspi:             true,
-        basic_auth_only:          true,
+        winrm_transport:          :negotiate,
+        disable_sspi:             false,
+        basic_auth_only:          false,
         endpoint:                 opts[:endpoint],
         user:                     opts[:user],
         pass:                     opts[:password],
@@ -132,39 +132,35 @@ module Train::Transports
 
     # (see Base#load_needed_dependencies!)
     def load_needed_dependencies!
-      spec_version = WINRM_TRANSPORT_SPEC_VERSION.dup
-      logger.debug('Winrm Transport requested,' \
-        " loading WinRM::Transport gem (#{spec_version})")
-      gem 'winrm-transport', spec_version
-      first_load = require 'winrm/transport/version'
+      spec_version = WINRM_FS_SPEC_VERSION.dup
+      logger.debug('winrm-fs requested,' \
+        " loading WinRM::FS gem (#{spec_version})")
+      gem 'winrm-fs', spec_version
+      first_load = require 'winrm-fs'
       load_winrm_transport!
 
-      version = ::WinRM::Transport::VERSION
       if first_load
-        logger.debug("WinRM::Transport #{version} library loaded")
+        logger.debug('WinRM::FS library loaded')
       else
-        logger.debug("WinRM::Transport #{version} previously loaded")
+        logger.debug('WinRM::FS previously loaded')
       end
     rescue LoadError => e
       logger.fatal(
-        "The `winrm-transport' gem is missing and must" \
+        "The `winrm-fs' gem is missing and must" \
         ' be installed or cannot be properly activated. Run' \
-        " `gem install winrm-transport --version '#{spec_version}'`" \
+        " `gem install winrm-fs --version '#{spec_version}'`" \
         ' or add the following to your Gemfile if you are using Bundler:' \
-        " `gem 'winrm-transport', '#{spec_version}'`.",
+        " `gem 'winrm-fs', '#{spec_version}'`.",
       )
       raise Train::UserError,
-            "Could not load or activate WinRM::Transport (#{e.message})"
+            "Could not load or activate WinRM::FS (#{e.message})"
     end
 
     # Load WinRM::Transport code.
     #
     # @api private
     def load_winrm_transport!
-      silence_warnings { require 'winrm' }
-      require 'winrm/transport/shell_closer'
-      require 'winrm/transport/command_executor'
-      require 'winrm/transport/file_transporter'
+      silence_warnings { require 'winrm-fs' }
     end
 
     # Return the last saved WinRM connection instance.

data/lib/train/transports/winrm_connection.rb

@@ -27,7 +27,7 @@ class Train::Transports::WinRM
   # host such as executing commands, transferring files, etc.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
-  class Connection < BaseConnection # rubocop:disable Metrics/ClassLength
+  class Connection < BaseConnection
     def initialize(options)
       super(options)
       @endpoint               = @options.delete(:endpoint)
@@ -42,10 +42,8 @@ class Train::Transports::WinRM
     # (see Base::Connection#close)
     def close
       return if @session.nil?
-      shell_id = session.shell
-      logger.debug("[WinRM] closing remote shell #{shell_id} on #{self}")
+
       session.close
-      logger.debug("[WinRM] remote shell #{shell_id} closed")
     ensure
       @session = nil
     end
@@ -95,10 +93,8 @@ class Train::Transports::WinRM
     def wait_until_ready
       delay = 3
       session(
-        retries: @max_wait_until_ready / delay,
-        delay:   delay,
-        message: "Waiting for WinRM service on #{endpoint}, "\
-                 "retrying in #{delay} seconds",
+        retry_limit: @max_wait_until_ready / delay,
+        retry_delay: delay,
       )
       execute(PING_COMMAND.dup)
     end
@@ -107,16 +103,6 @@ class Train::Transports::WinRM
 
     PING_COMMAND = "Write-Host '[WinRM] Established\n'".freeze
 
-    RESCUE_EXCEPTIONS_ON_ESTABLISH = lambda do
-      [
-        Errno::EACCES, Errno::EADDRINUSE, Errno::ECONNREFUSED,
-        Errno::ECONNRESET, Errno::ENETUNREACH, Errno::EHOSTUNREACH,
-        ::WinRM::WinRMHTTPTransportError, ::WinRM::WinRMAuthorizationError,
-        HTTPClient::KeepAliveDisconnected,
-        HTTPClient::ConnectTimeoutError
-      ].freeze
-    end
-
     # Create a local RDP document and return it
     #
     # @param opts [Hash] configuration options
@@ -136,35 +122,10 @@ class Train::Transports::WinRM
       content
     end
 
-    # Establish a remote shell session on the remote host.
-    #
-    # @param opts [Hash] retry options
-    # @option opts [Integer] :retries the number of times to retry before
-    #   failing
-    # @option opts [Float] :delay the number of seconds to wait until
-    #   attempting a retry
-    # @option opts [String] :message an optional message to be logged on
-    #   debug (overriding the default) when a rescuable exception is raised
-    # @return [Winrm::CommandExecutor] the command executor session
-    # @api private
-    def establish_shell(opts)
-      service_args = [@endpoint, @winrm_transport, options]
-      @service = ::WinRM::WinRMWebService.new(*service_args)
-      closer = WinRM::Transport::ShellCloser.new("#{self}", false, service_args)
-
-      executor = WinRM::Transport::CommandExecutor.new(@service, logger, closer)
-      retryable(opts) do
-        logger.debug("[WinRM] opening remote shell on #{self}")
-        shell_id = executor.open
-        logger.debug("[WinRM] remote shell #{shell_id} is open on #{self}")
-      end
-      executor
-    end
-
     # @return [Winrm::FileTransporter] a file transporter
     # @api private
     def file_transporter
-      @file_transporter ||= WinRM::Transport::FileTransporter.new(session, logger)
+      @file_transporter ||= WinRM::FS::Core::FileTransporter.new(session)
     end
 
     # Builds a `LoginCommand` for use by Linux-based platforms.
@@ -196,38 +157,6 @@ class Train::Transports::WinRM
       LoginCommand.new('mstsc', rdp_doc)
     end
 
-    # Yields to a block and reties the block if certain rescuable
-    # exceptions are raised.
-    #
-    # @param opts [Hash] retry options
-    # @option opts [Integer] :retries the number of times to retry before
-    #   failing
-    # @option opts [Float] :delay the number of seconds to wait until
-    #   attempting a retry
-    # @option opts [String] :message an optional message to be logged on
-    #   debug (overriding the default) when a rescuable exception is raised
-    # @return [Winrm::CommandExecutor] the command executor session
-    # @api private
-    def retryable(opts)
-      yield
-    rescue *RESCUE_EXCEPTIONS_ON_ESTABLISH.call => e
-      if (opts[:retries] -= 1) <= 0
-        logger.warn("[WinRM] connection failed, terminating (#{e.inspect})")
-        raise
-      end
-
-      if opts[:message]
-        logger.debug("[WinRM] connection failed (#{e.inspect})")
-        message = opts[:message]
-      else
-        message = '[WinRM] connection failed, '\
-                  "retrying in #{opts[:delay]} seconds (#{e.inspect})"
-      end
-      logger.info(message)
-      sleep(opts[:delay])
-      retry
-    end
-
     # Establishes a remote shell session, or establishes one when invoked
     # the first time.
     #
@@ -235,10 +164,17 @@ class Train::Transports::WinRM
     # @return [Winrm::CommandExecutor] the command executor session
     # @api private
     def session(retry_options = {})
-      @session ||= establish_shell({
-        retries: @connection_retries.to_i,
-        delay:   @connection_retry_sleep.to_i,
-      }.merge(retry_options))
+      @session ||= begin
+        opts = {
+          retry_limit: @connection_retries.to_i,
+          retry_delay: @connection_retry_sleep.to_i,
+        }.merge(retry_options)
+
+        service_args = [@endpoint, @winrm_transport, options.merge(opts)]
+        @service = ::WinRM::WinRMWebService.new(*service_args)
+        @service.logger = logger
+        @service.create_executor
+      end
     end
 
     # String representation of object, reporting its connection details and

data/lib/train/version.rb

@@ -3,5 +3,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/test/unit/extras/command_wrapper_test.rb

@@ -51,6 +51,7 @@ describe 'powershell command' do
 
   it 'wraps commands in powershell' do
     lc = cls.new(backend, {})
-    lc.run(cmd).must_equal "powershell #{cmd}"
+    tmp =
+    lc.run(cmd).must_equal "powershell -encodedCommand #{WinRM::PowershellScript.new('$ProgressPreference=\'SilentlyContinue\';' + cmd).encoded}"
   end
 end

data/test/windows/local_test.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+# author: Christoph Hartmann
+# author: Dominik Richter
+
+require 'minitest/autorun'
+require 'minitest/spec'
+require 'mocha/setup'
+require 'train'
+
+describe 'windows local command' do
+  let(:conn) {
+    # get final config
+    target_config = Train.target_config({})
+    # initialize train
+    backend = Train.create('local', target_config)
+
+    # start or reuse a connection
+    conn = backend.connection
+    conn
+  }
+
+  it 'verify os' do
+    os = conn.os
+    os[:name].must_equal nil
+    os[:family].must_equal "windows"
+    os[:release].must_equal "Server 2012 R2"
+    os[:arch].must_equal nil
+  end
+
+  it 'run echo test' do
+    cmd = conn.run_command('Write-Output "test"')
+    cmd.stdout.must_equal "test\r\n"
+    cmd.stderr.must_equal ''
+  end
+
+  it 'use powershell piping' do
+    cmd = conn.run_command("New-Object -Type PSObject | Add-Member -MemberType NoteProperty -Name A -Value (Write-Output 'PropertyA') -PassThru | Add-Member -MemberType NoteProperty -Name B -Value (Write-Output 'PropertyB') -PassThru | ConvertTo-Json")
+    cmd.stdout.must_equal "{\r\n    \"A\":  \"PropertyA\",\r\n    \"B\":  \"PropertyB\"\r\n}\r\n"
+    cmd.stderr.must_equal ''
+  end
+
+  after do
+    # close the connection
+    conn.close
+  end
+end

data/test/windows/winrm_test.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+# author: Christoph Hartmann
+# author: Dominik Richter
+
+require 'minitest/autorun'
+require 'minitest/spec'
+require 'mocha/setup'
+require 'train'
+
+describe 'windows local command' do
+  let(:conn) {
+    # get final config
+    target_config = Train.target_config({
+      target: ENV['train_target'],
+      password: ENV['winrm_pass'],
+      ssl: ENV['train_ssl'],
+      self_signed: true,
+    })
+
+    # initialize train
+    backend = Train.create('winrm', target_config)
+
+    # start or reuse a connection
+    conn = backend.connection
+    conn
+  }
+
+  it 'verify os' do
+    os = conn.os
+    os[:name].must_equal nil
+    os[:family].must_equal "windows"
+    os[:release].must_equal "Server 2012 R2"
+    os[:arch].must_equal nil
+  end
+
+  it 'run echo test' do
+    cmd = conn.run_command('Write-Output "test"')
+    cmd.stdout.must_equal "test\r\n"
+    cmd.stderr.must_equal ''
+  end
+
+  it 'use powershell piping' do
+    cmd = conn.run_command("New-Object -Type PSObject | Add-Member -MemberType NoteProperty -Name A -Value (Write-Output 'PropertyA') -PassThru | Add-Member -MemberType NoteProperty -Name B -Value (Write-Output 'PropertyB') -PassThru | ConvertTo-Json")
+    cmd.stdout.must_equal "{\r\n    \"A\":  \"PropertyA\",\r\n    \"B\":  \"PropertyB\"\r\n}\r\n"
+    cmd.stderr.must_equal ''
+  end
+
+  after do
+    # close the connection
+    conn.close
+  end
+end

data/train.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   # 1.9 support is no longer needed here or for Inspec
   spec.add_dependency 'net-ssh', '>= 2.9', '< 4.0'
   spec.add_dependency 'net-scp', '~> 1.2'
-  spec.add_dependency 'winrm', '~> 1.3'
-  spec.add_dependency 'winrm-transport', '~> 1.0'
+  spec.add_dependency 'winrm', '~> 1.6'
+  spec.add_dependency 'winrm-fs', '~> 0.3'
   spec.add_dependency 'docker-api', '~> 1.22'
 
   spec.add_development_dependency 'rake',     '~> 10.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r-train
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: winrm-transport
+  name: winrm-fs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -263,7 +263,6 @@ files:
 - test/integration/.kitchen/logs/default-ubuntu-1404.log
 - test/integration/.kitchen/logs/kitchen.log
 - test/integration/Berksfile
-- test/integration/Berksfile.lock
 - test/integration/bootstrap.sh
 - test/integration/chefignore
 - test/integration/cookbooks/test/metadata.rb
@@ -287,7 +286,6 @@ files:
 - test/integration/tests/path_pipe_test.rb
 - test/integration/tests/path_symlink_test.rb
 - test/integration/tests/run_command_test.rb
-- test/tools/os.rb
 - test/unit/extras/command_wrapper_test.rb
 - test/unit/extras/file_common_test.rb
 - test/unit/extras/linux_file_test.rb
@@ -304,6 +302,8 @@ files:
 - test/unit/transports/mock_test.rb
 - test/unit/transports/ssh_test.rb
 - test/unit/version_test.rb
+- test/windows/local_test.rb
+- test/windows/winrm_test.rb
 - train.gemspec
 homepage: https://github.com/chef/train/
 licenses:
@@ -381,7 +381,6 @@ test_files:
 - test/integration/.kitchen/logs/default-ubuntu-1404.log
 - test/integration/.kitchen/logs/kitchen.log
 - test/integration/Berksfile
-- test/integration/Berksfile.lock
 - test/integration/bootstrap.sh
 - test/integration/chefignore
 - test/integration/cookbooks/test/metadata.rb
@@ -405,7 +404,6 @@ test_files:
 - test/integration/tests/path_pipe_test.rb
 - test/integration/tests/path_symlink_test.rb
 - test/integration/tests/run_command_test.rb
-- test/tools/os.rb
 - test/unit/extras/command_wrapper_test.rb
 - test/unit/extras/file_common_test.rb
 - test/unit/extras/linux_file_test.rb
@@ -422,3 +420,5 @@ test_files:
 - test/unit/transports/mock_test.rb
 - test/unit/transports/ssh_test.rb
 - test/unit/version_test.rb
+- test/windows/local_test.rb
+- test/windows/winrm_test.rb

data/test/integration/Berksfile.lock

@@ -1,8 +0,0 @@
-DEPENDENCIES
-  sudo (~> 2.7.2)
-  test
-    path: cookbooks/test
-
-GRAPH
-  sudo (2.7.2)
-  test (0.0.0)

data/test/tools/os.rb

@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-require 'train'
-
-train = Train.create('local')
-
-# start or reuse a connection
-conn = train.connection
-os = conn.os
-
-# get OS info
-conf = {
-  name:    os[:name],
-  family:  os[:family],
-  release: os[:release],
-  arch:    os[:arch],
-}
-puts JSON.dump(conf)
-
-# close the connection
-conn.close