serverspec 0.0.5 → 0.0.6

data/lib/serverspec.rb

@@ -7,12 +7,14 @@ require 'serverspec/setup'
 require 'serverspec/commands/base'
 require 'serverspec/commands/redhat'
 require 'serverspec/commands/debian'
+require 'serverspec/commands/gentoo'
 require 'serverspec/commands/solaris'
 
 RSpec.configure do |c|
   c.include(Serverspec::Helper)
   c.include(Serverspec::RedHatHelper, :os => :redhat)
   c.include(Serverspec::DebianHelper, :os => :debian)
+  c.include(Serverspec::GentooHelper, :os => :gentoo)
   c.include(Serverspec::SolarisHelper, :os => :solaris)
   c.add_setting :host, :default => nil
 end

data/lib/serverspec/commands/base.rb

@@ -35,6 +35,10 @@ module Serverspec
         "service #{service} status"
       end
 
+      def check_process process
+        "ps -e | grep -qw #{process}"
+      end
+
       def check_file_contain file, expected_pattern
         "grep -q '#{expected_pattern}' #{file} "
       end

data/lib/serverspec/commands/gentoo.rb

@@ -0,0 +1,13 @@
+module Serverspec
+  module Commands
+    class Gentoo < Base
+      def check_enabled service
+        "/sbin/rc-update show | grep '^\\s*#{service}\\s*|\\s*\\(boot\\|default\\)'"
+      end
+
+      def check_installed package
+        "/usr/bin/eix #{package} --installed"
+      end
+    end
+  end
+end

data/lib/serverspec/helper.rb

@@ -61,6 +61,12 @@ module Serverspec
     end
   end
 
+  module GentooHelper
+    def commands
+      Serverspec::Commands::Gentoo.new
+    end
+  end
+
   module SolarisHelper
     def commands
       Serverspec::Commands::Solaris.new

data/lib/serverspec/matchers/be_running.rb

@@ -1,6 +1,9 @@
 RSpec::Matchers.define :be_running do
   match do |actual|
     ret = ssh_exec(RSpec.configuration.host, commands.check_running(actual))
+    if ret[:exit_code] == 1
+      ret = ssh_exec(RSpec.configuration.host, commands.check_process(actual))
+    end
     ret[:exit_code] == 0
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/gentoo/matchers_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'Serverspec matchers of Gentoo family', :os => :gentoo do
+  let(:test_server_host) { 'serverspec-gentoo-host' }
+
+  it_behaves_like 'support be_enabled matcher', 'sshd'
+  it_behaves_like 'support be_installed matcher', 'openssh'
+  it_behaves_like 'support be_running matcher', 'sshd'
+  it_behaves_like 'support be_listening matcher', 22
+  it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
+  it_behaves_like 'support be_directory matcher', '/etc/ssh'
+  it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'
+  it_behaves_like 'support be_user matcher', 'root'
+  it_behaves_like 'support be_group matcher', 'wheel'
+end

data/spec/redhat/matchers_spec.rb

@@ -12,4 +12,7 @@ describe 'Serverspec matchers of Red Hat family', :os => :redhat do
   it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'
   it_behaves_like 'support be_user matcher', 'root'
   it_behaves_like 'support be_group matcher', 'wheel'
+
+  # Test for case of not registered in the service, but running as process.
+  it_behaves_like 'support be_running matcher', 'udevd'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -92,6 +92,7 @@ files:
 - lib/serverspec.rb
 - lib/serverspec/commands/base.rb
 - lib/serverspec/commands/debian.rb
+- lib/serverspec/commands/gentoo.rb
 - lib/serverspec/commands/redhat.rb
 - lib/serverspec/commands/solaris.rb
 - lib/serverspec/helper.rb
@@ -109,6 +110,7 @@ files:
 - lib/serverspec/version.rb
 - serverspec.gemspec
 - spec/debian/matchers_spec.rb
+- spec/gentoo/matchers_spec.rb
 - spec/redhat/matchers_spec.rb
 - spec/solaris/matchers_spec.rb
 - spec/spec_helper.rb
@@ -134,12 +136,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your provisioned servers
 test_files:
 - spec/debian/matchers_spec.rb
+- spec/gentoo/matchers_spec.rb
 - spec/redhat/matchers_spec.rb
 - spec/solaris/matchers_spec.rb
 - spec/spec_helper.rb