serverspec 0.5.6 → 0.5.7

data/lib/serverspec/backend/ssh.rb

@@ -24,7 +24,11 @@ module Serverspec
 
       def add_pre_command(cmd)
         cmd = super(cmd)
-        cmd = "sudo #{cmd}" if RSpec.configuration.ssh.options[:user] != 'root'
+        user = RSpec.configuration.ssh.options[:user]
+        pre_command = Serverspec.configuration.pre_command
+        if pre_command && user != 'root'
+          cmd = "sudo #{cmd}"
+        end
         cmd
       end
 

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/spec/backend/ssh/configuration_spec.rb

@@ -61,6 +61,20 @@ describe 'pre_command is set and user is non-root' do
   end
 end
 
+describe 'pre_command is not set and user is non-root' do
+  before :all do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'foo' } }
+      c.ssh = ssh
+    end
+  end
+
+  context package('httpd') do
+    its(:command) { should eq 'sudo command' }
+  end
+end
+
+
 describe 'path pre_command and set and user is non-root' do
   before :all do
     RSpec.configure do |c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -354,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your servers provisioned by Puppet, Chef or anything else