serverspec 0.6.30 → 0.7.0

data/lib/serverspec/backend/exec.rb

@@ -37,6 +37,8 @@ module Serverspec
         path = Serverspec.configuration.path || RSpec.configuration.path
         if path
           cmd = "env PATH=#{path}:$PATH #{cmd}"
+          cmd.gsub!(/(\&\&\s*\(?)/, "\\1env PATH=#{path}:$PATH ")
+          cmd.gsub!(/(\|\|\s*\(?)/, "\\1env PATH=#{path}:$PATH ")
         end
         cmd
       end

data/lib/serverspec/backend/ssh.rb

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

data/lib/serverspec/version.rb

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

data/spec/backend/exec/configuration_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 require 'serverspec/helper/base'
-include Serverspec::Helper::Base
+include Serverspec::Helper::RedHat
 include Serverspec::Helper::Exec
 
 describe 'configurations are not set' do
@@ -35,3 +35,21 @@ describe 'path and pre_command are set' do
     its(:command) { should eq 'env PATH=/sbin:/usr/sbin:$PATH source ~/.zshrc && env PATH=/sbin:/usr/sbin:$PATH test -f /etc/passwd' }
   end
 end
+
+describe 'path is set for check_selinux' do
+  let(:path) { '/sbin:/usr/sbin' }
+  context selinux do
+    it { should be_disabled }
+    its(:command) { should eq "env PATH=/sbin:/usr/sbin:$PATH test ! -f /etc/selinux/config || (env PATH=/sbin:/usr/sbin:$PATH getenforce | grep -i -- disabled && env PATH=/sbin:/usr/sbin:$PATH grep -i -- ^SELINUX=disabled$ /etc/selinux/config)" }
+  end
+
+  context selinux do
+    it { should be_enforcing }
+    its(:command) { should eq "env PATH=/sbin:/usr/sbin:$PATH getenforce | grep -i -- enforcing && env PATH=/sbin:/usr/sbin:$PATH grep -i -- ^SELINUX=enforcing$ /etc/selinux/config" }
+  end
+
+  context selinux do
+    it { should be_permissive }
+    its(:command) { should eq "env PATH=/sbin:/usr/sbin:$PATH getenforce | grep -i -- permissive && env PATH=/sbin:/usr/sbin:$PATH grep -i -- ^SELINUX=permissive$ /etc/selinux/config" }
+  end
+end

data/spec/backend/ssh/configuration_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 require 'serverspec/helper/base'
-include Serverspec::Helper::Base
+include Serverspec::Helper::RedHat
 include Serverspec::Helper::Ssh
 
 ssh = double
@@ -111,3 +111,75 @@ describe 'path pre_command and set and user is non-root' do
     its(:command) { should eq 'env PATH=/sbin:/usr/sbin:$PATH source ~/.zshrc && env PATH=/sbin:/usr/sbin:$PATH test -f /etc/passwd' }
   end
 end
+
+describe 'user is non-root for check_selinux' do
+  context selinux do
+    before :all do
+      RSpec.configure do |c|
+        ssh.stub(:options) { { :user => 'foo' } }
+        c.ssh = ssh
+      end
+    end
+    it { should be_disabled }
+    its(:command) { should eq "sudo test ! -f /etc/selinux/config || (sudo getenforce | grep -i -- disabled && sudo grep -i -- ^SELINUX=disabled$ /etc/selinux/config)" }
+  end
+
+  context selinux do
+    before :all do
+      RSpec.configure do |c|
+        ssh.stub(:options) { { :user => 'foo' } }
+        c.ssh = ssh
+      end
+    end
+    it { should be_enforcing }
+    its(:command) { should eq "sudo getenforce | grep -i -- enforcing && sudo grep -i -- ^SELINUX=enforcing$ /etc/selinux/config" }
+  end
+
+  context selinux do
+    before :all do
+      RSpec.configure do |c|
+        ssh.stub(:options) { { :user => 'foo' } }
+        c.ssh = ssh
+      end
+    end
+    it { should be_permissive }
+    its(:command) { should eq "sudo getenforce | grep -i -- permissive && sudo grep -i -- ^SELINUX=permissive$ /etc/selinux/config" }
+  end
+end
+
+describe 'path is set and user is non-root for check_selinux' do
+  let(:path) { "/sbin:/usr/sbin" }
+
+  context selinux do
+    before :all do
+      RSpec.configure do |c|
+        ssh.stub(:options) { { :user => 'foo' } }
+        c.ssh = ssh
+      end
+    end
+    it { should be_disabled }
+    its(:command) { should eq "sudo env PATH=/sbin:/usr/sbin:$PATH test ! -f /etc/selinux/config || (sudo env PATH=/sbin:/usr/sbin:$PATH getenforce | grep -i -- disabled && sudo env PATH=/sbin:/usr/sbin:$PATH grep -i -- ^SELINUX=disabled$ /etc/selinux/config)" }
+  end
+
+  context selinux do
+    before :all do
+      RSpec.configure do |c|
+        ssh.stub(:options) { { :user => 'foo' } }
+        c.ssh = ssh
+      end
+    end
+    it { should be_enforcing }
+    its(:command) { should eq "sudo env PATH=/sbin:/usr/sbin:$PATH getenforce | grep -i -- enforcing && sudo env PATH=/sbin:/usr/sbin:$PATH grep -i -- ^SELINUX=enforcing$ /etc/selinux/config" }
+  end
+
+  context selinux do
+    before :all do
+      RSpec.configure do |c|
+        ssh.stub(:options) { { :user => 'foo' } }
+        c.ssh = ssh
+      end
+    end
+    it { should be_permissive }
+    its(:command) { should eq "sudo env PATH=/sbin:/usr/sbin:$PATH getenforce | grep -i -- permissive && sudo env PATH=/sbin:/usr/sbin:$PATH grep -i -- ^SELINUX=permissive$ /etc/selinux/config" }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.30
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh