train 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d60ce40a522d7af91a59bdb5f15941acf9f82eb
-  data.tar.gz: 552f32a77ec6bcdad57b357f971e15f45ee0ec5e
+  metadata.gz: f020e9a89665da74d365404f73545dc4013e7b5d
+  data.tar.gz: 7f2bb4294fa689083feafe2c3f15292526a16b9b
 SHA512:
-  metadata.gz: ef95521317b7e46c62634ac127b88a6ca9269eefa812af6ecf43c57605c33df8e7e4c3cf96a32b43150c43f2bf7789f45ed0f5eab25ebd9689fe3bc6c8871d70
-  data.tar.gz: 29ca1962b80a976439dada139cc604bedbad1cda2bd01bfd68a64ad7cc00602fc365d778f58391ec62a4897d918d4cd7f816fc6175e1133c23f1d99f8e957eb6
+  metadata.gz: 83841c985b413817cab9d1a32dd8994da7a28c15b4970f913ecc1efe7fa73cf7e67307c8d3072c679148ee211457a81b48d908111b6ed2e31162d67e55ae4e16
+  data.tar.gz: c4e458d0b9bfeec58c308c9620bd492063f614abd30b48e0aadef3d2fb74e5f0c3174cc1783a07e6f45a1a49c61451b667bf57ee575ed40df90ab78130398b20

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 
-## [0.14.2](https://github.com/chef/train/tree/0.14.2) (2016-06-28)
-[Full Changelog](https://github.com/chef/train/compare/v0.14.1...0.14.2)
+## [0.15.0](https://github.com/chef/train/tree/0.15.0) (2016-07-01)
+[Full Changelog](https://github.com/chef/train/compare/v0.14.2...0.15.0)
+
+**Implemented enhancements:**
+
+- have net-ssh request a pty [\#60](https://github.com/chef/train/issues/60)
+
+**Merged pull requests:**
+
+- Allow requesting a PTY [\#121](https://github.com/chef/train/pull/121) ([srenatus](https://github.com/srenatus))
+
+## [v0.14.2](https://github.com/chef/train/tree/v0.14.2) (2016-06-28)
+[Full Changelog](https://github.com/chef/train/compare/v0.14.1...v0.14.2)
 
 **Merged pull requests:**
 
@@ -32,7 +43,6 @@
 
 **Implemented enhancements:**
 
-- have net-ssh request a pty [\#60](https://github.com/chef/train/issues/60)
 - use train as gem name. Thanks @halo [\#115](https://github.com/chef/train/pull/115) ([chris-rock](https://github.com/chris-rock))
 
 ## [v0.13.0](https://github.com/chef/train/tree/v0.13.0) (2016-06-16)

data/lib/train/transports/ssh.rb

@@ -27,6 +27,7 @@ module Train::Transports
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
   class SSHFailed < Train::TransportError; end
+  class SSHPTYFailed < Train::TransportError; end
 
   # A Transport which uses the SSH protocol to execute commands and transfer
   # files.
@@ -55,6 +56,7 @@ module Train::Transports
     option :connection_retry_sleep, default: 1
     option :max_wait_until_ready, default: 600
     option :compression, default: false
+    option :pty, default: false
 
     option :compression_level do |opts|
       # on nil or false: set compression level to 0
@@ -98,6 +100,10 @@ module Train::Transports
         options[:auth_methods].push('password', 'keyboard-interactive')
       end
 
+      if options[:pty]
+        logger.warn('[SSH] PTY requested: stderr will be merged into stdout')
+      end
+
       super
       self
     end

data/lib/train/transports/ssh_connection.rb

@@ -79,6 +79,12 @@ class Train::Transports::SSH
         # wrap commands if that is configured
         cmd = @cmd_wrapper.run(cmd) unless @cmd_wrapper.nil?
 
+        if @transport_options[:pty]
+          channel.request_pty do |_ch, success|
+            fail Train::Transports::SSHPTYFailed, 'Requesting PTY failed' unless success
+          end
+        end
+
         channel.exec(cmd) do |_, success|
           abort 'Couldn\'t execute command on SSH.' unless success
 

data/lib/train/version.rb

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

data/test/unit/transports/ssh_test.rb

@@ -42,6 +42,10 @@ describe 'ssh transport' do
     it 'has default user' do
       ssh.options[:user].must_equal 'root'
     end
+
+    it 'by default does not request a pty' do
+      ssh.options[:pty].must_equal false
+    end
   end
 
   describe 'opening a connection' do
@@ -83,7 +87,7 @@ describe 'ssh transport' do
   end
 
   describe 'converting connection to string for logging' do
-   it "masks passwords" do
+   it 'masks passwords' do
       assert_output(/.*:password=>"<hidden>".*/) do
         connection = cls.new(conf).connection
         puts "#{connection}"
@@ -96,7 +100,7 @@ describe 'ssh transport' do
       cls.new(conf).connection
     end
 
-    it 'doesnt like host == nil' do
+    it 'does not like host == nil' do
       conf.delete(:host)
       proc { cls.new(conf).connection }.must_raise Train::ClientError
     end
@@ -106,13 +110,13 @@ describe 'ssh transport' do
       cls.new(conf).connection.method(:options).call[:user] == 'root'
     end
 
-    it 'doesnt like key and password == nil' do
+    it 'does not like key and password == nil' do
       conf.delete(:password)
       conf.delete(:key_files)
       proc { cls.new(conf).connection }.must_raise Train::ClientError
     end
 
-    it 'wont connect if its not possible' do
+    it 'wont connect if it is not possible' do
       conf[:host] = 'localhost'
       conf[:port] = 1
       conn = cls.new(conf).connection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json