serverspec 0.7.0 → 0.7.1

data/lib/serverspec/backend/ssh.rb

@@ -20,8 +20,8 @@ module Serverspec
         cmd = super(cmd)
         if RSpec.configuration.ssh.options[:user] != 'root'
           cmd = "sudo #{cmd}"
-          cmd.gsub!(/(\&\&\s*\(?)/, "\\1sudo ")
-          cmd.gsub!(/(\|\|\s*\(?)/, "\\1sudo ")
+          cmd.gsub!(/(\&\&\s*!?\(?\s*)/, "\\1sudo ")
+          cmd.gsub!(/(\|\|\s*!?\(?\s*)/, "\\1sudo ")
         end
         cmd
       end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/backend/ssh/build_command_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Ssh
+
+ssh = double
+
+
+describe 'build command with sudo' do
+  before :each do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'foo'  } }
+      c.ssh = ssh
+    end
+  end
+
+  context 'command pattern 1' do
+    subject { backend.build_command('test -f /etc/passwd') }
+    it { should eq 'sudo test -f /etc/passwd' }
+  end
+
+  context 'command pattern 2' do
+    subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
+      it { should eq 'sudo test ! -f /etc/selinux/config || (sudo getenforce | grep -i -- disabled && sudo grep -i -- ^SELINUX=disabled$ /etc/selinux/config)' }
+  end
+
+  context 'command pattern 3' do
+    subject { backend.build_command("dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'") }
+    it { should eq "sudo dpkg -s apache2 && ! sudo dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -218,6 +218,7 @@ files:
 - lib/serverspec/version.rb
 - serverspec.gemspec
 - spec/backend/exec/configuration_spec.rb
+- spec/backend/ssh/build_command_spec.rb
 - spec/backend/ssh/configuration_spec.rb
 - spec/darwin/command_spec.rb
 - spec/darwin/cron_spec.rb
@@ -348,6 +349,7 @@ specification_version: 3
 summary: RSpec tests for your servers configured by Puppet, Chef or anything else
 test_files:
 - spec/backend/exec/configuration_spec.rb
+- spec/backend/ssh/build_command_spec.rb
 - spec/backend/ssh/configuration_spec.rb
 - spec/darwin/command_spec.rb
 - spec/darwin/cron_spec.rb