serverspec 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 023526d17b8618754baa4934056510262885ae34
-  data.tar.gz: f93f6e2ba37634eec4d5891f725f6ab4cc1c1a39
+  metadata.gz: fa5c70430c2fb240182165631842fc28cbad2da9
+  data.tar.gz: 1608f99186882f77029ffdff9fe0469104c17724
 SHA512:
-  metadata.gz: 68647589cb070900e3d4ad44d03423c064249619e4367993c00ea7f58a3437906d391a4f0e135e73c0c3a2c56e0169c18e59f2fe43942e89b47cc6b0b722d29d
-  data.tar.gz: a5048fa1b0a72b2bb4a869b089d8e7207424a821686c7a930e67d596a0a4e6f3f3b7b37aa5167ccc393d14e8d4503459e3a4046e5d9c3f7de951f845e222db80
+  metadata.gz: 3ab1545b9d6a79b56a875a7b2e712dbd531d125c047303f5788564a419dc49a8ce48a7f6aa7686e490f9051b832bb5e80d9d5693b756ee007313fb21691149d2
+  data.tar.gz: 5dd5332793bc57e35adc31d439df50c4b263a42868ec5515f6c435afa4da8ea5ee8ff4fe4e14597f9be4e5fe8cd669a14bb77fd461f7e3dba6f5e1905cb66e70

data/lib/serverspec/backend/exec.rb

@@ -168,33 +168,37 @@ module Serverspec
       def check_os
         return RSpec.configuration.os if RSpec.configuration.os
         if run_command('ls /etc/redhat-release')[:exit_status] == 0
-          'RedHat'
+          line = run_command('cat /etc/redhat-release')[:stdout]
+          if line =~ /release (\d[\d.]*)/
+            release = $1
+          end
+          { :family => 'RedHat', :release => release }
         elsif run_command('ls /etc/system-release')[:exit_status] == 0
-          'RedHat' # Amazon Linux
+          { :family => 'RedHat', :release => nil } # Amazon Linux
         elsif run_command('ls /etc/debian_version')[:exit_status] == 0
-          'Debian'
+          { :family => 'Debian', :release => nil }
         elsif run_command('ls /etc/gentoo-release')[:exit_status] == 0
-          'Gentoo'
+          { :family => 'Gentoo', :release => nil }
         elsif run_command('ls /usr/lib/setup/Plamo-*')[:exit_status] == 0
-          'Plamo'
+          { :family => 'Plamo', :release => nil }
         elsif run_command('uname -s')[:stdout] =~ /AIX/i
-           'AIX'
+          { :family => 'AIX', :release => nil }
         elsif (os = run_command('uname -sr')[:stdout]) && os =~ /SunOS/i
           if os =~ /5.10/
-            'Solaris10'
+            { :family => 'Solaris10', :release => nil }
           elsif run_command('grep -q "Oracle Solaris 11" /etc/release')[:exit_status] == 0
-            'Solaris11'
+            { :family => 'Solaris11', :release => nil }
           elsif run_command('grep -q SmartOS /etc/release')[:exit_status] == 0
-            'SmartOS'
+            { :family => 'SmartOS', :release => nil }
           else
-            'Solaris'
+            { :family => 'Solaris', :release => nil }
           end
         elsif run_command('uname -s')[:stdout] =~ /Darwin/i
-          'Darwin'
+          { :family => 'Darwin', :release => nil }
         elsif run_command('uname -s')[:stdout] =~ /FreeBSD/i
-          'FreeBSD'
+          { :family => 'FreeBSD', :release => nil }
         else
-          'Base'
+          { :family => 'Base', :release => nil }
         end
       end
     end

data/lib/serverspec/helper/detect_os.rb

@@ -2,17 +2,16 @@ module Serverspec
   module Helper
     module DetectOS
       def commands
-        property[:os_type] = {} if ! property[:os_type]
+        property[:os_by_host] = {} if ! property[:os_by_host]
         host = RSpec.configuration.ssh ? RSpec.configuration.ssh.host : 'localhost'
 
-        if property[:os_type][host]
-          os = property[:os_type][host]
+        if property[:os_by_host][host]
+          os = property[:os_by_host][host]
         else
           os = backend(Serverspec::Commands::Base).check_os
-          property[:os_type][host] = os
         end
 
-        self.class.const_get('Serverspec').const_get('Commands').const_get(os).new
+        self.class.const_get('Serverspec').const_get('Commands').const_get(os[:family]).new
       end
     end
   end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

data/spec/aix/command_spec.rb

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

data/spec/aix/cron_spec.rb

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

data/spec/aix/default_gateway_spec.rb

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

data/spec/aix/file_spec.rb

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

data/spec/aix/group_spec.rb

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

data/spec/aix/host_spec.rb

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

data/spec/aix/package_spec.rb

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

data/spec/aix/php_config_spec.rb

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

data/spec/aix/port_spec.rb

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

data/spec/aix/routing_table_spec.rb

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

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

data/spec/aix/user_spec.rb

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

data/spec/backend/cmd/configuration_spec.rb

@@ -4,10 +4,6 @@ require 'support/powershell_command_runner'
 include Serverspec::Helper::Cmd
 include Serverspec::Helper::Windows
 
-RSpec.configure do |c|
-  c.os = 'Windows'
-end
-
 describe "Cmd" do
   it_behaves_like "a powershell command runner"
 end

data/spec/backend/winrm/configuration_spec.rb

@@ -4,10 +4,6 @@ require 'support/powershell_command_runner'
 include Serverspec::Helper::WinRM
 include Serverspec::Helper::Windows
 
-RSpec.configure do |c|
-  c.os = 'Windows'
-end
-
 describe "WinRM" do
   it_behaves_like "a powershell command runner"
 end

data/spec/darwin/command_spec.rb

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

data/spec/darwin/cron_spec.rb

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

data/spec/darwin/default_gateway_spec.rb

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

data/spec/darwin/file_spec.rb

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

data/spec/darwin/group_spec.rb

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

data/spec/darwin/host_spec.rb

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

data/spec/darwin/mail_alias_spec.rb

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

data/spec/darwin/package_spec.rb

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

data/spec/darwin/php_config_spec.rb

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

data/spec/darwin/port_spec.rb

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

data/spec/darwin/routing_table_spec.rb

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

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

data/spec/darwin/user_spec.rb

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

data/spec/debian/cgroup_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-RSpec.configure do |c|
-  c.os = 'Debian'
-end
+include Serverspec::Helper::Debian
 
 describe cgroup('group1') do
   let(:stdout) { "1\r\n" }

data/spec/debian/command_spec.rb

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

data/spec/debian/cron_spec.rb

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

data/spec/debian/default_gateway_spec.rb

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

data/spec/debian/file_spec.rb

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

data/spec/debian/group_spec.rb

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

data/spec/debian/host_spec.rb

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

data/spec/debian/interface_spec.rb

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

data/spec/debian/iptables_spec.rb

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

data/spec/debian/kernel_module_spec.rb

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

data/spec/debian/linux_kernel_parameter_spec.rb

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

data/spec/debian/lxc_spec.rb

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

data/spec/debian/mail_alias_spec.rb

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

data/spec/debian/package_spec.rb

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

data/spec/debian/php_config_spec.rb

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

data/spec/debian/port_spec.rb

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

data/spec/debian/routing_table_spec.rb

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

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

data/spec/debian/service_spec.rb

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

data/spec/debian/user_spec.rb

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

data/spec/debian/zfs_spec.rb

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

data/spec/freebsd/command_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::DetectOS
+include Serverspec::Helper::FreeBSD
 
 describe command('cat /etc/resolv.conf') do
   let(:stdout) { "nameserver 127.0.0.1\r\n" }

data/spec/freebsd/cron_spec.rb

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