serverspec 0.11.1 → 0.11.2

data/spec/redhat/interface_spec.rb

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

data/spec/redhat/iptables_spec.rb

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

data/spec/redhat/kernel_module_spec.rb

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

data/spec/redhat/linux_kernel_parameter_spec.rb

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

data/spec/redhat/lxc_spec.rb

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

data/spec/redhat/mail_alias_spec.rb

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

data/spec/redhat/package_spec.rb

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

data/spec/redhat/php_config_spec.rb

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

data/spec/redhat/port_spec.rb

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

data/spec/redhat/routing_table_spec.rb

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

data/spec/redhat/service_spec.rb

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

data/spec/redhat/user_spec.rb

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

data/spec/redhat/yumrepo_spec.rb

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

data/spec/redhat/zfs_spec.rb

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

data/spec/smartos/mail_alias_spec.rb

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

data/spec/solaris10/mail_alias_spec.rb

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

data/spec/solaris10/php_config_spec.rb

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

data/spec/solaris11/command_spec.rb

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

data/spec/solaris11/cron_spec.rb

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

data/spec/solaris11/default_gateway_spec.rb

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

data/spec/solaris11/file_spec.rb

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

data/spec/solaris11/group_spec.rb

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

data/spec/solaris11/host_spec.rb

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

data/spec/solaris11/ipfilter_spec.rb

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

data/spec/solaris11/ipnat_spec.rb

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

data/spec/solaris11/mail_alias_spec.rb

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

data/spec/solaris11/package_spec.rb

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

data/spec/solaris11/php_config_spec.rb

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

data/spec/solaris11/port_spec.rb

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

data/spec/solaris11/routing_table_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-RSpec.configure do |c|
-  c.os = 'Solaris11'
-end
+include Serverspec::Helper::Solaris11
 
 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/solaris11/service_spec.rb

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

data/spec/solaris11/svcprop_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-RSpec.configure do |c|
-  c.os = 'Solaris11'
-end
+include Serverspec::Helper::Solaris11
 
 describe service('svc:/network/http:apache22') do
   it { should have_property 'httpd/enable_64bit' => false }

data/spec/solaris11/user_spec.rb

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

data/spec/solaris11/zfs_spec.rb

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

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ require 'pathname'
 require 'rspec/mocks/standalone'
 
 include Serverspec::Helper::Exec
-include Serverspec::Helper::DetectOS
 
 PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
 

data/spec/windows/command_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 include Serverspec::Helper::Cmd
-RSpec.configure do |c|
-  c.os = 'Windows'
-end
+include Serverspec::Helper::Windows
 
 describe command('test_cmd /test/path/file') do
   let(:stdout) { "test output 1.2.3\r\n" }

data/spec/windows/file_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 include Serverspec::Helper::Cmd
-RSpec.configure do |c|
-  c.os = 'Windows'
-end
+include Serverspec::Helper::Windows
 
 describe file('/some/valid/file') do
   it { should be_file }

data/spec/windows/group_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 include Serverspec::Helper::Cmd
-RSpec.configure do |c|
-  c.os = 'Windows'
-end
+include Serverspec::Helper::Windows
 
 describe group('test.group') do
   it { should exist }

data/spec/windows/port_spec.rb

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

data/spec/windows/service_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 include Serverspec::Helper::Cmd
-RSpec.configure do |c|
-  c.os = 'Windows'
-end
+include Serverspec::Helper::Windows
 
 describe service('Test Service') do
   it { should be_enabled }
@@ -30,4 +28,4 @@ describe service('Test service') do
   it "should raise error if trying to check service monitoring" do
    expect { should_not be_monitored_by('monit') }.to raise_error
  end
-end
+end

data/spec/windows/user_spec.rb

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

data/spec/windows/windows_registry_key_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 include Serverspec::Helper::Cmd
-RSpec.configure do |c|
-  c.os = 'Windows'
-end
+include Serverspec::Helper::Windows
 
 describe windows_registry_key('PATH/TO/THE_KEY') do
   it { should exist }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh