serverspec 0.6.28 → 0.6.29

data/lib/serverspec/commands/linux.rb

@@ -17,7 +17,11 @@ module Serverspec
       end
 
       def check_selinux(mode)
-        "getenforce | grep -i -- #{escape(mode)} && grep -i -- ^SELINUX=#{escape(mode)}$ /etc/selinux/config"
+        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
       end
 
       def check_kernel_module_loaded(name)

data/lib/serverspec/version.rb

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

data/spec/debian/selinux_spec.rb

@@ -4,15 +4,15 @@ 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
   it { should be_disabled }
-  its(:command) { should eq "getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config" }
+  its(:command) { should eq "test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)" }
 end

data/spec/gentoo/selinux_spec.rb

@@ -4,15 +4,15 @@ 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
   it { should be_disabled }
-  its(:command) { should eq "getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config" }
+  its(:command) { should eq "test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)" }
 end

data/spec/redhat/selinux_spec.rb

@@ -4,15 +4,15 @@ 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
   it { should be_disabled }
-  its(:command) { should eq "getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config" }
+  its(:command) { should eq "test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)" }
 end

data/spec/solaris/ipfilter_spec.rb

@@ -4,4 +4,5 @@ include Serverspec::Helper::Solaris
 
 describe ipfilter do
   it { should have_rule 'pass in quick on lo0 all' }
+  its(:command) { should eq "ipfstat -io 2> /dev/null | grep -- pass\\ in\\ quick\\ on\\ lo0\\ all" }
 end

data/spec/solaris/ipnat_spec.rb

@@ -4,4 +4,5 @@ include Serverspec::Helper::Solaris
 
 describe ipnat do
   it { should have_rule 'map net1 192.168.0.0/24 -> 0.0.0.0/32' }
+  its(:command) { should eq "ipnat -l 2> /dev/null | grep -- \\^map\\ net1\\ 192.168.0.0/24\\ -\\>\\ 0.0.0.0/32\\$" }
 end

data/spec/solaris/svcprop_spec.rb

@@ -4,5 +4,10 @@ include Serverspec::Helper::Solaris
 
 describe service('svc:/network/http:apache22') do
   it { should have_property 'httpd/enable_64bit' => false }
