specinfra 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8389569d770c22c4bca42552eef6a1ec767fd6
-  data.tar.gz: e5ac166c60ea3b00672f862c4fa7dd569e7437b8
+  metadata.gz: 0a2dbc0cad70c29af27ba9302a8f8e2c12ee0319
+  data.tar.gz: 44678a39c8799d2a3d3f3345395afc158cf81694
 SHA512:
-  metadata.gz: b2ccd1dc40d8777188fd05d6c94e6ae0ec8db52b99e80dab2e2c903e63148297d52c3f450c4e26c53d13282d457e8b3939cc247cbd58c037b42a751e6e9ad7ec
-  data.tar.gz: 35d6956665c667c04453e8c4a8aef5b7199ed7feae0fbe7c00a150dc9af5c3741eb5566805703fc1c02798561fc3f6aa7c74d5604c9eba2b80f494f1b47c631f
+  metadata.gz: 8c8206acbcbd6d1cf32699c5eacc586d1ce80f3a614bdc8adca7857e2ecc1532a586699729e8a77bf6d692a88fb1063ca4588e0805e2be2e524a9fe529bb5e68
+  data.tar.gz: b2ec935f95136a99b787fbe2fcfcc5a156c603c934550fa302cfbff0f0052bfe285ef6f80aa581963eb60755a9cb56a8e86c32f8d919dd4f6b455a6965d86eaf

data/lib/specinfra/backend/ssh.rb

@@ -61,14 +61,16 @@ module SpecInfra
 
         ssh = SpecInfra.configuration.ssh
         ssh.open_channel do |channel|
-          channel.request_pty do |ch, success|
-            abort "Could not obtain pty " if !success
+          if not SpecInfra.configuration.sudo_password.nil?
+            # We don't need a PTY because we don't have a sudo password
+            channel.request_pty do |ch, success|
+              abort "Could not obtain pty " if !success
+            end
           end
           channel.exec("#{command}") do |ch, success|
             abort "FAILED: couldn't execute command (ssh.channel.exec)" if !success
             channel.on_data do |ch, data|
               if data.match pass_prompt
-                abort "Please set sudo password by using SUDO_PASSWORD or ASK_SUDO_PASSWORD environment variable" if SpecInfra.configuration.sudo_password.nil?
                 channel.send_data "#{SpecInfra.configuration.sudo_password}\n"
               else
                 stdout_data += data
@@ -76,7 +78,11 @@ module SpecInfra
             end
 
             channel.on_extended_data do |ch, type, data|
-              stderr_data += data
+              if data.match /^sudo: no tty present and no askpass program specified/
+                abort "Please set sudo password by using SUDO_PASSWORD or ASK_SUDO_PASSWORD environment variable"
+              else
+                stderr_data += data
+              end
             end
 
             channel.on_request("exit-status") do |ch, data|

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Gosuke Miyashita