serverspec 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d7cceefe09064845e7a6da397251424940101ba
-  data.tar.gz: a6e7cf0a8df6575ea55afeb06d1ff3ff634e1282
+  metadata.gz: 7db443421700dfdacefd2e30f55e0d7fa0351361
+  data.tar.gz: a2853fb2095bb792edee67cd39bf82c920406182
 SHA512:
-  metadata.gz: fce59959e6ff6e867ba1dc68d9ac9fed31ebc3a13fa9bdd1e7e7e2bdc35eeca3b8257af8ec26301f095fbeedad66e5cac932594788bb3d1d6bfd224ff59af31c
-  data.tar.gz: 3ee39b8c1308dc4f16072e976cb2dd4b8242dc62464ca205a877f24b179f18b077f9f5c2c53880672513108807d5864afc878fd39cf6480871f71ca30fc0b813
+  metadata.gz: 7a577e8153713fee9665b849583edf38eb74bad7759947ac73d1f4e0886a1028b7e0fb2d16cd36602f25f95de83220971be524e1d6a97e78cf441185b254e6d7
+  data.tar.gz: eae422a0ad172a6f68bb2974f219a688b03c28714b27fe451ecc104163cd350ee817e07420bba86c3c3922fe797d1297cc9228ca272e3e53d3fcf077f8cc8e64

data/lib/serverspec/backend/exec.rb

@@ -167,7 +167,7 @@ module Serverspec
         elsif run_command('ls /etc/gentoo-release')[:exit_status] == 0
           'Gentoo'
         elsif run_command('uname -s')[:stdout] =~ /AIX/i
-           'Aix'
+           'AIX'
         elsif (os = run_command('uname -sr')[:stdout]) && os =~ /SunOS/i
           if os =~ /5.10/
             'Solaris10'

data/lib/serverspec/commands/aix.rb

@@ -2,7 +2,7 @@ require 'shellwords'
 
 module Serverspec
   module Commands
-    class Aix < Base
+    class AIX < Base
       class NotImplementedError < Exception; end
 
       def check_access_by_user(file, user, access)

data/lib/serverspec/helper/aix.rb

@@ -1,8 +1,8 @@
 module Serverspec
   module Helper
-    module Aix
+    module AIX
       def commands
-        Serverspec::Commands::Aix.new
+        Serverspec::Commands::AIX.new
       end
     end
   end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/lib/serverspec.rb

@@ -37,7 +37,7 @@ RSpec.configure do |c|
   c.include(Serverspec::Helper::RedHat,    :os => :redhat)
   c.include(Serverspec::Helper::Debian,    :os => :debian)
   c.include(Serverspec::Helper::Gentoo,    :os => :gentoo)
-  c.include(Serverspec::Helper::Aix,	   :os => :aix)
+  c.include(Serverspec::Helper::AIX,	   :os => :aix)
   c.include(Serverspec::Helper::Solaris,   :os => :solaris)
   c.include(Serverspec::Helper::Solaris10, :os => :solaris10)
   c.include(Serverspec::Helper::Solaris11, :os => :solaris11)

data/spec/aix/command_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+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,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+include Serverspec::Helper::AIX
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }

data/spec/aix/default_gateway_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+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,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+include Serverspec::Helper::AIX
 
 describe file('/etc/ssh/sshd_config') do
   it { should be_file }
@@ -72,16 +72,11 @@ end
 
 describe file('/etc/passwd') do
   it { should be_mode 644 }
-  its(:command) { should eq "stat -c %a /etc/passwd | grep -- \\^644\\$" }
-end
-
-describe file('/etc/passwd') do
-  it { should_not be_mode 'invalid' }
 end
 
 describe file('/etc/passwd') do
   it { should be_owned_by 'root' }
-  its(:command) { should eq "stat -c %U /etc/passwd | grep -- \\^root\\$" }
+  its(:command) { should eq "ls -al /etc/passwd | awk '{print $3}' | grep -- \\^root\\$" }
 end
 
 describe file('/etc/passwd') do
