serverspec 0.4.11 → 0.4.12

data/lib/serverspec/backend/exec.rb

@@ -10,7 +10,7 @@ module Serverspec
       end
 
       def run_command(cmd, opts={})
-        stdout = `#{cmd} 2>&1`
+        stdout = `PATH=/sbin:/usr/sbin:$PATH #{cmd} 2>&1`
         # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
         #stdout, stderr, status = Open3.capture3(cmd)
 

data/lib/serverspec/backend/ssh.rb

@@ -4,6 +4,7 @@ module Serverspec
   module Backend
     class Ssh < Exec
       def run_command(cmd, opt={})
+        cmd = "PATH=/sbin:/usr/sbin:$PATH #{cmd}"
         cmd = "sudo #{cmd}" if not RSpec.configuration.ssh.options[:user] == 'root'
         ret = ssh_exec!(cmd)
         if ! @example.nil?

data/lib/serverspec/commands/base.rb

@@ -19,7 +19,7 @@ module Serverspec
       end
 
       def check_routing_table destination
-        "/sbin/ip route | grep -E '^#{destination} |^default '"
+        "ip route | grep -E '^#{destination} |^default '"
       end
 
       def check_reachable host, port, proto, timeout
@@ -66,7 +66,7 @@ module Serverspec
       end
 
       def check_running service
-        "/sbin/service #{escape(service)} status"
+        "service #{escape(service)} status"
       end
 
       def check_running_under_supervisor service

data/lib/serverspec/commands/gentoo.rb

@@ -3,11 +3,11 @@ module Serverspec
     class Gentoo < Linux
       def check_enabled service
         regexp = "^\\s*#{service}\\s*|\\s*\\(boot\\|default\\)"
-        "/sbin/rc-update show | grep -- #{escape(regexp)}"
+        "rc-update show | grep -- #{escape(regexp)}"
       end
 
       def check_installed package
-        "/usr/bin/eix #{escape(package)} --installed"
+        "eix #{escape(package)} --installed"
       end
 
       def check_running service

data/lib/serverspec/commands/linux.rb

@@ -6,11 +6,11 @@ module Serverspec
       class NotImplementedError < Exception; end
 
       def check_access_by_user file, user, access
-        "su -s /bin/sh -c \"/usr/bin/test -#{access} #{file}\" #{user}"
+        "su -s sh -c \"test -#{access} #{file}\" #{user}"
       end
 
       def check_iptables_rule rule, table=nil, chain=nil
-        cmd = "/sbin/iptables"
+        cmd = "iptables"
         cmd += " -t #{escape(table)}" if table
         cmd += " -S"
         cmd += " #{escape(chain)}" if chain
@@ -19,7 +19,7 @@ module Serverspec
       end
 
       def check_selinux mode
-        "/usr/sbin/getenforce | grep -i -- #{escape(mode)}"
+        "getenforce | grep -i -- #{escape(mode)}"
       end
     end
   end

data/lib/serverspec/commands/redhat.rb

@@ -3,11 +3,11 @@ module Serverspec
     class RedHat < Linux
       def check_access_by_user file, user, access
         # Redhat-specific
-        "/sbin/runuser -s /bin/sh -c \"test -#{access} #{file}\" #{user}"
+        "runuser -s sh -c \"test -#{access} #{file}\" #{user}"
       end
 
       def check_enabled service
-        "/sbin/chkconfig --list #{escape(service)} | grep 3:on"
+        "chkconfig --list #{escape(service)} | grep 3:on"
       end
 
       def check_installed package

data/lib/serverspec/commands/solaris.rb

@@ -29,24 +29,24 @@ module Serverspec
 
       def check_zfs zfs, property=nil
         if property.nil?
-          "/sbin/zfs list -H #{escape(zfs)}"
+          "zfs list -H #{escape(zfs)}"
         else
           commands = []
           property.sort.each do |key, value|
             regexp = "^#{value}$"
-            commands << "/sbin/zfs list -H -o #{escape(key)} #{escape(zfs)} | grep -- #{escape(regexp)}"
+            commands << "zfs list -H -o #{escape(key)} #{escape(zfs)} | grep -- #{escape(regexp)}"
           end
           commands.join(' && ')
         end
       end
 
       def check_ipfilter_rule rule
