train 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bef12aa9d490abb7a8b9e33416f0073bbc4fe3f
-  data.tar.gz: b66c3e02c956534b72cc9b7b4b3026203abf2f77
+  metadata.gz: c99003b292f41d03c790974f1aabd9b0ad7792cf
+  data.tar.gz: 7b2ffa667c8eba8fe0440a8a63483f88f19a4aa5
 SHA512:
-  metadata.gz: 803a0fdf661f82aefb707e3fe8f6aeba968cf04571ed58b851198a79d2a169ea58a70cc806e06fa7d025eab6e48e56b57192f16865fa83e6cd839933ac9280e6
-  data.tar.gz: d37fa6a60ce6dc33a12d3d5972a8341b2ee52667c9a4cbd1d733ed7e00504572842d722ac7ae70e344e5e81888489d789731660faafd45944db753137effa3e8
+  metadata.gz: df622e11873f9e6583ced3fed9c953a513aa3dd0acdf4bc2c2ec5f60f81f64220691e08a45e729937257e62ab19f38aed9e548614a004cbe471655393e671b06
+  data.tar.gz: 709616bea4c244942aa2d0d8929a27a140090b93b55b37e4edcd9cb68033b925d981810328ed69b904cfb323b89ebfecacd75a8bcdf2baf14e205357f05e45a7

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [0.18.0](https://github.com/chef/train/tree/0.18.0) (2016-08-26)
-[Full Changelog](https://github.com/chef/train/compare/v0.17.0...0.18.0)
+## [0.19.0](https://github.com/chef/train/tree/0.19.0) (2016-09-05)
+[Full Changelog](https://github.com/chef/train/compare/v0.18.0...0.19.0)
+
+**Fixed bugs:**
+
+- use stat -c for alpine linux [\#146](https://github.com/chef/train/pull/146) ([chris-rock](https://github.com/chris-rock))
+
+**Merged pull requests:**
+
+- support ruby 2.2.1 [\#145](https://github.com/chef/train/pull/145) ([chris-rock](https://github.com/chris-rock))
+- Use winrm v2 implementation [\#122](https://github.com/chef/train/pull/122) ([mwrock](https://github.com/mwrock))
+
+## [v0.18.0](https://github.com/chef/train/tree/v0.18.0) (2016-08-26)
+[Full Changelog](https://github.com/chef/train/compare/v0.17.0...v0.18.0)
 
 **Merged pull requests:**
 

data/Gemfile

@@ -8,7 +8,7 @@ if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
   gem 'net-ssh', '~> 2.9'
 end
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2')
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
   gem 'json', '< 2.0'
   gem 'rack', '< 2.0'
 end

data/README.md

@@ -101,6 +101,12 @@ We perform `unit`, `integration` and `windows` tests.
 * `integration` tests run against VMs and docker containers
 * `windows` tests that run on appveyor for windows integration tests
 
+## Mac/Linux
+
+```
+bundle exec ruby -W -Ilib:test/unit test/unit/extras/stat_test.rb
+```
+
 ## Windows
 
 ```

data/lib/train/extras/command_wrapper.rb

@@ -3,7 +3,6 @@
 # author: Christoph Hartmann
 
 require 'base64'
-require 'winrm'
 require 'train/errors'
 
 module Train::Extras
@@ -114,15 +113,22 @@ module Train::Extras
       # 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}"
+      "powershell -encodedCommand #{encoded(safe_script(script))}"
     end
 
-    # 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
 
+    # Encodes the script so that it can be passed to the PowerShell
+    # --EncodedCommand argument.
+    # @return [String] The UTF-16LE base64 encoded script
+    def encoded(script)
+      encoded_script = safe_script(script).encode('UTF-16LE', 'UTF-8')
+      Base64.strict_encode64(encoded_script)
+    end
+
     def to_s
       'PowerShell CommandWrapper'
     end

data/lib/train/extras/stat.rb

@@ -34,9 +34,8 @@ module Train::Extras
 
     def self.linux_stat(shell_escaped_path, backend, follow_symlink)
       lstat = follow_symlink ? ' -L' : ''
-      format = backend.os.esx? ? '-c' : '--printf'
+      format = (backend.os.esx? || backend.os[:name] == 'alpine') ? '-c' : '--printf'
       res = backend.run_command("stat#{lstat} #{shell_escaped_path} 2>/dev/null #{format} '%s\n%f\n%U\n%u\n%G\n%g\n%X\n%Y\n%C'")
-
       # ignore the exit_code: it is != 0 if selinux labels are not supported
       # on the system.
 

data/lib/train/transports/winrm.rb

@@ -89,7 +89,7 @@ module Train::Transports
       opts[:endpoint] = "#{scheme}://#{opts[:host]}:#{port}/#{path}"
     end
 
-    WINRM_FS_SPEC_VERSION = '~> 0.3'.freeze
+    WINRM_FS_SPEC_VERSION = '~> 1.0'.freeze
 
     # Builds the hash of options needed by the Connection object on
     # construction.
@@ -100,12 +100,12 @@ module Train::Transports
     def connection_options(opts)
       {
         logger:                   logger,
-        winrm_transport:          :negotiate,
+        transport:                :negotiate,
         disable_sspi:             false,
         basic_auth_only:          false,
         endpoint:                 opts[:endpoint],
         user:                     opts[:user],
-        pass:                     opts[:password],
+        password:                 opts[:password],
         rdp_port:                 opts[:rdp_port],
         connection_retries:       opts[:connection_retries],
         connection_retry_sleep:   opts[:connection_retry_sleep],

data/lib/train/transports/winrm_connection.rb

@@ -30,9 +30,7 @@ class Train::Transports::WinRM
   class Connection < BaseConnection
     def initialize(options)
       super(options)
-      @endpoint               = @options.delete(:endpoint)
       @rdp_port               = @options.delete(:rdp_port)
-      @winrm_transport        = @options.delete(:winrm_transport)
       @connection_retries     = @options.delete(:connection_retries)
       @connection_retry_sleep = @options.delete(:connection_retry_sleep)
       @max_wait_until_ready   = @options.delete(:max_wait_until_ready)
@@ -59,11 +57,11 @@ class Train::Transports::WinRM
       logger.debug("[WinRM] #{self} (#{command})")
       out = ''
 
-      response = session.run_powershell_script(command) do |stdout, _|
+      response = session.run(command) do |stdout, _|
         out << stdout if stdout
       end
 
-      CommandResult.new(out, response.stderr, response[:exitcode])
+      CommandResult.new(out, response.stderr, response.exitcode)
     end
 
     # (see Base::Connection#login_command)
@@ -98,7 +96,7 @@ class Train::Transports::WinRM
     end
 
     def uri
-      "winrm://#{options[:user]}@#{@endpoint}:#{@rdp_port}"
+      "winrm://#{options[:user]}@#{options[:endpoint]}:#{@rdp_port}"
     end
 
     private
@@ -112,7 +110,7 @@ class Train::Transports::WinRM
     #   Mac system
     # @api private
     def rdp_doc(opts = {})
-      host = URI.parse(@endpoint).host
+      host = URI.parse(options[:endpoint]).host
       content = [
         "full address:s:#{host}:#{@rdp_port}",
         'prompt for credentials:i:1',
@@ -139,7 +137,7 @@ class Train::Transports::WinRM
     def login_command_for_linux
       args  = %W( -u #{options[:user]} )
       args += %W( -p #{options[:pass]} ) if options.key?(:pass)
-      args += %W( #{URI.parse(@endpoint).host}:#{@rdp_port} )
+      args += %W( #{URI.parse(options[:endpoint]).host}:#{@rdp_port} )
       LoginCommand.new('rdesktop', args)
     end
 
@@ -172,10 +170,9 @@ class Train::Transports::WinRM
           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 = ::WinRM::Connection.new(options.merge(opts))
         @service.logger = logger
-        @service.create_executor
+        @service.shell(:powershell)
       end
     end
 
@@ -184,7 +181,7 @@ class Train::Transports::WinRM
     #
     # @api private
     def to_s
-      "#{@winrm_transport}::#{@endpoint}<#{options.inspect}>"
+      "<#{options.inspect}>"
     end
 
     class OS < OSCommon

data/lib/train/version.rb

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

data/test/unit/extras/command_wrapper_test.rb

@@ -60,19 +60,3 @@ describe 'linux command' do
     lc.run(cmd).must_equal "echo #{bpw} | base64 --decode | #{sudo_command} -S #{cmd}"
   end
 end
-
-describe 'powershell command' do
-  let(:cls) { Train::Extras::PowerShellCommand }
-  let(:cmd) { rand.to_s }
-  let(:backend) {
-    backend = Train::Transports::Mock.new.connection
-    backend.mock_os({ family: 'windows' })
-    backend
-  }
-
-  it 'wraps commands in powershell' do
-    lc = cls.new(backend, {})
-    tmp =
-    lc.run(cmd).must_equal "powershell -encodedCommand #{WinRM::PowershellScript.new('$ProgressPreference=\'SilentlyContinue\';' + cmd).encoded}"
-  end
-end

data/test/unit/extras/stat_test.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'helper'
 require 'train/extras'
+require 'train/transports/mock'
 
 describe 'stat' do
   let(:cls) { Train::Extras::Stat }
@@ -42,27 +43,22 @@ describe 'stat' do
   end
 
   describe 'linux stat' do
-    let(:backend) { Minitest::Mock.new }
+    let(:backend) {
+      mock = Train::Transports::Mock.new(verbose: true).connection
+      mock.mock_os({ name: 'ubuntu', family: 'debian', release: '15.04', arch: 'x86_64' })
+      mock.commands = {
+        "stat /path 2>/dev/null --printf '%s\n%f\n%U\n%u\n%G\n%g\n%X\n%Y\n%C'" => mock.mock_command('', '', '', 0),
+        "stat /path-stat 2>/dev/null --printf '%s\n%f\n%U\n%u\n%G\n%g\n%X\n%Y\n%C'" => mock.mock_command('', "360\n43ff\nroot\n0\nrootz\n1\n1444520846\n1444522445\n?", '', 0),
+      }
+      mock
+    }
 
     it 'ignores wrong stat results' do
-      res = Minitest::Mock.new
-      os = Minitest::Mock.new
-      res.expect :stdout, ''
-      os.expect :esx?, false
-      backend.expect :os, os
-      backend.expect :run_command, res, [String]
       cls.linux_stat('/path', backend, false).must_equal({})
     end
 
     it 'reads correct stat results' do
-      res = Minitest::Mock.new
-      os = Minitest::Mock.new
-      # 43ff is 41777; linux_stat strips the 4
-      res.expect :stdout, "360\n43ff\nroot\n0\nrootz\n1\n1444520846\n1444522445\n?"
-      os.expect :esx?, false
-      backend.expect :os, os
-      backend.expect :run_command, res, [String]
-      cls.linux_stat('/path', backend, false).must_equal({
+      cls.linux_stat('/path-stat', backend, false).must_equal({
         type: :directory,
         mode: 01777,
         owner: 'root',
@@ -77,27 +73,52 @@ describe 'stat' do
   end
 
   describe 'esx stat' do
-    let(:backend) { Minitest::Mock.new }
+    let(:backend) {
+      mock = Train::Transports::Mock.new(verbose: true).connection
+      mock.mock_os({ name: 'vmkernel', family: 'esx', release: '5' })
+      mock.commands = {
+        "stat /path 2>/dev/null -c '%s\n%f\n%U\n%u\n%G\n%g\n%X\n%Y\n%C'" => mock.mock_command('', '', '', 0),
+        "stat /path-stat 2>/dev/null -c '%s\n%f\n%U\n%u\n%G\n%g\n%X\n%Y\n%C'" => mock.mock_command('', "360\n43ff\nroot\n0\nrootz\n1\n1444520846\n1444522445\n?", '', 0),
+      }
+      mock
+    }
 
     it 'ignores wrong stat results' do
-      res = Minitest::Mock.new
-      os = Minitest::Mock.new
-      res.expect :stdout, ''
-      os.expect :esx?, true
-      backend.expect :os, os
-      backend.expect :run_command, res, [String]
       cls.linux_stat('/path', backend, false).must_equal({})
     end
 
     it 'reads correct stat results' do
-      res = Minitest::Mock.new
-      os = Minitest::Mock.new
-      # 43ff is 41777; linux_stat strips the 4
-      res.expect :stdout, "360\n43ff\nroot\n0\nrootz\n1\n1444520846\n1444522445\nC"
-      os.expect :esx?, true
-      backend.expect :os, os
-      backend.expect :run_command, res, [String]
-      cls.linux_stat('/path', backend, false).must_equal({
+      cls.linux_stat('/path-stat', backend, false).must_equal({
+        type: :directory,
+        mode: 01777,
+        owner: 'root',
+        uid: 0,
+        group: 'rootz',
+        gid: 1,
+        mtime: 1444522445,
+        size: 360,
+        selinux_label: nil,
+      })
+    end
+  end
+
+  describe 'alpine stat' do
+    let(:backend) {
+      mock = Train::Transports::Mock.new(verbose: true).connection
+      mock.mock_os({ name: 'alpine', family: 'alpine', release: nil })
+      mock.commands = {
+        "stat /path 2>/dev/null -c '%s\n%f\n%U\n%u\n%G\n%g\n%X\n%Y\n%C'" => mock.mock_command('', '', '', 0),
+        "stat /path-stat 2>/dev/null -c '%s\n%f\n%U\n%u\n%G\n%g\n%X\n%Y\n%C'" => mock.mock_command('', "360\n43ff\nroot\n0\nrootz\n1\n1444520846\n1444522445\n?", '', 0),
+      }
+      mock
+    }
+
+    it 'ignores wrong stat results' do
+      cls.linux_stat('/path', backend, false).must_equal({})
+    end
+
+    it 'reads correct stat results' do
+      cls.linux_stat('/path-stat', backend, false).must_equal({
         type: :directory,
         mode: 01777,
         owner: 'root',

data/train.gemspec

@@ -30,8 +30,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.6'
-  spec.add_dependency 'winrm-fs', '~> 0.3'
+  spec.add_dependency 'winrm', '~> 2.0'
+  spec.add_dependency 'winrm-fs', '~> 1.0'
   spec.add_dependency 'docker-api', '~> 1.26'
 
   spec.add_development_dependency 'mocha', '~> 1.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -84,28 +84,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: winrm-fs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement