specinfra 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bacb556c1f796acbe69ed5938cf62d3c89a8f07
-  data.tar.gz: 61e3d38bfc530ddeb37bb0b57d11e7bcf842df02
+  metadata.gz: b5a1b9593e6f23fee8bebb1f8e7dcfb2391c0601
+  data.tar.gz: b9487549c2ff9b766a6e345f13d96a0fdc6a4be0
 SHA512:
-  metadata.gz: 41dfbeed359f730a2847c0c60132252ca0333079778729e9ddf5584cf14761305c2129d6bd0d4b61254d2515f4adc31d1dc82fbce9385be8207277fd17b91a43
-  data.tar.gz: d9e7b9c85af23432736b4e64a31cd2d87b57e1fdafa5e21ff8c434fd086bec2836da8264ff834f0d003a2f2f918399102f5eee142fd0e2a3d877f452e7bfce7c
+  metadata.gz: ee185a53cc56616a8465bcf89e64ec01db1f31cd12e1962cd6e34c1c53cdc5467d7cda3aa06efe9112d96b0f7a14cfd1a3f80c6d19b8f6eda37dd2bc1ad6963b
+  data.tar.gz: bd139216ad6a2be63dc952eac9a16530b36003780e478128e3a1c077fd6521cc3901a264de313261e430e3107ad3ff00098cc91d2753ce44454a6484228bd6a8

data/lib/specinfra/backend/ssh.rb

@@ -13,6 +13,7 @@ module Specinfra::Backend
       end
 
       ret[:stdout].gsub!(/\r\n/, "\n")
+      ret[:stdout].gsub!(/\A\n/, "") if sudo?
 
       if @example
         @example.metadata[:command] = cmd
@@ -35,9 +36,7 @@ module Specinfra::Backend
 
     def build_command(cmd)
       cmd = super(cmd)
-      user = Specinfra.configuration.ssh_options[:user]
-      disable_sudo = Specinfra.configuration.disable_sudo
-      if user != 'root' && !disable_sudo
+      if sudo?
         cmd = "#{sudo} -p '#{prompt}' #{cmd}"
       end
       cmd
@@ -156,5 +155,11 @@ module Specinfra::Backend
 
       "#{sudo_path.shellescape}#{sudo_options}"
     end
+
+    def sudo?
+      user = Specinfra.configuration.ssh_options[:user]
+      disable_sudo = Specinfra.configuration.disable_sudo
+      user != 'root' && !disable_sudo
+    end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh