lib/serverspec/helper.rb in serverspec-0.1.6 vs lib/serverspec/helper.rb in serverspec-0.1.7
- old
+ new
@@ -1,10 +1,10 @@
require 'etc'
module Serverspec
module SshHelper
- def ssh_exec(cmd, opt={})
+ def do_check(cmd, opt={})
cmd = "sudo #{cmd}" if not RSpec.configuration.ssh.options[:user] == 'root'
ssh_exec!(cmd)
end
private
@@ -39,10 +39,19 @@
end
end
ssh.loop
{ :stdout => stdout_data, :stderr => stderr_data, :exit_code => exit_code, :exit_signal => exit_signal }
end
+ end
+ module ExecHelper
+ def do_check(cmd, opts={})
+ stdout = `#{cmd} 2>&1`
+ # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
+ #stdout, stderr, status = Open3.capture3(cmd)
+ { :stdout => stdout, :stderr => nil,
+ :exit_code => $?, :exit_signal => nil }
+ end
end
module RedHatHelper
def commands
Serverspec::Commands::RedHat.new