-        "/sbin/ipfstat -io 2> /dev/null | grep -- #{escape(rule)}"
+        "ipfstat -io 2> /dev/null | grep -- #{escape(rule)}"
       end
 
       def check_ipnat_rule rule
         regexp = "^#{rule}$"
-        "/sbin/ipnat -l 2> /dev/null | grep -- #{escape(regexp)}"
+        "ipnat -l 2> /dev/null | grep -- #{escape(regexp)}"
       end
 
       def check_svcprop svc, property, value
@@ -91,7 +91,7 @@ module Serverspec
         # http://docs.oracle.com/cd/E23823_01/html/816-5166/su-1m.html
         ## No need for login shell as it seems that behavior as superuser is favorable for us, but needs
         ## to be better tested under real solaris env
-        "su #{user} -c \"/usr/bin/test -#{access} #{file}\""
+        "su #{user} -c \"test -#{access} #{file}\""
       end
     end
   end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end

data/spec/debian/commands_spec.rb

@@ -66,5 +66,5 @@ end
 
 describe 'check_running' do
   subject { commands.check_running('httpd') }
-  it { should eq '/sbin/service httpd status' }
+  it { should eq 'service httpd status' }
 end

data/spec/gentoo/commands_spec.rb

@@ -56,12 +56,12 @@ end
 
 describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
-  it { should eq "/sbin/rc-update show | grep -- \\^\\\\s\\*httpd\\\\s\\*\\|\\\\s\\*\\\\\\(boot\\\\\\|default\\\\\\)" }
+  it { should eq "rc-update show | grep -- \\^\\\\s\\*httpd\\\\s\\*\\|\\\\s\\*\\\\\\(boot\\\\\\|default\\\\\\)" }
 end
 
 describe 'check_installed' do
   subject { commands.check_installed('httpd') }
-  it { should eq '/usr/bin/eix httpd --installed' }
+  it { should eq 'eix httpd --installed' }
 end
 
 describe 'check_running' do

data/spec/redhat/commands_spec.rb

@@ -54,7 +54,7 @@ end
 
 describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
-  it { should eq '/sbin/chkconfig --list httpd | grep 3:on' }
+  it { should eq 'chkconfig --list httpd | grep 3:on' }
 end
 
 describe 'check_installed' do
@@ -64,22 +64,22 @@ end
 
 describe 'check_running' do
   subject { commands.check_running('httpd') }
-  it { should eq '/sbin/service httpd status' }
+  it { should eq 'service httpd status' }
 end
 
 describe 'check_access_by_user' do
   context 'read access' do
     subject {commands.check_access_by_user '/tmp/something', 'dummyuser1', 'r'}
-    it { should eq  '/sbin/runuser -s /bin/sh -c "test -r /tmp/something" dummyuser1' }
+    it { should eq  'runuser -s sh -c "test -r /tmp/something" dummyuser1' }
   end
 
   context 'write access' do
     subject {commands.check_access_by_user '/tmp/somethingw', 'dummyuser2', 'w'}
-    it { should eq  '/sbin/runuser -s /bin/sh -c "test -w /tmp/somethingw" dummyuser2' }
+    it { should eq  'runuser -s sh -c "test -w /tmp/somethingw" dummyuser2' }
   end
 
   context 'execute access' do
     subject {commands.check_access_by_user '/tmp/somethingx', 'dummyuser3', 'x'}
-    it { should eq  '/sbin/runuser -s /bin/sh -c "test -x /tmp/somethingx" dummyuser3' }
+    it { should eq  'runuser -s sh -c "test -x /tmp/somethingx" dummyuser3' }
   end
 end

data/spec/solaris/commands_spec.rb

@@ -108,28 +108,28 @@ end
 describe 'check_zfs' do
   context 'check without properties' do
     subject { commands.check_zfs('rpool') }