@@ -90,7 +85,7 @@ end
 
 describe file('/etc/passwd') do
   it { should be_grouped_into 'root' }
-  its(:command) { should eq "stat -c %G /etc/passwd | grep -- \\^root\\$" }
+  its(:command) { should eq "ls -al /etc/passwd | awk '{print $4}' | grep -- \\^root\\$" }
 end
 
 describe file('/etc/passwd') do
@@ -149,7 +144,7 @@ end
 
 describe file('/tmp') do
   it { should be_readable.by_user('mail') }
-  its(:command) { should eq "runuser -s /bin/sh -c \"test -r /tmp\" mail" }
+  its(:command) { should eq "su -s sh -c \"test -r /tmp\" mail" }
 end
 
 describe file('/tmp') do
@@ -199,7 +194,7 @@ end
 
 describe file('/tmp') do
   it { should be_writable.by_user('mail') }
-  its(:command) { should eq "runuser -s /bin/sh -c \"test -w /tmp\" mail" }
+  its(:command) { should eq "su -s sh -c \"test -w /tmp\" mail" }
 end
 
 describe file('/tmp') do
@@ -249,7 +244,7 @@ end
 
 describe file('/tmp') do
   it { should be_executable.by_user('mail') }
-  its(:command) { should eq "runuser -s /bin/sh -c \"test -x /tmp\" mail" }
+  its(:command) { should eq "su -s sh -c \"test -x /tmp\" mail" }
 end
 
 describe file('/tmp') do

data/spec/aix/group_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+include Serverspec::Helper::AIX
 
 describe group('root') do
   it { should exist }
@@ -13,7 +13,7 @@ end
 
 describe group('root') do
   it { should have_gid 0 }
-  its(:command) { should eq "getent group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
+  its(:command) { should eq "cat etc/group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
 end
 
 describe group('root') do

data/spec/aix/host_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+include Serverspec::Helper::AIX
 
 describe host('127.0.0.1') do
   it { should be_resolvable }

data/spec/aix/linux_kernel_parameter_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+include Serverspec::Helper::AIX
 
 describe linux_kernel_parameter('net.ipv4.tcp_syncookies') do
   let(:stdout) { "1\n" }

data/spec/aix/package_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+include Serverspec::Helper::AIX
 
 describe package('httpd') do
   it { should be_installed }
-  its(:command) { should eq "rpm -q httpd" }
+  its(:command) { should eq "lslpp -L httpd" }
 end
 
 describe package('invalid-package') do
@@ -17,12 +17,7 @@ end
 
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
-  its(:command) { should eq "rpm -q httpd | grep -w -- 2.2.15-28.el6" }
-end
-
-describe package('httpd') do
-  it { should be_installed.by('rpm').with_version('2.2.15-28.el6') }
-  its(:command) { should eq "rpm -q httpd | grep -w -- 2.2.15-28.el6" }
+  its(:command) { should eq "lslpp -L httpd | awk '{print $2}' |  grep -w -- 2.2.15-28.el6" }
 end
 
 describe package('httpd') do

data/spec/aix/php_config_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+include Serverspec::Helper::AIX
 
 describe php_config('default_mimetype') do
   let(:stdout) { 'text/html' }

data/spec/aix/port_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+include Serverspec::Helper::AIX
 
 describe port(80) do
   it { should be_listening }
-  its(:command) { should eq 'netstat -tunl | grep -- :80\\ ' }
+  its(:command) { should eq "netstat -an -f inet | awk '{print $4}' | grep  -- *.80 " }
 end
 
 describe port('invalid') do

data/spec/aix/routing_table_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+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,10 +1,10 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
+include Serverspec::Helper::AIX
 
 describe service('sshd') do
   it { should be_enabled }
-  its(:command) { should eq "chkconfig --list sshd | grep 3:on" }
+  its(:command) { should eq "lssrc -s sshd | grep active" }
 end
 
 describe service('invalid-service') do
@@ -13,7 +13,7 @@ end
 
 describe service('sshd') do
   it { should be_enabled.with_level(4) }
-  its(:command) { should eq "chkconfig --list sshd | grep 4:on" }
+  its(:command) { should eq "lssrc -s sshd | grep active" }
 end
 
 describe service('invalid-service') do
@@ -22,7 +22,7 @@ end
 
 describe service('sshd') do
   it { should be_running }
-  its(:command) { should eq "service sshd status" }
+  its(:command) { should eq "ps -ef | grep -v grep | grep sshd" }
 end
 
 describe service('invalid-daemon') do

data/spec/aix/user_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-include Serverspec::Helper::RedHat
-
+include Serverspec::Helper::AIX
 
 describe user('root') do
   it { should exist }
@@ -14,7 +13,7 @@ end
 
 describe user('root') do
   it { should belong_to_group 'root' }
-  its(:command) { should eq "id root | awk '{print $3}' | grep -- root" }
+  its(:command) { should eq "lsuser -a groups root | awk -F'=' '{print $2}'| sed -e 's/,/ /g' |grep -w  -- root" }
 end
 
 describe user('root') do
@@ -32,7 +31,7 @@ end
 
 describe user('root') do
   it { should have_login_shell '/bin/bash' }
-  its(:command) { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
+  its(:command) { should eq "lsuser -a shell root |awk -F'=' '{print $2}' | grep -w -- /bin/bash" }
 end
 
 describe user('root') do
@@ -41,7 +40,7 @@ end
 
 describe user('root') do
   it { should have_home_directory '/root' }
-  its(:command) { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
+  its(:command) { should eq "lsuser -a home root | awk -F'=' '{print $2}' | grep -w -- /root" }
 end
 
 describe user('root') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -228,25 +228,18 @@ files:
 - lib/serverspec/version.rb
 - serverspec.gemspec
 - spec/aix/command_spec.rb
-- spec/aix/commands_spec.rb
 - spec/aix/cron_spec.rb
 - spec/aix/default_gateway_spec.rb
 - spec/aix/file_spec.rb
 - spec/aix/group_spec.rb
 - spec/aix/host_spec.rb
-- spec/aix/interface_spec.rb
-- spec/aix/iptables_spec.rb
-- spec/aix/kernel_module_spec.rb
 - spec/aix/linux_kernel_parameter_spec.rb
 - spec/aix/package_spec.rb
 - spec/aix/php_config_spec.rb
 - spec/aix/port_spec.rb
 - spec/aix/routing_table_spec.rb
-- spec/aix/selinux_spec.rb
 - spec/aix/service_spec.rb
 - spec/aix/user_spec.rb
-- spec/aix/yumrepo_spec.rb
-- spec/aix/zfs_spec.rb
 - spec/backend/cmd/configuration_spec.rb
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/configuration_spec.rb
@@ -410,25 +403,18 @@ specification_version: 4
 summary: RSpec tests for your servers configured by Puppet, Chef or anything else
 test_files:
 - spec/aix/command_spec.rb
-- spec/aix/commands_spec.rb
 - spec/aix/cron_spec.rb
 - spec/aix/default_gateway_spec.rb
 - spec/aix/file_spec.rb
 - spec/aix/group_spec.rb
 - spec/aix/host_spec.rb
-- spec/aix/interface_spec.rb
-- spec/aix/iptables_spec.rb
-- spec/aix/kernel_module_spec.rb
 - spec/aix/linux_kernel_parameter_spec.rb
 - spec/aix/package_spec.rb
 - spec/aix/php_config_spec.rb
 - spec/aix/port_spec.rb
 - spec/aix/routing_table_spec.rb
-- spec/aix/selinux_spec.rb
 - spec/aix/service_spec.rb
 - spec/aix/user_spec.rb
-- spec/aix/yumrepo_spec.rb
-- spec/aix/zfs_spec.rb
 - spec/backend/cmd/configuration_spec.rb
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/configuration_spec.rb

data/spec/aix/commands_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::RedHat
-
-describe 'check_yumrepo' do
-  subject { commands.check_yumrepo('epel') }
-  it { should eq 'yum repolist all -C | grep ^epel' }
-end
-
-describe 'check_yumrepo_enabled' do
-  subject { commands.check_yumrepo_enabled('epel') }
-  it { should eq 'yum repolist all -C | grep ^epel | grep enabled' }
-end

data/spec/aix/interface_spec.rb

@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::RedHat
-
-describe interface('eth0') do
-  let(:stdout) { '1000' }
-  its(:speed) { should eq 1000 }
-  its(:command) { should eq "ethtool eth0 | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\/s/,\"\\\\1\",\"\")}'" }
-end
-
-describe interface('eth0') do
-  it { should have_ipv4_address("192.168.10.10") }
-  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/'" }
-end
-
-describe interface('eth0') do
-  it { should have_ipv4_address("192.168.10.10/24") }
-  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/24 '" }
-end
-
-describe interface('invalid-interface') do
-  let(:stdout) { '1000' }
-  its(:speed) { should_not eq 100 }
-end

data/spec/aix/iptables_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::RedHat
-
-describe iptables do
-  it { should have_rule '-P INPUT ACCEPT'  }
-  its(:command) { should eq "iptables -S | grep -- -P\\ INPUT\\ ACCEPT" }
-end
-
-describe iptables do
-  it { should_not have_rule 'invalid-rule' }
-end
-
-describe iptables do
-  it { should have_rule('-P INPUT ACCEPT').with_table('mangle').with_chain('INPUT') }
-  its(:command) { should eq "iptables -t mangle -S INPUT | grep -- -P\\ INPUT\\ ACCEPT" }
-end
-
-describe iptables do
-  it { should_not have_rule('invalid-rule').with_table('mangle').with_chain('INPUT') }
-end

data/spec/aix/kernel_module_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::RedHat
-
-describe kernel_module('lp') do
-  it { should be_loaded }
-  its(:command) { should eq "lsmod | grep ^lp" }
-end
-
-describe kernel_module('invalid-module') do
-  it { should_not be_loaded }
-end

data/spec/aix/selinux_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::RedHat
-
-describe selinux do
-  it { should be_enforcing }
-  its(:command) { should eq "getenforce | grep -i -- enforcing && grep -i -- ^SELINUX=enforcing$ /etc/selinux/config" }
-end
-
-describe selinux do
-  it { should be_permissive }
-  its(:command) { should eq "getenforce | grep -i -- permissive && grep -i -- ^SELINUX=permissive$ /etc/selinux/config" }
-end
-
-describe selinux do
-  it { should be_disabled }
-  its(:command) { should eq "test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)" }
-end

data/spec/aix/yumrepo_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::RedHat
-
-describe 'Serverspec yumrepo matchers of Red Hat family' do
-  describe 'exist' do
-    describe yumrepo('epel') do
-      it { should exist }
-    end
-
-    describe yumrepo('invalid-repository') do
-      it { should_not exist }
-    end
-  end
-
-  describe 'be_enabled' do
-    describe yumrepo('epel') do
-      it { should be_enabled }
-    end
-
-    describe yumrepo('invalid-repository') do
-      it { should_not be_enabled }
-    end
-  end
-end

data/spec/aix/zfs_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-include Serverspec::Helper::RedHat
-
-describe zfs('rpool') do
-  it { should exist }
-  its(:command) { should eq "zfs list -H rpool" }
-end
-
-describe zfs('rpool') do
-  it { should have_property 'mountpoint' => '/rpool'  }
-  its(:command) { should eq "zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
-end
-
-describe zfs('rpool') do
-  it { should have_property 'mountpoint' => '/rpool', 'compression' => 'off' }
-  its(:command) { should eq "zfs list -H -o compression rpool | grep -- \\^off\\$ && zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
-end