train 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27272a96b77df4648d1e5519b86108666b5c05d2
-  data.tar.gz: 74c670d0e4b34eb6c56468055c565e0894b756ad
+  metadata.gz: a2cde6d0b9f6ea8da37ae37106dc7c74c23c7c9c
+  data.tar.gz: db3a0053dc788fcd319813f1622b5f0846afa0d2
 SHA512:
-  metadata.gz: 0b5c0ee5b61cbb5e7095a41d16e58f746873c09f03a771d9507e16258806c03c9ae61ba0fe3894e1a82cd9145a3056c7db07c4af813a089a72e3ea33a5e6b272
-  data.tar.gz: 93a304ceede19c18bb8cb8c7becfd06a02f9b6b1ea79f07200c2b24fa4dafcdee58e71de4be69c4ec7415b33e781f3b5886f376b85dfd8f128e090a845dd5b74
+  metadata.gz: 5d9d13c1fe04f144ad35c717b33eb11399cedd205fbbb0e63510d3ed474e961cc879024122b2e4b60ebcbbca883bce7febadbb97eb67acb9e22d0d2ed83d4de4
+  data.tar.gz: d6430db80f1620f4842afeef5dd9e1f322f5024f22c9c7dce9cbc894d2f2a8c7abd2dacb153300c93c889dc1d6a1200591660303c9c1a8ac8f60ed5270cd96db

data/CHANGELOG.md

@@ -1,7 +1,23 @@
 # Change Log
 