-    it { should eq "/sbin/zfs list -H 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 "/sbin/zfs list -H -o mountpoint rpool | grep -- \\^/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 "/sbin/zfs list -H -o compression rpool | grep -- \\^off\\$ && /sbin/zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
+    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 "/sbin/ipfstat -io 2> /dev/null | grep -- 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 "/sbin/ipnat -l 2> /dev/null | grep -- \\^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
@@ -150,16 +150,16 @@ end
 describe 'check_access_by_user' do
   context 'read access' do
     subject {commands.check_access_by_user '/tmp/something', 'dummyuser1', 'r'}
-    it { should eq 'su dummyuser1 -c "/usr/bin/test -r /tmp/something"' }
+    it { should eq 'su dummyuser1 -c "test -r /tmp/something"' }
   end
 
   context 'write access' do
     subject {commands.check_access_by_user '/tmp/somethingw', 'dummyuser2', 'w'}
-    it { should eq 'su dummyuser2 -c "/usr/bin/test -w /tmp/somethingw"' }
+    it { should eq 'su dummyuser2 -c "test -w /tmp/somethingw"' }
   end
 
   context 'execute access' do
     subject {commands.check_access_by_user '/tmp/somethingx', 'dummyuser3', 'x'}
-    it { should eq 'su dummyuser3 -c "/usr/bin/test -x /tmp/somethingx"' }
+    it { should eq 'su dummyuser3 -c "test -x /tmp/somethingx"' }
   end
 end

data/spec/support/shared_commands_examples.rb

@@ -25,7 +25,7 @@ end
 
 shared_examples_for 'support command check_routing_table' do |dest|
   subject { commands.check_routing_table(dest) }
-  it { should eq "/sbin/ip route | grep -E '^#{dest} |^default '" }
+  it { should eq "ip route | grep -E '^#{dest} |^default '" }
 end
 
 shared_examples_for 'support command check_reachable' do
@@ -193,29 +193,29 @@ end
 shared_examples_for 'support command check_iptables' do
   context 'check a rule without a table and a chain' do
     subject { commands.check_iptables_rule('-P INPUT ACCEPT') }
-    it { should eq "/sbin/iptables -S | grep -- -P\\ INPUT\\ ACCEPT" }
+    it { should eq "iptables -S | grep -- -P\\ INPUT\\ ACCEPT" }
   end
 
   context 'chack a rule with a table and a chain' do
     subject { commands.check_iptables_rule('-P INPUT ACCEPT', 'mangle', 'INPUT') }
-    it { should eq "/sbin/iptables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT" }
+    it { should eq "iptables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT" }
   end
 end
 
 shared_examples_for 'support command check_selinux' do
   context 'enforcing' do
     subject { commands.check_selinux('enforcing') }
-    it { should eq "/usr/sbin/getenforce | grep -i -- enforcing" }
+    it { should eq "getenforce | grep -i -- enforcing" }
   end
 
   context 'permissive' do
     subject { commands.check_selinux('permissive') }
-    it { should eq "/usr/sbin/getenforce | grep -i -- permissive" }
+    it { should eq "getenforce | grep -i -- permissive" }
   end
 
   context 'disabled' do
     subject { commands.check_selinux('disabled') }
-    it { should eq "/usr/sbin/getenforce | grep -i -- disabled" }
+    it { should eq "getenforce | grep -i -- disabled" }
   end
 end
 
@@ -227,16 +227,16 @@ end
 shared_examples_for 'support command check_access_by_user' do
   context 'read access' do
     subject {commands.check_access_by_user '/tmp/something', 'dummyuser1', 'r'}
-    it { should eq  'su -s /bin/sh -c "/usr/bin/test -r /tmp/something" dummyuser1' }
+    it { should eq  'su -s sh -c "test -r /tmp/something" dummyuser1' }
   end
 
   context 'write access' do
     subject {commands.check_access_by_user '/tmp/somethingw', 'dummyuser2', 'w'}
-    it { should eq  'su -s /bin/sh -c "/usr/bin/test -w /tmp/somethingw" dummyuser2' }
+    it { should eq  'su -s sh -c "test -w /tmp/somethingw" dummyuser2' }
   end
 
   context 'execute access' do
     subject {commands.check_access_by_user '/tmp/somethingx', 'dummyuser3', 'x'}
-    it { should eq  'su -s /bin/sh -c "/usr/bin/test -x /tmp/somethingx" dummyuser3' }
+    it { should eq  'su -s sh -c "test -x /tmp/somethingx" dummyuser3' }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
   prerelease: 
 platform: ruby
 authors: