serverspec 0.9.4 → 0.9.5

data/spec/freebsd/package_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
+RSpec.configure do |c|
+  c.os = 'FreeBSD'
+end
 
 describe package('httpd') do
   it { should be_installed }

data/spec/freebsd/php_config_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
+RSpec.configure do |c|
+  c.os = 'FreeBSD'
+end
 
 describe php_config('default_mimetype') do
   let(:stdout) { 'text/html' }

data/spec/freebsd/port_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
+RSpec.configure do |c|
+  c.os = 'FreeBSD'
+end
 
 describe port(80) do
   it { should be_listening }

data/spec/freebsd/routing_table_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
+RSpec.configure do |c|
+  c.os = 'FreeBSD'
+end
 
 describe routing_table do
   let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\ndefault via 192.168.100.1 dev eth0 \r\n" }

data/spec/freebsd/service_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
+RSpec.configure do |c|
+  c.os = 'FreeBSD'
+end
 
 describe service('sshd') do
   it { should be_enabled }

data/spec/freebsd/user_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::FreeBSD
-
+RSpec.configure do |c|
+  c.os = 'FreeBSD'
+end
 
 describe user('root') do
   it { should exist }

data/spec/gentoo/command_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe command('cat /etc/resolv.conf') do
   let(:stdout) { "nameserver 127.0.0.1\r\n" }

data/spec/gentoo/cron_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }

data/spec/gentoo/default_gateway_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe default_gateway do
   let(:stdout) { "default via 192.168.1.1 dev eth1 \r\n" }

data/spec/gentoo/file_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+
 
 describe file('/etc/ssh/sshd_config') do
   it { should be_file }

data/spec/gentoo/group_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe group('root') do
   it { should exist }

data/spec/gentoo/host_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe host('127.0.0.1') do
   it { should be_resolvable }

data/spec/gentoo/interface_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe interface('eth0') do
   let(:stdout) { '1000' }

data/spec/gentoo/iptables_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe iptables do
   it { should have_rule '-P INPUT ACCEPT'  }

data/spec/gentoo/kernel_module_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe kernel_module('lp') do
   it { should be_loaded }

data/spec/gentoo/linux_kernel_parameter_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe linux_kernel_parameter('net.ipv4.tcp_syncookies') do
   let(:stdout) { "1\n" }

data/spec/gentoo/mail_alias_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe mail_alias('daemon') do
   it { should be_aliased_to "root" }

data/spec/gentoo/package_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe package('apache') do
   it { should be_installed }

data/spec/gentoo/php_config_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe php_config('default_mimetype') do
   let(:stdout) { 'text/html' }

data/spec/gentoo/port_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe port(80) do
   it { should be_listening }

data/spec/gentoo/routing_table_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe routing_table do
   let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\ndefault via 192.168.100.1 dev eth0 \r\n" }

data/spec/gentoo/selinux_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe selinux do
   it { should be_enforcing }

data/spec/gentoo/service_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe service('sshd') do
   it { should be_enabled }

data/spec/gentoo/user_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe user('root') do
   it { should exist }

data/spec/gentoo/zfs_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Gentoo
+RSpec.configure do |c|
+  c.os = 'Gentoo'
+end
 
 describe zfs('rpool') do
   it { should exist }

data/spec/redhat/command_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe command('cat /etc/resolv.conf') do
   let(:stdout) { "nameserver 127.0.0.1\r\n" }

data/spec/redhat/commands_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe 'check_yumrepo' do
   subject { commands.check_yumrepo('epel') }

data/spec/redhat/cron_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }

data/spec/redhat/default_gateway_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe default_gateway do
   let(:stdout) { "default via 192.168.1.1 dev eth1 \r\n" }

data/spec/redhat/file_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe file('/etc/ssh/sshd_config') do
   it { should be_file }

data/spec/redhat/group_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe group('root') do
   it { should exist }

data/spec/redhat/host_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe host('127.0.0.1') do
   it { should be_resolvable }

data/spec/redhat/interface_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe interface('eth0') do
   let(:stdout) { '1000' }

data/spec/redhat/iptables_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe iptables do
   it { should have_rule '-P INPUT ACCEPT'  }

data/spec/redhat/kernel_module_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe kernel_module('lp') do
   it { should be_loaded }

data/spec/redhat/linux_kernel_parameter_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe linux_kernel_parameter('net.ipv4.tcp_syncookies') do
   let(:stdout) { "1\n" }

data/spec/redhat/mail_alias_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe mail_alias('daemon') do
   it { should be_aliased_to "root" }

data/spec/redhat/package_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe package('httpd') do
   it { should be_installed }

data/spec/redhat/php_config_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe php_config('default_mimetype') do
   let(:stdout) { 'text/html' }

data/spec/redhat/port_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe port(80) do
   it { should be_listening }

data/spec/redhat/routing_table_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe routing_table do
   let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\ndefault via 192.168.100.1 dev eth0 \r\n" }

data/spec/redhat/selinux_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe selinux do
   it { should be_enforcing }

data/spec/redhat/service_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe service('sshd') do
   it { should be_enabled }

data/spec/redhat/user_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
-
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe user('root') do
   it { should exist }

data/spec/redhat/yumrepo_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe 'Serverspec yumrepo matchers of Red Hat family' do
   describe 'exist' do

data/spec/redhat/zfs_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+RSpec.configure do |c|
+  c.os = 'RedHat'
+end
 
 describe zfs('rpool') do
   it { should exist }

data/spec/smartos/commands_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::SmartOS
+RSpec.configure do |c|
+  c.os = 'SmartOS'
+end
 
 ## SmartOS
 describe 'check_installed' do

data/spec/smartos/mail_alias_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::SmartOS
+RSpec.configure do |c|
+  c.os = 'SmartOS'
+end
 
 describe mail_alias('daemon') do
   it { should be_aliased_to "root" }

data/spec/solaris10/commands_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Solaris10
+RSpec.configure do |c|
+  c.os = 'Solaris10'
+end
 
 describe 'check_zfs' do
   context 'check without properties' do

data/spec/solaris10/mail_alias_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Solaris10
+RSpec.configure do |c|
+  c.os = 'Solaris10'
+end
 
 describe mail_alias('daemon') do
   it { should be_aliased_to "root" }

data/spec/solaris10/php_config_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Solaris10
+RSpec.configure do |c|
+  c.os = 'Solaris10'
+end
 
 describe php_config('default_mimetype') do
   let(:stdout) { 'text/html' }

data/spec/solaris11/command_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Solaris11
+RSpec.configure do |c|
+  c.os = 'Solaris11'
+end
 
 describe command('cat /etc/resolv.conf') do
   let(:stdout) { "nameserver 127.0.0.1\r\n" }

data/spec/solaris11/cron_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Solaris11
+RSpec.configure do |c|
+  c.os = 'Solaris11'
+end
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }

data/spec/solaris11/default_gateway_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Solaris11
+RSpec.configure do |c|
+  c.os = 'Solaris11'
+end
 
 describe default_gateway do
   let(:stdout) { "default via 192.168.1.1 dev eth1 \r\n" }

data/spec/solaris11/file_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Solaris11
+RSpec.configure do |c|
+  c.os = 'Solaris11'
+end
 
 describe file('/etc/ssh/sshd_config') do
   it { should be_file }

data/spec/solaris11/group_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Solaris11
+RSpec.configure do |c|
+  c.os = 'Solaris11'
+end
 
 describe group('root') do
   it { should exist }

data/spec/solaris11/host_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Solaris11
+RSpec.configure do |c|
+  c.os = 'Solaris11'
+end
 
 describe host('127.0.0.1') do
   it { should be_resolvable }

data/spec/solaris11/ipfilter_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Solaris11
+RSpec.configure do |c|
+  c.os = 'Solaris11'
+end
 
 describe ipfilter do
   it { should have_rule 'pass in quick on lo0 all' }

data/spec/solaris11/ipnat_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-include Serverspec::Helper::Solaris11
+RSpec.configure do |c|
+  c.os = 'Solaris11'
+end
 
 describe ipnat do
   it { should have_rule 'map net1 192.168.0.0/24 -> 0.0.0.0/32' }