+  its(:command) { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$" }
+end
+
+describe service('svc:/network/http:apache22') do
   it { should have_property 'httpd/enable_64bit' => false, 'httpd/server_type'  => 'worker' }
+  its(:command) { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$ && svcprop -p httpd/server_type svc:/network/http:apache22 | grep -- \\^worker\\$" }
 end

data/spec/solaris/zfs_spec.rb

@@ -4,6 +4,15 @@ include Serverspec::Helper::Solaris
 
 describe zfs('rpool') do
   it { should exist }
+  its(:command) { should eq "zfs list -H rpool" }
+end
+
+describe zfs('rpool') do
   it { should have_property 'mountpoint' => '/rpool'  }
+  its(:command) { should eq "zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
+end
+
+describe zfs('rpool') do
   it { should have_property 'mountpoint' => '/rpool', 'compression' => 'off' }
+  its(:command) { should eq "zfs list -H -o compression rpool | grep -- \\^off\\$ && zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
 end

data/spec/solaris11/ipfilter_spec.rb

@@ -4,4 +4,5 @@ include Serverspec::Helper::Solaris11
 
 describe ipfilter do
   it { should have_rule 'pass in quick on lo0 all' }
+  its(:command) { should eq "ipfstat -io 2> /dev/null | grep -- pass\\ in\\ quick\\ on\\ lo0\\ all" }
 end

data/spec/solaris11/ipnat_spec.rb

@@ -4,4 +4,5 @@ include Serverspec::Helper::Solaris11
 
 describe ipnat do
   it { should have_rule 'map net1 192.168.0.0/24 -> 0.0.0.0/32' }
+  its(:command) { should eq "ipnat -l 2> /dev/null | grep -- \\^map\\ net1\\ 192.168.0.0/24\\ -\\>\\ 0.0.0.0/32\\$" }
 end

data/spec/solaris11/svcprop_spec.rb

@@ -4,5 +4,10 @@ include Serverspec::Helper::Solaris11
 
 describe service('svc:/network/http:apache22') do
   it { should have_property 'httpd/enable_64bit' => false }
+  its(:command) { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$" }
+end
+
+describe service('svc:/network/http:apache22') do
   it { should have_property 'httpd/enable_64bit' => false, 'httpd/server_type'  => 'worker' }
+  its(:command) { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$ && svcprop -p httpd/server_type svc:/network/http:apache22 | grep -- \\^worker\\$" }
 end

data/spec/solaris11/zfs_spec.rb

@@ -4,6 +4,15 @@ include Serverspec::Helper::Solaris11
 
 describe zfs('rpool') do
   it { should exist }
+  its(:command) { should eq "zfs list -H rpool" }
+end
+
+describe zfs('rpool') do
   it { should have_property 'mountpoint' => '/rpool'  }
+  its(:command) { should eq "zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
+end
+
+describe zfs('rpool') do
   it { should have_property 'mountpoint' => '/rpool', 'compression' => 'off' }
+  its(:command) { should eq "zfs list -H -o compression rpool | grep -- \\^off\\$ && zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.28
+  version: 0.6.29
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -287,7 +287,6 @@ files:
 - spec/redhat/yumrepo_spec.rb
 - spec/smartos/commands_spec.rb
 - spec/solaris/command_spec.rb
-- spec/solaris/commands_spec.rb
 - spec/solaris/cron_spec.rb
 - spec/solaris/default_gateway_spec.rb
 - spec/solaris/file_spec.rb
@@ -306,7 +305,6 @@ files:
 - spec/solaris10/commands_spec.rb
 - spec/solaris10/php_config_spec.rb
 - spec/solaris11/command_spec.rb
-- spec/solaris11/commands_spec.rb
 - spec/solaris11/cron_spec.rb
 - spec/solaris11/default_gateway_spec.rb
 - spec/solaris11/file_spec.rb
@@ -419,7 +417,6 @@ test_files:
 - spec/redhat/yumrepo_spec.rb
 - spec/smartos/commands_spec.rb
 - spec/solaris/command_spec.rb
-- spec/solaris/commands_spec.rb
 - spec/solaris/cron_spec.rb
 - spec/solaris/default_gateway_spec.rb
 - spec/solaris/file_spec.rb
@@ -438,7 +435,6 @@ test_files:
 - spec/solaris10/commands_spec.rb
 - spec/solaris10/php_config_spec.rb
 - spec/solaris11/command_spec.rb
-- spec/solaris11/commands_spec.rb
 - spec/solaris11/cron_spec.rb
 - spec/solaris11/default_gateway_spec.rb
 - spec/solaris11/file_spec.rb

data/spec/solaris/commands_spec.rb

@@ -1,45 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::Solaris
-
-describe 'check_zfs' do
-  context 'check without properties' do
-    subject { commands.check_zfs('rpool') }
-    it { should eq "zfs list -H rpool" }
-  end
-
-  context 'check with a property' do
-    subject { commands.check_zfs('rpool', { 'mountpoint' => '/rpool' }) }
-    it { should eq "zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
-  end
-
-  context 'check with multiple properties' do
-    subject { commands.check_zfs('rpool', { 'mountpoint'  => '/rpool', 'compression' => 'off' }) }
-    it { should eq "zfs list -H -o compression rpool | grep -- \\^off\\$ && zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
-  end
-end
-
-describe 'check_ip_filter_rule' do
-  subject { commands.check_ipfilter_rule('pass in quick on lo0 all') }
-  it { should eq "ipfstat -io 2> /dev/null | grep -- pass\\ in\\ quick\\ on\\ lo0\\ all" }
-end
-
-describe 'check_ipnat_rule' do
-  subject { commands.check_ipnat_rule('map net1 192.168.0.0/24 -> 0.0.0.0/32') }
-  it { should eq "ipnat -l 2> /dev/null | grep -- \\^map\\ net1\\ 192.168.0.0/24\\ -\\>\\ 0.0.0.0/32\\$" }
-end
-
-describe 'check_svcprop' do
-  subject { commands.check_svcprop('svc:/network/http:apache22', 'httpd/enable_64bit','false') }
-  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$" }
-end
-
-describe 'check_svcprops' do
-  subject {
-    commands.check_svcprops('svc:/network/http:apache22', {
-      'httpd/enable_64bit' => 'false',
-      'httpd/server_type'  => 'worker',
-    })
-  }
-  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$ && svcprop -p httpd/server_type svc:/network/http:apache22 | grep -- \\^worker\\$" }
-end

data/spec/solaris11/commands_spec.rb

@@ -1,45 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::Solaris11
-
-describe 'check_zfs' do
-  context 'check without properties' do
-    subject { commands.check_zfs('rpool') }
-    it { should eq "zfs list -H rpool" }
-  end
-
-  context 'check with a property' do
-    subject { commands.check_zfs('rpool', { 'mountpoint' => '/rpool' }) }
-    it { should eq "zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
-  end
-
-  context 'check with multiple properties' do
-    subject { commands.check_zfs('rpool', { 'mountpoint'  => '/rpool', 'compression' => 'off' }) }
-    it { should eq "zfs list -H -o compression rpool | grep -- \\^off\\$ && zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
-  end
-end
-
-describe 'check_ip_filter_rule' do
-  subject { commands.check_ipfilter_rule('pass in quick on lo0 all') }
-  it { should eq "ipfstat -io 2> /dev/null | grep -- pass\\ in\\ quick\\ on\\ lo0\\ all" }
-end
-
-describe 'check_ipnat_rule' do
-  subject { commands.check_ipnat_rule('map net1 192.168.0.0/24 -> 0.0.0.0/32') }
-  it { should eq "ipnat -l 2> /dev/null | grep -- \\^map\\ net1\\ 192.168.0.0/24\\ -\\>\\ 0.0.0.0/32\\$" }
-end
-
-describe 'check_svcprop' do
-  subject { commands.check_svcprop('svc:/network/http:apache22', 'httpd/enable_64bit','false') }
-  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$" }
-end
-
-describe 'check_svcprops' do
-  subject {
-    commands.check_svcprops('svc:/network/http:apache22', {
-      'httpd/enable_64bit' => 'false',
-      'httpd/server_type'  => 'worker',
-    })
-  }
-  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$ && svcprop -p httpd/server_type svc:/network/http:apache22 | grep -- \\^worker\\$" }
-end