serverspec 0.6.0 → 0.6.1

data/lib/serverspec/backend/exec.rb

@@ -189,7 +189,6 @@ module Serverspec
           'Base'
         end
       end
-
     end
   end
 end

data/lib/serverspec/commands/base.rb

@@ -196,6 +196,10 @@ module Serverspec
       def check_access_by_user file, user, access
         raise NotImplementedError.new
       end
+
+      def check_kernel_module_loaded name
+        raise NotImplementedError.new
+      end
     end
   end
 end

data/lib/serverspec/commands/debian.rb

@@ -2,13 +2,19 @@ module Serverspec
   module Commands
     class Debian < Linux
       def check_enabled service
-        "ls /etc/rc3.d/ | grep -- #{escape(service)}"
+        # Until everything uses Upstart, this needs an OR.
+        "ls /etc/rc3.d/ | grep -- #{escape(service)} || grep 'start on' /etc/init/#{escape(service)}.conf"      
       end
 
       def check_installed package
         escaped_package = escape(package)
         "dpkg -s #{escaped_package} && ! dpkg -s #{escaped_package} | grep -E '^Status: .+ not-installed$'"
       end
+
+      def check_running service
+        # This is compatible with Debian >Jaunty and Ubuntu derivatives
+        "service #{escape(service)} status | grep 'running'"
+      end
     end
   end
 end

data/lib/serverspec/commands/linux.rb

@@ -21,6 +21,10 @@ module Serverspec
       def check_selinux mode
         "getenforce | grep -i -- #{escape(mode)} && grep -i -- ^SELINUX=#{escape(mode)}$ /etc/selinux/config"
       end
+
+      def check_kernel_module_loaded name
+        "lsmod | grep ^#{name}"
+      end
     end
   end
 end

data/lib/serverspec/helper/type.rb

@@ -3,7 +3,7 @@ module Serverspec
     module Type
       types = %w(
         base service package port file cron command linux_kernel_parameter iptables host
-        routing_table default_gateway selinux user group zfs ipnat ipfilter
+        routing_table default_gateway selinux user group zfs ipnat ipfilter kernel_module
       )
 
       types.each {|type| require "serverspec/type/#{type}" }

data/lib/serverspec/type/base.rb

@@ -6,7 +6,9 @@ module Serverspec
       end
 
       def to_s
-       type = self.class.name.split(':')[-1]
+        type = self.class.name.split(':')[-1]
+        type.gsub!(/([a-z\d])([A-Z])/, '\1 \2')
+        type.capitalize!
         %Q!#{type} "#{@name}"!
       end
     end

data/lib/serverspec/type/kernel_module.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Type
+    class KernelModule < Base
+      def loaded?
+        backend.check_kernel_module_loaded(@name)
+      end
+    end
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/debian/commands_spec.rb

@@ -52,11 +52,13 @@ describe 'Serverspec commands of Debian family' do
   it_behaves_like 'support command get_mode'
 
   it_behaves_like 'support command check_access_by_user'
+
+  it_behaves_like 'support command check_kernel_module_loaded', 'lp'
 end
 
 describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
-  it { should eq 'ls /etc/rc3.d/ | grep -- httpd' }
+  it { should eq "ls /etc/rc3.d/ | grep -- httpd || grep 'start on' /etc/init/httpd.conf" }
 end
 
 describe 'check_installed'  do
@@ -66,5 +68,5 @@ end
 
 describe 'check_running' do
   subject { commands.check_running('httpd') }
-  it { should eq 'service httpd status' }
+  it { should eq "service httpd status | grep 'running'" }
 end

data/spec/debian/kernel_module_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Debian
+
+describe 'Serverspec file matchers of Debian family' do
+  it_behaves_like 'support kernel_module be_loaded matcher', 'lp'
+end

data/spec/gentoo/commands_spec.rb

@@ -52,6 +52,8 @@ describe 'Serverspec commands of Gentoo family' do
   it_behaves_like 'support command get_mode'
 
   it_behaves_like 'support command check_access_by_user'
+
+  it_behaves_like 'support command check_kernel_module_loaded', 'lp'
 end
 
 describe 'check_enabled' do

data/spec/gentoo/kernel_module_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Gentoo
+
+describe 'Serverspec file matchers of Gentoo family' do
+  it_behaves_like 'support kernel_module be_loaded matcher', 'lp'
+end

data/spec/redhat/commands_spec.rb

@@ -50,6 +50,8 @@ describe 'Serverspec commands of Red Hat' do
   it_behaves_like 'support command check_selinux'
 
   it_behaves_like 'support command get_mode'
