serverspec 0.6.29 → 0.6.30

data/lib/serverspec/commands/linux.rb

@@ -18,9 +18,10 @@ module Serverspec
 
       def check_selinux(mode)
         cmd =  ""
-        cmd += "test ! -f /etc/selinux/config || " if mode == "disabled"
-        cmd += "(getenforce | grep -i -- #{escape(mode)} "
-        cmd += "&& grep -i -- ^SELINUX=#{escape(mode)}$ /etc/selinux/config)"
+        cmd += "test ! -f /etc/selinux/config || (" if mode == "disabled"
+        cmd += "getenforce | grep -i -- #{escape(mode)} "
+        cmd += "&& grep -i -- ^SELINUX=#{escape(mode)}$ /etc/selinux/config"
+        cmd += ")" if mode == "disabled"
         cmd
       end
 

data/lib/serverspec/version.rb

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

data/spec/debian/selinux_spec.rb

@@ -4,12 +4,12 @@ include Serverspec::Helper::Debian
 
 describe selinux do
   it { should be_enforcing }
-  its(:command) { should eq "(getenforce | grep -i -- enforcing && grep -i -- ^SELINUX=enforcing$ /etc/selinux/config)" }
+  its(:command) { should eq "getenforce | grep -i -- enforcing && grep -i -- ^SELINUX=enforcing$ /etc/selinux/config" }
 end
 
 describe selinux do
   it { should be_permissive }
-  its(:command) { should eq "(getenforce | grep -i -- permissive && grep -i -- ^SELINUX=permissive$ /etc/selinux/config)" }
+  its(:command) { should eq "getenforce | grep -i -- permissive && grep -i -- ^SELINUX=permissive$ /etc/selinux/config" }
 end
 
 describe selinux do

data/spec/gentoo/selinux_spec.rb

@@ -4,12 +4,12 @@ include Serverspec::Helper::Gentoo
 
 describe selinux do
   it { should be_enforcing }
-  its(:command) { should eq "(getenforce | grep -i -- enforcing && grep -i -- ^SELINUX=enforcing$ /etc/selinux/config)" }
+  its(:command) { should eq "getenforce | grep -i -- enforcing && grep -i -- ^SELINUX=enforcing$ /etc/selinux/config" }
 end
 
 describe selinux do
   it { should be_permissive }
-  its(:command) { should eq "(getenforce | grep -i -- permissive && grep -i -- ^SELINUX=permissive$ /etc/selinux/config)" }
+  its(:command) { should eq "getenforce | grep -i -- permissive && grep -i -- ^SELINUX=permissive$ /etc/selinux/config" }
 end
 
 describe selinux do

data/spec/redhat/selinux_spec.rb

@@ -4,12 +4,12 @@ include Serverspec::Helper::RedHat
 
 describe selinux do
   it { should be_enforcing }
-  its(:command) { should eq "(getenforce | grep -i -- enforcing && grep -i -- ^SELINUX=enforcing$ /etc/selinux/config)" }
+  its(:command) { should eq "getenforce | grep -i -- enforcing && grep -i -- ^SELINUX=enforcing$ /etc/selinux/config" }
 end
 
 describe selinux do
   it { should be_permissive }
-  its(:command) { should eq "(getenforce | grep -i -- permissive && grep -i -- ^SELINUX=permissive$ /etc/selinux/config)" }
+  its(:command) { should eq "getenforce | grep -i -- permissive && grep -i -- ^SELINUX=permissive$ /etc/selinux/config" }
 end
 
 describe selinux do

metadata

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