serverspec 0.3.2 → 0.4.0

data/spec/debian/matchers_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-describe 'Serverspec matchers of Debian family', :os => :debian do
+include Serverspec::Helper::Debian
+
+describe 'Serverspec matchers of Debian family' do
   it_behaves_like 'support be_enabled matcher', 'rc.local'
   it_behaves_like 'support be_installed matcher', 'openssh-server'
   it_behaves_like 'support be_running matcher', 'ssh'

data/spec/debian/service_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Debian
+
+describe 'Serverspec service matchers of Red Hat family' do
+  it_behaves_like 'support service enabled matcher', 'sshd'
+  it_behaves_like 'support service running matcher', 'sshd'
+  it_behaves_like 'support service running under supervisor matcher', 'sshd'
+  it_behaves_like 'support service running under unimplemented matcher', 'sshd'
+end

data/spec/gentoo/commands_spec.rb

@@ -1,26 +1,26 @@
 require 'spec_helper'
 
-describe 'check_enabled', :os => :gentoo do
+describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
   it { should eq "/sbin/rc-update show | grep -- \\^\\\\s\\*httpd\\\\s\\*\\|\\\\s\\*\\\\\\(boot\\\\\\|default\\\\\\)" }
 end
 
-describe 'check_file', :os => :gentoo do
+describe 'check_file' do
   subject { commands.check_file('/etc/passwd') }
   it { should eq 'test -f /etc/passwd' }
 end
 
-describe 'check_mounted', :os => :gentoo  do
+describe 'check_mounted'  do
   subject { commands.check_mounted('/') }
   it { should eq "mount | grep -w -- on\\ /" }
 end
 
-describe 'check_routing_table', :os => :gentoo do
+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 '" }
 end
 
-describe 'check_reachable', :os => :gentoo  do
+describe 'check_reachable'  do
   context "connect with name from /etc/services to localhost" do
     subject { commands.check_reachable('localhost', 'ssh', 'tcp', 1) }
     it { should eq "nc -vvvvzt localhost ssh -w 1" }
@@ -35,7 +35,7 @@ describe 'check_reachable', :os => :gentoo  do
   end
 end
 
-describe 'check_resolvable', :os => :gentoo  do
+describe 'check_resolvable'  do
   context "resolve localhost by hosts" do
     subject { commands.check_resolvable('localhost', 'hosts') }
     it { should eq "grep -w -- localhost /etc/hosts" }
@@ -50,52 +50,52 @@ describe 'check_resolvable', :os => :gentoo  do
   end
 end
 
-describe 'check_directory', :os => :gentoo do
+describe 'check_directory' do
   subject { commands.check_directory('/var/log') }
   it { should eq 'test -d /var/log' }
 end
 
-describe 'check_user', :os => :gentoo do
+describe 'check_user' do
   subject { commands.check_user('root') }
   it { should eq 'id root' }
 end
 
-describe 'check_group', :os => :gentoo do
+describe 'check_group' do
   subject { commands.check_group('wheel') }
   it { should eq 'getent group | grep -wq -- wheel' }
 end
 
-describe 'check_installed', :os => :gentoo do
+describe 'check_installed' do
   subject { commands.check_installed('httpd') }
   it { should eq '/usr/bin/eix httpd --installed' }
 end
 
-describe 'check_listening', :os => :gentoo do
+describe 'check_listening' do
   subject { commands.check_listening(80) }
   it { should eq "netstat -tunl | grep -- :80\\ " }
 end
 
-describe 'check_running', :os => :gentoo do
+describe 'check_running' do
   subject { commands.check_running('httpd') }
   it { should eq '/etc/init.d/httpd status' }
 end
 
-describe 'check_running_under_supervisor', :os => :gentoo do
+describe 'check_running_under_supervisor' do
   subject { commands.check_running_under_supervisor('httpd') }
   it { should eq 'supervisorctl status httpd' }
 end
 
-describe 'check_process', :os => :gentoo do
+describe 'check_process' do
   subject { commands.check_process('httpd') }
   it { should eq 'ps aux | grep -w -- httpd | grep -qv grep' }
 end
 
-describe 'check_file_contain', :os => :gentoo do
+describe 'check_file_contain' do
   subject { commands.check_file_contain('/etc/passwd', 'root') }
   it { should eq "grep -q -- root /etc/passwd" }
 end
 
-describe 'check_file_contain_within', :os => :gentoo do
+describe 'check_file_contain_within' do
   context 'contain a pattern in the file' do
     subject { commands.check_file_contain_within('Gemfile', 'rspec') }
     it { should eq "sed -n 1,\\$p Gemfile | grep -q -- rspec -" }
@@ -117,67 +117,67 @@ describe 'check_file_contain_within', :os => :gentoo do
   end
 end
 
-describe 'check_file_md5checksum', :os => :gentoo do
+describe 'check_file_md5checksum' do
   subject { commands.check_file_md5checksum('/etc/passwd', '96c8c50f81a29965f7af6de371ab4250') }
   it { should eq "md5sum /etc/passwd | grep -iw -- ^96c8c50f81a29965f7af6de371ab4250" }
 end
 
-describe 'check_mode', :os => :gentoo do
+describe 'check_mode' do
   subject { commands.check_mode('/etc/sudoers', 440) }
   it { should eq 'stat -c %a /etc/sudoers | grep -- \\^440\\$' }
 end
 
-describe 'check_owner', :os => :gentoo do
+describe 'check_owner' do
   subject { commands.check_owner('/etc/passwd', 'root') }
   it { should eq 'stat -c %U /etc/passwd | grep -- \\^root\\$' }
 end
 
-describe 'check_grouped', :os => :gentoo do
+describe 'check_grouped' do
   subject { commands.check_grouped('/etc/passwd', 'wheel') }
   it { should eq 'stat -c %G /etc/passwd | grep -- \\^wheel\\$' }
 end
 
-describe 'check_cron_entry', :os => :gentoo do
+describe 'check_cron_entry' do
   subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
   it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
-describe 'check_link', :os => :gentoo do
+describe 'check_link' do
   subject { commands.check_link('/etc/system-release', '/etc/redhat-release') }
   it { should eq 'stat -c %N /etc/system-release | grep -- /etc/redhat-release' }
 end
 
-describe 'check_installed_by_gem', :os => :gentoo do
+describe 'check_installed_by_gem' do
   subject { commands.check_installed_by_gem('jekyll') }
   it { should eq 'gem list --local | grep -- \\^jekyll\\ ' }
 end
 
-describe 'check_belonging_group', :os => :gentoo do
+describe 'check_belonging_group' do
   subject { commands.check_belonging_group('root', 'wheel') }
   it { should eq "id root | awk '{print $3}' | grep -- wheel" }
 end
 