+
+  it_behaves_like 'support command check_kernel_module_loaded', 'lp'
 end
 
 describe 'check_enabled' do

data/spec/redhat/kernel_module_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+include Serverspec::Helper::RedHat
+
+describe 'Serverspec file matchers of Red Hat family' do
+  it_behaves_like 'support kernel_module be_loaded matcher', 'lp'
+end

data/spec/support/shared_commands_examples.rb

@@ -250,3 +250,8 @@ shared_examples_for 'support command check_access_by_user' do
     it { should eq  'su -s sh -c "test -x /tmp/somethingx" dummyuser3' }
   end
 end
+
+shared_examples_for 'support command check_kernel_module_loaded' do |name|
+  subject { commands.check_kernel_module_loaded(name) }
+  it { should eq "lsmod | grep ^#{name}" }
+end

data/spec/support/shared_kernel_module_examples.rb

@@ -0,0 +1,11 @@
+shared_examples_for 'support kernel_module be_loaded matcher' do |name|
+  describe 'be_loaded' do
+    describe kernel_module(name) do
+      it { should be_loaded }
+    end
+
+    describe kernel_module('invalid-module') do
+      it { should_not be_loaded }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -196,6 +196,7 @@ files:
 - lib/serverspec/type/ipfilter.rb
 - lib/serverspec/type/ipnat.rb
 - lib/serverspec/type/iptables.rb
+- lib/serverspec/type/kernel_module.rb
 - lib/serverspec/type/linux_kernel_parameter.rb
 - lib/serverspec/type/package.rb
 - lib/serverspec/type/port.rb
@@ -228,6 +229,7 @@ files:
 - spec/debian/group_spec.rb
 - spec/debian/host_spec.rb
 - spec/debian/iptables_spec.rb
+- spec/debian/kernel_module_spec.rb
 - spec/debian/linux_kernel_parameter_spec.rb
 - spec/debian/package_spec.rb
 - spec/debian/port_spec.rb
@@ -243,6 +245,7 @@ files:
 - spec/gentoo/group_spec.rb
 - spec/gentoo/host_spec.rb
 - spec/gentoo/iptables_spec.rb
+- spec/gentoo/kernel_module_spec.rb
 - spec/gentoo/linux_kernel_parameter_spec.rb
 - spec/gentoo/package_spec.rb
 - spec/gentoo/port_spec.rb
@@ -258,6 +261,7 @@ files:
 - spec/redhat/group_spec.rb
 - spec/redhat/host_spec.rb
 - spec/redhat/iptables_spec.rb
+- spec/redhat/kernel_module_spec.rb
 - spec/redhat/linux_kernel_parameter_spec.rb
 - spec/redhat/package_spec.rb
 - spec/redhat/port_spec.rb
@@ -290,6 +294,7 @@ files:
 - spec/support/shared_group_examples.rb
 - spec/support/shared_host_examples.rb
 - spec/support/shared_iptables_examples.rb
+- spec/support/shared_kernel_module_examples.rb
 - spec/support/shared_linux_kernel_parameter_examples.rb
 - spec/support/shared_package_examples.rb
 - spec/support/shared_port_examples.rb
@@ -345,6 +350,7 @@ test_files:
 - spec/debian/group_spec.rb
 - spec/debian/host_spec.rb
 - spec/debian/iptables_spec.rb
+- spec/debian/kernel_module_spec.rb
 - spec/debian/linux_kernel_parameter_spec.rb
 - spec/debian/package_spec.rb
 - spec/debian/port_spec.rb
@@ -360,6 +366,7 @@ test_files:
 - spec/gentoo/group_spec.rb
 - spec/gentoo/host_spec.rb
 - spec/gentoo/iptables_spec.rb
+- spec/gentoo/kernel_module_spec.rb
 - spec/gentoo/linux_kernel_parameter_spec.rb
 - spec/gentoo/package_spec.rb
 - spec/gentoo/port_spec.rb
@@ -375,6 +382,7 @@ test_files:
 - spec/redhat/group_spec.rb
 - spec/redhat/host_spec.rb
 - spec/redhat/iptables_spec.rb
+- spec/redhat/kernel_module_spec.rb
 - spec/redhat/linux_kernel_parameter_spec.rb
 - spec/redhat/package_spec.rb
 - spec/redhat/port_spec.rb
@@ -407,6 +415,7 @@ test_files:
 - spec/support/shared_group_examples.rb
 - spec/support/shared_host_examples.rb
 - spec/support/shared_iptables_examples.rb
+- spec/support/shared_kernel_module_examples.rb
 - spec/support/shared_linux_kernel_parameter_examples.rb
 - spec/support/shared_package_examples.rb
 - spec/support/shared_port_examples.rb