-## [0.12.1](https://github.com/chef/train/tree/0.12.1) (2016-05-23)
-[Full Changelog](https://github.com/chef/train/compare/v0.12.0...0.12.1)
+## [0.13.0](https://github.com/chef/train/tree/0.13.0) (2016-06-16)
+[Full Changelog](https://github.com/chef/train/compare/v0.12.1...0.13.0)
+
+**Implemented enhancements:**
+
+- provide uri-formatted information on all connections [\#113](https://github.com/chef/train/pull/113) ([arlimus](https://github.com/arlimus))
+
+**Fixed bugs:**
+
+- Authentication with SSH Server on OSX is failing [\#111](https://github.com/chef/train/issues/111)
+
+**Merged pull requests:**
+
+- adding support for vmware's esx server [\#114](https://github.com/chef/train/pull/114) ([Anirudh-Gupta](https://github.com/Anirudh-Gupta))
+- add missing keyboard-interactive authentication method [\#112](https://github.com/chef/train/pull/112) ([chris-rock](https://github.com/chris-rock))
+
+## [v0.12.1](https://github.com/chef/train/tree/v0.12.1) (2016-05-23)
+[Full Changelog](https://github.com/chef/train/compare/v0.12.0...v0.12.1)
 
 **Fixed bugs:**
 

data/lib/train/extras/os_common.rb

@@ -59,6 +59,9 @@ module Train::Extras
       'hpux' => %w{
         hpux
       },
+      'esx' => %w{
+        esx
+      },
     }
 
     OS['linux'] = %w{linux alpine arch coreos exherbo gentoo slackware} + OS['redhat'] + OS['debian'] + OS['suse']
@@ -109,6 +112,7 @@ module Train::Extras
 
       return detect_windows if pf == 'windows'
       return detect_darwin if pf == 'darwin'
+      return detect_esx if pf == 'esx'
 
       if %w{freebsd netbsd openbsd aix solaris2 hpux}.include?(pf)
         return detect_via_uname

data/lib/train/extras/os_detect_esx.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+# author: Dominik Richter
+# author: Christoph Hartmann
+#
+# This is heavily based on:
+#
+#   OHAI https://github.com/chef/ohai
+#   by Adam Jacob, Chef Software Inc
+#
+
+module Train::Extras
+  module DetectEsx
+    def detect_esx
+      @platform[:family] = 'esx'
+      @platform[:name] = uname_s.lines[0].chomp
+      @platform[:release] = uname_r.lines[0].chomp
+      true
+    end
+  end
+end

data/lib/train/transports/docker.rb

@@ -92,6 +92,14 @@ class Train::Transports::Docker
       raise
     end
 
+    def uri
+      if @container.nil?
+        "docker://#{@id}"
+      else
+        "docker://#{@container.id}"
+      end
+    end
+
     class OS < OSCommon
       def initialize(backend)
         # hardcoded to unix/linux for now, until other operating systems

data/lib/train/transports/local.rb

@@ -47,6 +47,10 @@ module Train::Transports
       def login_command
         nil # none, open your shell
       end
+
+      def uri
+        'local://'
+      end
     end
   end
 end

data/lib/train/transports/mock.rb

@@ -70,6 +70,10 @@ class Train::Transports::Mock
       @commands = {}
     end
 
+    def uri
+      'mock://'
+    end
+
     def mock_os(value)
       @os = OS.new(self, value)
     end

data/lib/train/transports/ssh.rb

@@ -95,7 +95,7 @@ module Train::Transports
       end
 
       unless options[:password].nil?
-        options[:auth_methods].push('password')
+        options[:auth_methods].push('password', 'keyboard-interactive')
       end
 
       super

data/lib/train/transports/ssh_connection.rb

@@ -151,6 +151,10 @@ class Train::Transports::SSH
       execute(PING_COMMAND.dup)
     end
 
+    def uri
+      "ssh://#{@username}@#{@hostname}:#{@port}"
+    end
+
     private
 
     PING_COMMAND = "echo '[SSH] Established'".freeze

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
+  class Connection < BaseConnection # rubocop:disable Metrics/ClassLength
     def initialize(options)
       super(options)
       @endpoint               = @options.delete(:endpoint)
@@ -42,7 +42,6 @@ class Train::Transports::WinRM
     # (see Base::Connection#close)
     def close
       return if @session.nil?
-
       session.close
     ensure
       @session = nil
@@ -99,6 +98,10 @@ class Train::Transports::WinRM
       execute(PING_COMMAND.dup)
     end
 
+    def uri
+      "winrm://#{options[:user]}@#{@endpoint}:#{@rdp_port}"
+    end
+
     private
 
     PING_COMMAND = "Write-Host '[WinRM] Established\n'".freeze

data/lib/train/version.rb

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

data/test/unit/extras/os_common_test.rb

@@ -259,11 +259,19 @@ describe 'os common plugin' do
   end
 
   describe 'with platform set to hpux' do
-  let(:os) { mock_platform('hpux') }
-  it { os.solaris?.must_equal(false) }
-  it { os.linux?.must_equal(false) }
-  it { os.unix?.must_equal(true) }
-  it { os.hpux?.must_equal(true) }
-end
+    let(:os) { mock_platform('hpux') }
+    it { os.solaris?.must_equal(false) }
+    it { os.linux?.must_equal(false) }
+    it { os.unix?.must_equal(true) }
+    it { os.hpux?.must_equal(true) }
+  end
+
+  describe 'with platform set to esx' do
+    let(:os) { mock_platform('esx') }
+    it { os.solaris?.must_equal(false) }
+    it { os.linux?.must_equal(false) }
+    it { os.unix?.must_equal(false) }
+    it { os.esx?.must_equal(true) }
+  end
 
 end

data/test/unit/transports/local_test.rb

@@ -32,6 +32,10 @@ describe 'local transport' do
     connection.must_be_kind_of Train::Transports::Local::Connection
   end
 
+  it 'provides a uri' do
+    connection.uri.must_equal "local://"
+  end
+
   it 'doesnt wait to be read' do
     connection.wait_until_ready.must_be_nil
   end

data/test/unit/transports/mock_test.rb

@@ -15,6 +15,10 @@ describe 'mock transport' do
     connection.wont_be_nil
   end
 
+  it 'provides a uri' do
+    connection.uri.must_equal 'mock://'
+  end
+
   describe 'when running a mocked command' do
     let(:mock_cmd) {  }
 

data/test/unit/transports/ssh_test.rb

@@ -52,6 +52,10 @@ describe 'ssh transport' do
       connection.must_be_kind_of Train::Transports::SSH::Connection
     end
 
+    it 'provides a uri' do
+      connection.uri.must_equal "ssh://root@#{conf[:host]}:22"
+    end
+
     it 'must respond to wait_until_ready' do
       connection.must_respond_to :wait_until_ready
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -153,6 +153,7 @@ files:
 - lib/train/extras/linux_lsb.rb
 - lib/train/extras/os_common.rb
 - lib/train/extras/os_detect_darwin.rb
+- lib/train/extras/os_detect_esx.rb
 - lib/train/extras/os_detect_linux.rb
 - lib/train/extras/os_detect_unix.rb
 - lib/train/extras/os_detect_windows.rb
@@ -240,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Transport interface to talk to different backends.