-describe 'have_gid', :os => :gentoo do
+describe 'have_gid' do
   subject { commands.check_gid('root', 0) }
   it { should eq "getent group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
 end
 
-describe 'have_uid', :os => :gentoo do
+describe 'have_uid' do
   subject { commands.check_uid('root', 0) }
   it { should eq "id root | grep -- \\^uid\\=0\\(" }
 end
 
-describe 'have_login_shell', :os => :gentoo do
+describe 'have_login_shell' do
   subject { commands.check_login_shell('root', '/bin/bash') }
   it { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
 end
 
-describe 'have_home_directory', :os => :gentoo do
+describe 'have_home_directory' do
   subject { commands.check_home_directory('root', '/root') }
   it { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
 end
 
-describe 'have_authorized_key', :os => :gentoo do
+describe 'have_authorized_key' do
   key = "ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH"
   escaped_key = key.gsub(/ /, '\ ')
 
@@ -195,7 +195,7 @@ describe 'have_authorized_key', :os => :gentoo do
   end
 end
 
-describe 'check_ipatbles', :os => :gentoo do
+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" }
@@ -207,7 +207,7 @@ describe 'check_ipatbles', :os => :gentoo do
   end
 end
 
-describe 'check_selinux', :os => :gentoo do
+describe 'check_selinux' do
   context 'enforcing' do
     subject { commands.check_selinux('enforcing') }
     it { should eq "/usr/sbin/getenforce | grep -i -- enforcing" }
@@ -224,12 +224,12 @@ describe 'check_selinux', :os => :gentoo do
   end
 end
 
-describe 'get_mode', :os => :gentoo do
+describe 'get_mode' do
   subject { commands.get_mode('/dev') }
   it { should eq 'stat -c %a /dev' }
 end
 
-describe 'check_access_by_user', :os => :gentoo do
+describe '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' }

data/spec/gentoo/matchers_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-describe 'Serverspec matchers of Gentoo family', :os => :gentoo do
+include Serverspec::Helper::Gentoo
+
+describe 'Serverspec matchers of Gentoo family' do
   it_behaves_like 'support be_enabled matcher', 'sshd'
   it_behaves_like 'support be_installed matcher', 'openssh'
   it_behaves_like 'support be_running matcher', 'sshd'

data/spec/gentoo/service_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Gentoo
+
+describe 'Serverspec service matchers of Red Hat family' do
+  it_behaves_like 'support service running matcher', 'sshd'
+  it_behaves_like 'support service running under supervisor matcher', 'sshd'
+  it_behaves_like 'support service running under unimplemented matcher', 'sshd'
+  it_behaves_like 'support service enabled matcher', 'sshd'
+end

data/spec/redhat/commands_spec.rb

@@ -1,26 +1,28 @@
 require 'spec_helper'
 
-describe 'check_enabled', :os => :redhat do
+include Serverspec::Helper::RedHat
+
+describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
   it { should eq 'chkconfig --list httpd | grep 3:on' }
 end
 
-describe 'check_file', :os => :redhat do
+describe 'check_file' do
   subject { commands.check_file('/etc/passwd') }
   it { should eq 'test -f /etc/passwd' }
 end
 
-describe 'check_mounted', :os => :redhat  do
+describe 'check_mounted'  do
   subject { commands.check_mounted('/') }
   it { should eq "mount | grep -w -- on\\ /" }
 end
 
-describe 'check_routing_table', :os => :redhat do
+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 '" }
 end
 
-describe 'check_reachable', :os => :redhat  do
+describe 'check_reachable'  do
   context "connect with name from /etc/services to localhost" do
     subject { commands.check_reachable('localhost', 'ssh', 'tcp', 1) }
     it { should eq "nc -vvvvzt localhost ssh -w 1" }
@@ -35,7 +37,7 @@ describe 'check_reachable', :os => :redhat  do
   end
 end
 
-describe 'check_resolvable', :os => :redhat  do
+describe 'check_resolvable'  do
   context "resolve localhost by hosts" do
     subject { commands.check_resolvable('localhost', 'hosts') }
     it { should eq "grep -w -- localhost /etc/hosts" }
@@ -50,52 +52,52 @@ describe 'check_resolvable', :os => :redhat  do
   end
 end
 
-describe 'check_directory', :os => :redhat do
+describe 'check_directory' do
   subject { commands.check_directory('/var/log') }
   it { should eq 'test -d /var/log' }
 end
 
-describe 'check_user', :os => :redhat do
+describe 'check_user' do
   subject { commands.check_user('root') }
   it { should eq 'id root' }
 end
 
-describe 'check_group', :os => :redhat do
+describe 'check_group' do
   subject { commands.check_group('wheel') }
   it { should eq 'getent group | grep -wq -- wheel' }
 end
 
-describe 'check_installed', :os => :redhat do
+describe 'check_installed' do
   subject { commands.check_installed('httpd') }
   it { should eq 'rpm -q httpd' }
 end
 
-describe 'check_listening', :os => :redhat do
+describe 'check_listening' do
   subject { commands.check_listening(80) }
   it { should eq "netstat -tunl | grep -- :80\\ " }
 end
 
-describe 'check_running', :os => :redhat do
+describe 'check_running' do
   subject { commands.check_running('httpd') }
   it { should eq 'service httpd status' }
 end
 
-describe 'check_running_under_supervisor', :os => :redhat do
+describe 'check_running_under_supervisor' do
   subject { commands.check_running_under_supervisor('httpd') }
   it { should eq 'supervisorctl status httpd' }
 end
 
-describe 'check_process', :os => :redhat do
+describe 'check_process' do
   subject { commands.check_process('httpd') }
   it { should eq 'ps aux | grep -w -- httpd | grep -qv grep' }
 end
 
-describe 'check_file_contain', :os => :redhat do
+describe 'check_file_contain' do
   subject { commands.check_file_contain('/etc/passwd', 'root') }
   it { should eq "grep -q -- root /etc/passwd" }
 end
 
-describe 'check_file_contain_within', :os => :redhat do
+describe 'check_file_contain_within' do
   context 'contain a pattern in the file' do
     subject { commands.check_file_contain_within('Gemfile', 'rspec') }
     it { should eq "sed -n 1,\\$p Gemfile | grep -q -- rspec -" }
@@ -117,67 +119,67 @@ describe 'check_file_contain_within', :os => :redhat do
   end
 end
 
-describe 'check_file_md5checksum', :os => :redhat do
+describe 'check_file_md5checksum' do
   subject { commands.check_file_md5checksum('/etc/passwd', '96c8c50f81a29965f7af6de371ab4250') }
   it { should eq "md5sum /etc/passwd | grep -iw -- ^96c8c50f81a29965f7af6de371ab4250" }
 end
 
-describe 'check_mode', :os => :redhat do
+describe 'check_mode' do
   subject { commands.check_mode('/etc/sudoers', 440) }
   it { should eq 'stat -c %a /etc/sudoers | grep -- \\^440\\$' }
 end
 
-describe 'check_owner', :os => :redhat do
+describe 'check_owner' do
   subject { commands.check_owner('/etc/passwd', 'root') }
   it { should eq 'stat -c %U /etc/passwd | grep -- \\^root\\$' }
 end
 
-describe 'check_grouped', :os => :redhat do
+describe 'check_grouped' do
   subject { commands.check_grouped('/etc/passwd', 'wheel') }
   it { should eq 'stat -c %G /etc/passwd | grep -- \\^wheel\\$' }
 end
 
-describe 'check_cron_entry', :os => :redhat do
+describe 'check_cron_entry' do
   subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
   it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
-describe 'check_link', :os => :redhat do
+describe 'check_link' do
   subject { commands.check_link('/etc/system-release', '/etc/redhat-release') }
   it { should eq 'stat -c %N /etc/system-release | grep -- /etc/redhat-release' }
 end
 
-describe 'check_installed_by_gem', :os => :redhat do
+describe 'check_installed_by_gem' do
   subject { commands.check_installed_by_gem('jekyll') }
   it { should eq 'gem list --local | grep -- \\^jekyll\\ ' }
 end
 
-describe 'check_belonging_group', :os => :redhat do
+describe 'check_belonging_group' do
   subject { commands.check_belonging_group('root', 'wheel') }
   it { should eq "id root | awk '{print $3}' | grep -- wheel" }
 end
 
-describe 'have_gid', :os => :redhat do
+describe 'have_gid' do
   subject { commands.check_gid('root', 0) }
   it { should eq "getent group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
 end
 
-describe 'have_uid', :os => :redhat do
+describe 'have_uid' do
   subject { commands.check_uid('root', 0) }
   it { should eq "id root | grep -- \\^uid\\=0\\(" }
 end
 
-describe 'have_login_shell', :os => :redhat do
+describe 'have_login_shell' do
   subject { commands.check_login_shell('root', '/bin/bash') }
   it { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
 end
 
-describe 'have_home_directory', :os => :redhat do
+describe 'have_home_directory' do
   subject { commands.check_home_directory('root', '/root') }
   it { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
 end
 
-describe 'have_authorized_key', :os => :redhat do
+describe 'have_authorized_key' do
   key = "ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH"
   escaped_key = key.gsub(/ /, '\ ')
 
@@ -195,7 +197,7 @@ describe 'have_authorized_key', :os => :redhat do
   end
 end
 
-describe 'check_ipatbles', :os => :redhat do
+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" }
@@ -207,7 +209,7 @@ describe 'check_ipatbles', :os => :redhat do
   end
 end
 
-describe 'check_selinux', :os => :redhat do
+describe 'check_selinux' do
   context 'enforcing' do
     subject { commands.check_selinux('enforcing') }
     it { should eq "/usr/sbin/getenforce | grep -i -- enforcing" }
@@ -224,12 +226,12 @@ describe 'check_selinux', :os => :redhat do
   end
 end
 
-describe 'get_mode', :os => :redhat do
+describe 'get_mode' do
   subject { commands.get_mode('/dev') }
   it { should eq 'stat -c %a /dev' }
 end
 
-describe 'check_access_by_user', :os => :redhat do
+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' }