serverspec 0.4.7 → 0.4.8

data/README.md

@@ -35,16 +35,6 @@ Select number: 1
 
 Input target host name: www.example.jp
 
-Select OS type of target host:
-
-  1) Auto Detect
-  2) Red Hat
-  3) Debian
-  4) Gentoo
-  5) Solaris
-
-Select number: 1
-
  + spec/
  + spec/www.example.jp/
  + spec/www.example.jp/httpd_spec.rb
@@ -57,17 +47,20 @@ spec/www.example.jp/httpd_spec.rb is a sample spec file and its content is like
 ```ruby
 require 'spec_helper'
 
-describe 'httpd' do
+describe package('httpd)' do
   it { should be_installed }
+end
+
+describe service('httpd') do
   it { should be_enabled   }
   it { should be_running   }
 end
 
-describe 'port 80' do
+describe port(80) do
   it { should be_listening }
 end
 
-describe '/etc/httpd/conf/httpd.conf' do
+describe file('/etc/httpd/conf/httpd.conf') do
   it { should be_file }
   it { should contain "ServerName www.example.jp" }
 end

data/lib/serverspec/commands/base.rb

@@ -19,7 +19,7 @@ module Serverspec
       end
 
       def check_routing_table destination
-        "ip route | grep -E '^#{destination} |^default '"
+        "/sbin/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
-        "service #{escape(service)} status"
+        "/sbin/service #{escape(service)} status"
       end
 
       def check_running_under_supervisor service

data/lib/serverspec/commands/linux.rb

@@ -10,7 +10,7 @@ module Serverspec
       end
 
       def check_iptables_rule rule, table=nil, chain=nil
-        cmd = "iptables"
+        cmd = "/sbin/iptables"
         cmd += " -t #{escape(table)}" if table
         cmd += " -S"
         cmd += " #{escape(chain)}" if chain

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
-        "runuser -s /bin/sh -c \"test -#{access} #{file}\" #{user}"
+        "/sbin/runuser -s /bin/sh -c \"test -#{access} #{file}\" #{user}"
       end
 
       def check_enabled service
-        "chkconfig --list #{escape(service)} | grep 3:on"
+        "/sbin/chkconfig --list #{escape(service)} | grep 3:on"
       end
 
       def check_installed package

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/spec/darwin/commands_spec.rb

@@ -29,7 +29,7 @@ end
 
 describe 'check_routing_table' do
   subject { commands.check_routing_table('192.168.100.0/24') }
-  it { should eq "ip route | grep -E '^192.168.100.0/24 |^default '" }
+  it { should eq "/sbin/ip route | grep -E '^192.168.100.0/24 |^default '" }
 end
 
 describe 'check_resolvable'  do
@@ -69,7 +69,7 @@ end
 
 describe 'check_running' do
   subject { commands.check_running('httpd') }
-  it { should eq 'service httpd status' }
+  it { should eq '/sbin/service httpd status' }
 end
 
 describe 'check_running_under_supervisor' do

data/spec/debian/commands_spec.rb

@@ -19,7 +19,7 @@ end
 
 describe 'check_routing_table' do
   subject { commands.check_routing_table('192.168.100.0/24') }
-  it { should eq "ip route | grep -E '^192.168.100.0/24 |^default '" }
+  it { should eq "/sbin/ip route | grep -E '^192.168.100.0/24 |^default '" }
 end
 
 describe 'check_reachable'  do
@@ -85,7 +85,7 @@ end
 
 describe 'check_running' do
   subject { commands.check_running('httpd') }
-  it { should eq 'service httpd status' }
+  it { should eq '/sbin/service httpd status' }
 end
 
 
@@ -209,12 +209,12 @@ end
 describe 'check_ipatbles' do
   context 'check a rule without a table and a chain' do
     subject { commands.check_iptables_rule('-P INPUT ACCEPT') }
-    it { should eq "iptables -S | grep -- -P\\ INPUT\\ ACCEPT" }
+    it { should eq "/sbin/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 "iptables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT" }
+    it { should eq "/sbin/iptables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT" }
   end
 end
 

data/spec/gentoo/commands_spec.rb

@@ -19,7 +19,7 @@ end
 
 describe 'check_routing_table' do
   subject { commands.check_routing_table('192.168.100.0/24') }
-  it { should eq "ip route | grep -E '^192.168.100.0/24 |^default '" }
+  it { should eq "/sbin/ip route | grep -E '^192.168.100.0/24 |^default '" }
 end
 
 describe 'check_reachable'  do
@@ -207,12 +207,12 @@ end
 describe 'check_ipatbles' do
   context 'check a rule without a table and a chain' do
     subject { commands.check_iptables_rule('-P INPUT ACCEPT') }
-    it { should eq "iptables -S | grep -- -P\\ INPUT\\ ACCEPT" }
+    it { should eq "/sbin/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 "iptables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT" }
+    it { should eq "/sbin/iptables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT" }
   end
 end
 

data/spec/redhat/commands_spec.rb

@@ -4,7 +4,7 @@ include Serverspec::Helper::RedHat
 
 describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
-  it { should eq 'chkconfig --list httpd | grep 3:on' }
+  it { should eq '/sbin/chkconfig --list httpd | grep 3:on' }
 end
 
 describe 'check_file' do
@@ -19,7 +19,7 @@ end
 
 describe 'check_routing_table' do
   subject { commands.check_routing_table('192.168.100.0/24') }
-  it { should eq "ip route | grep -E '^192.168.100.0/24 |^default '" }
+  it { should eq "/sbin/ip route | grep -E '^192.168.100.0/24 |^default '" }
 end
 
 describe 'check_reachable'  do
@@ -79,7 +79,7 @@ end
 
 describe 'check_running' do
   subject { commands.check_running('httpd') }
-  it { should eq 'service httpd status' }
+  it { should eq '/sbin/service httpd status' }
 end
 
 describe 'check_running_under_supervisor' do
@@ -207,12 +207,12 @@ end
 describe 'check_ipatbles' do
   context 'check a rule without a table and a chain' do
     subject { commands.check_iptables_rule('-P INPUT ACCEPT') }
-    it { should eq "iptables -S | grep -- -P\\ INPUT\\ ACCEPT" }
+    it { should eq "/sbin/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 "iptables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT" }
+    it { should eq "/sbin/iptables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT" }
   end
 end
 
@@ -241,16 +241,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  'runuser -s /bin/sh -c "test -r /tmp/something" dummyuser1' }
+    it { should eq  '/sbin/runuser -s /bin/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  'runuser -s /bin/sh -c "test -w /tmp/somethingw" dummyuser2' }
+    it { should eq  '/sbin/runuser -s /bin/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  'runuser -s /bin/sh -c "test -x /tmp/somethingx" dummyuser3' }
+    it { should eq  '/sbin/runuser -s /bin/sh -c "test -x /tmp/somethingx" dummyuser3' }
   end
 end

data/spec/solaris/commands_spec.rb

@@ -19,7 +19,7 @@ end
 
 describe 'check_routing_table' do
   subject { commands.check_routing_table('192.168.100.0/24') }
-  it { should eq "ip route | grep -E '^192.168.100.0/24 |^default '" }
+  it { should eq "/sbin/ip route | grep -E '^192.168.100.0/24 |^default '" }
 end
 
 describe 'check_reachable'  do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh