serverspec 0.6.6 → 0.6.7

data/lib/serverspec/attributes.rb

@@ -6,7 +6,7 @@ module Serverspec
     def initialize
       @attr = {}
     end
-    def attributes attr=nil
+    def attributes(attr=nil)
       if ! attr.nil?
         @attr = attr
       end

data/lib/serverspec/commands/base.rb

@@ -5,24 +5,32 @@ module Serverspec
     class Base
       class NotImplementedError < Exception; end
 
-      def escape target
+      def escape(target)
         Shellwords.shellescape(target.to_s())
       end
 
-      def check_enabled service
+      def check_enabled(service)
         raise NotImplementedError.new
       end
 
-      def check_mounted path
+      def check_yumrepo(repository)
+        raise NotImplementedError.new
+      end
+
+      def check_yumrepo_enabled(repository)
+        raise NotImplementedError.new
+      end
+
+      def check_mounted(path)
         regexp = "on #{path}"
         "mount | grep -w -- #{escape(regexp)}"
       end
 
-      def check_routing_table destination
+      def check_routing_table(destination)
         "ip route | grep -E '^#{destination} |^default '"
       end
 
-      def check_reachable host, port, proto, timeout
+      def check_reachable(host, port, proto, timeout)
         if port.nil?
           "ping -n #{escape(host)} -w #{escape(timeout)} -c 2"
         else
@@ -30,7 +38,7 @@ module Serverspec
         end
       end
 
-      def check_resolvable name, type
+      def check_resolvable(name, type)
         if type == "dns"
           "nslookup -timeout=1 #{escape(name)}"
         elsif type == "hosts"
@@ -40,78 +48,78 @@ module Serverspec
         end
       end
 
-      def check_file file
+      def check_file(file)
         "test -f #{escape(file)}"
       end
 
-      def check_socket file
+      def check_socket(file)
         "test -S #{escape(file)}"
       end
 
-      def check_directory directory
+      def check_directory(directory)
         "test -d #{escape(directory)}"
       end
 
-      def check_user user
+      def check_user(user)
         "id #{escape(user)}"
       end
 
-      def check_group group
+      def check_group(group)
         "getent group | grep -wq -- #{escape(group)}"
       end
 
-      def check_installed package
+      def check_installed(package)
         raise NotImplementedError.new
       end
 
-      def check_listening port
+      def check_listening(port)
         regexp = ":#{port} "
         "netstat -tunl | grep -- #{escape(regexp)}"
       end
 
-      def check_running service
+      def check_running(service)
         "service #{escape(service)} status"
       end
 
-      def check_running_under_supervisor service
+      def check_running_under_supervisor(service)
         "supervisorctl status #{escape(service)}"
       end
 
-      def check_process process
+      def check_process(process)
         "ps aux | grep -w -- #{escape(process)} | grep -qv grep"
       end
 
-      def check_file_contain file, expected_pattern
+      def check_file_contain(file, expected_pattern)
         "grep -q -- #{escape(expected_pattern)} #{escape(file)}"
       end
 
-      def check_file_md5checksum file, expected
+      def check_file_md5checksum(file, expected)
         "md5sum #{escape(file)} | grep -iw -- ^#{escape(expected)}"
       end
 
-      def check_file_contain_within file, expected_pattern, from=nil, to=nil
+      def check_file_contain_within(file, expected_pattern, from=nil, to=nil)
         from ||= '1'
         to ||= '$'
         checker = check_file_contain("-", expected_pattern)
         "sed -n #{escape(from)},#{escape(to)}p #{escape(file)} | #{checker}"
       end
 
-      def check_mode file, mode
+      def check_mode(file, mode)
         regexp = "^#{mode}$"
         "stat -c %a #{escape(file)} | grep -- #{escape(regexp)}"
       end
 
-      def check_owner file, owner
+      def check_owner(file, owner)
         regexp = "^#{owner}$"
         "stat -c %U #{escape(file)} | grep -- #{escape(regexp)}"
       end
 
-      def check_grouped file, group
+      def check_grouped(file, group)
         regexp = "^#{group}$"
         "stat -c %G #{escape(file)} | grep -- #{escape(regexp)}"
       end
 
-      def check_cron_entry user, entry
+      def check_cron_entry(user, entry)
         entry_escaped = entry.gsub(/\*/, '\\*')
         if user.nil?
           "crontab -l | grep -- #{escape(entry_escaped)}"
@@ -120,11 +128,11 @@ module Serverspec
         end
       end
 
-      def check_link link, target
+      def check_link(link, target)
         "stat -c %N #{escape(link)} | grep -- #{escape(target)}"
       end
 
-      def check_installed_by_gem name, version=nil
+      def check_installed_by_gem(name, version=nil)
         cmd = "gem list --local | grep -w -- ^#{escape(name)}"
         if ! version.nil?
           cmd = "#{cmd} | grep -w -- #{escape(version)}"
@@ -132,13 +140,13 @@ module Serverspec
         cmd
       end
 
-      def check_installed_by_npm name, version=nil
+      def check_installed_by_npm(name, version=nil)
         cmd = "npm ls #{escape(name)} -g"
         cmd = "#{cmd} | grep -w -- #{escape(version)}" unless version.nil?
         cmd
       end
 
-      def check_installed_by_pecl name, version=nil
+      def check_installed_by_pecl(name, version=nil)
         cmd = "pecl list | grep -w -- ^#{escape(name)}"
         if ! version.nil?
           cmd = "#{cmd} | grep -w -- #{escape(version)}"
@@ -146,38 +154,38 @@ module Serverspec
         cmd
       end
 
-      def check_belonging_group user, group
+      def check_belonging_group(user, group)
         "id #{escape(user)} | awk '{print $3}' | grep -- #{escape(group)}"
       end
 
-      def check_gid group, gid
+      def check_gid(group, gid)
         regexp = "^#{group}"
         "getent group | grep -w -- #{escape(regexp)} | cut -f 3 -d ':' | grep -w -- #{escape(gid)}"
       end
 
-      def check_uid user, uid
+      def check_uid(user, uid)
         regexp = "^uid=#{uid}("
         "id #{escape(user)} | grep -- #{escape(regexp)}"
       end
 
-      def check_login_shell user, path_to_shell
+      def check_login_shell(user, path_to_shell)
         "getent passwd #{escape(user)} | cut -f 7 -d ':' | grep -w -- #{escape(path_to_shell)}"
       end
 
-      def check_home_directory user, path_to_home
+      def check_home_directory(user, path_to_home)
         "getent passwd #{escape(user)} | cut -f 6 -d ':' | grep -w -- #{escape(path_to_home)}"
       end
 
-      def check_authorized_key user, key
+      def check_authorized_key(user, key)
         key.sub!(/\s+\S*$/, '') if key.match(/^\S+\s+\S+\s+\S*$/)
         "grep -w -- #{escape(key)} ~#{escape(user)}/.ssh/authorized_keys"
       end
 
-      def check_iptables_rule rule, table=nil, chain=nil
+      def check_iptables_rule(rule, table=nil, chain=nil)
         raise NotImplementedError.new
       end
 
-      def check_zfs zfs, property=nil, value=nil
+      def check_zfs(zfs, property=nil, value=nil)
         raise NotImplementedError.new
       end
 
@@ -185,31 +193,31 @@ module Serverspec
         "stat -c %a #{escape(file)}"
       end
 
-      def check_ipfilter_rule rule
+      def check_ipfilter_rule(rule)
         raise NotImplementedError.new
       end
 
-      def check_ipnat_rule rule
+      def check_ipnat_rule(rule)
         raise NotImplementedError.new
       end
 
-      def check_svcprop svc, property, value
+      def check_svcprop(svc, property, value)
         raise NotImplementedError.new
       end
 
-      def check_svcprops svc, property
+      def check_svcprops(svc, property)
         raise NotImplementedError.new
       end
 
-      def check_selinux mode
+      def check_selinux(mode)
         raise NotImplementedError.new
       end
 
-      def check_access_by_user file, user, access
+      def check_access_by_user(file, user, access)
         raise NotImplementedError.new
       end
 
-      def check_kernel_module_loaded name
+      def check_kernel_module_loaded(name)
         raise NotImplementedError.new
       end
     end

data/lib/serverspec/commands/darwin.rb

@@ -3,23 +3,21 @@ require 'shellwords'
 module Serverspec
   module Commands
     class Darwin < Base
-      class NotImplementedError < Exception; end
-
-      def check_file_md5checksum file, expected
+      def check_file_md5checksum(file, expected)
         "openssl md5 #{escape(file)} | cut -d'=' -f2 | cut -c 2- | grep -E ^#{escape(expected)}$"
       end
 
-      def check_mode file, mode
+      def check_mode(file, mode)
         regexp = "^#{mode}$"
         "stat -f%Lp #{escape(file)} | grep -- #{escape(regexp)}"
       end
 
-      def check_owner file, owner
+      def check_owner(file, owner)
         regexp = "^#{owner}$"
         "stat -f %Su #{escape(file)} | grep -- #{escape(regexp)}"
       end
 
-      def check_grouped file, group
+      def check_grouped(file, group)
         regexp = "^#{group}$"
         "stat -f %Sg #{escape(file)} | grep -- #{escape(regexp)}"
       end
@@ -28,7 +26,7 @@ module Serverspec
         "stat -f%Lp #{escape(file)}"
       end
 
-      def check_access_by_user file, user, access
+      def check_access_by_user(file, user, access)
         "sudo -u #{user} -s /bin/test -#{access} #{file}"
       end
     end

data/lib/serverspec/commands/debian.rb

@@ -1,17 +1,17 @@
 module Serverspec
   module Commands
     class Debian < Linux
-      def check_enabled service
+      def check_enabled(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
+      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
+      def check_running(service)
         # This is compatible with Debian >Jaunty and Ubuntu derivatives
         "service #{escape(service)} status | grep 'running'"
       end

data/lib/serverspec/commands/gentoo.rb

@@ -1,16 +1,16 @@
 module Serverspec
   module Commands
     class Gentoo < Linux
-      def check_enabled service
+      def check_enabled(service)
         regexp = "^\\s*#{service}\\s*|\\s*\\(boot\\|default\\)"
         "rc-update show | grep -- #{escape(regexp)}"
       end
 
-      def check_installed package
+      def check_installed(package)
         "eix #{escape(package)} --installed"
       end
 
-      def check_running service
+      def check_running(service)
         "/etc/init.d/#{escape(service)} status"
       end
     end

data/lib/serverspec/commands/linux.rb

@@ -3,13 +3,11 @@ require 'shellwords'
 module Serverspec
   module Commands
     class Linux < Base
-      class NotImplementedError < Exception; end
-
-      def check_access_by_user file, user, access
+      def check_access_by_user(file, user, access)
         "su -s sh -c \"test -#{access} #{file}\" #{user}"
       end
 
-      def check_iptables_rule rule, table=nil, chain=nil
+      def check_iptables_rule(rule, table=nil, chain=nil)
         cmd = "iptables"
         cmd += " -t #{escape(table)}" if table
         cmd += " -S"
@@ -18,11 +16,11 @@ module Serverspec
         cmd
       end
 
-      def check_selinux mode
+      def check_selinux(mode)
         "getenforce | grep -i -- #{escape(mode)} && grep -i -- ^SELINUX=#{escape(mode)}$ /etc/selinux/config"
       end
 
-      def check_kernel_module_loaded name
+      def check_kernel_module_loaded(name)
         "lsmod | grep ^#{name}"
       end
     end

data/lib/serverspec/commands/redhat.rb

@@ -1,16 +1,24 @@
 module Serverspec
   module Commands
     class RedHat < Linux
-      def check_access_by_user file, user, access
+      def check_access_by_user(file, user, access)
         # Redhat-specific
         "runuser -s sh -c \"test -#{access} #{file}\" #{user}"
       end
 
-      def check_enabled service
+      def check_enabled(service)
         "chkconfig --list #{escape(service)} | grep 3:on"
       end
 
-      def check_installed package
+      def check_yumrepo(repository)
+        "yum repolist -C | grep ^#{escape(repository)}"
+      end
+
+      def check_yumrepo_enabled(repository)
+        "yum repolist all -C | grep ^#{escape(repository)} | grep enabled"
+      end
+
+      def check_installed(package)
         "rpm -q #{escape(package)}"
       end
     end

data/lib/serverspec/commands/solaris.rb

@@ -1,24 +1,24 @@
 module Serverspec
   module Commands
     class Solaris < Base
-      def check_enabled service
+      def check_enabled(service)
         "svcs -l #{escape(service)} 2> /dev/null | grep 'enabled      true'"
       end
 
-      def check_installed package
+      def check_installed(package)
         "pkg list -H #{escape(package)} 2> /dev/null"
       end
 
-      def check_listening port
+      def check_listening(port)
         regexp = "\.#{port} "
         "netstat -an 2> /dev/null | egrep 'LISTEN|Idle' | grep -- #{escape(regexp)}"
       end
 
-      def check_running service
+      def check_running(service)
         "svcs -l #{escape(service)} status 2> /dev/null |grep 'state        online'"
       end
 
-      def check_cron_entry user, entry
+      def check_cron_entry(user, entry)
         entry_escaped = entry.gsub(/\*/, '\\*')
         if user.nil?
           "crontab -l | grep -- #{escape(entry_escaped)}"
@@ -27,7 +27,7 @@ module Serverspec
         end
       end
 
-      def check_zfs zfs, property=nil
+      def check_zfs(zfs, property=nil)
         if property.nil?
           "zfs list -H #{escape(zfs)}"
         else
@@ -40,21 +40,21 @@ module Serverspec
         end
       end
 
-      def check_ipfilter_rule rule
+      def check_ipfilter_rule(rule)
         "ipfstat -io 2> /dev/null | grep -- #{escape(rule)}"
       end
 
-      def check_ipnat_rule rule
+      def check_ipnat_rule(rule)
         regexp = "^#{rule}$"
         "ipnat -l 2> /dev/null | grep -- #{escape(regexp)}"
       end
 
-      def check_svcprop svc, property, value
+      def check_svcprop(svc, property, value)
         regexp = "^#{value}$"
         "svcprop -p #{escape(property)} #{escape(svc)} | grep -- #{escape(regexp)}"
       end
 
-      def check_svcprops svc, property
+      def check_svcprops(svc, property)
         commands = []
         property.sort.each do |key, value|
           regexp = "^#{value}$"
@@ -63,31 +63,31 @@ module Serverspec
         commands.join(' && ')
       end
 
-      def check_file_contain_within file, expected_pattern, from=nil, to=nil
+      def check_file_contain_within(file, expected_pattern, from=nil, to=nil)
         from ||= '1'
         to ||= '$'
         checker = check_file_contain("/dev/stdin", expected_pattern)
         "sed -n #{escape(from)},#{escape(to)}p #{escape(file)} | #{checker}"
       end
 
-      def check_belonging_group user, group
+      def check_belonging_group(user, group)
         "id -Gn #{escape(user)} | grep -- #{escape(group)}"
       end
 
-      def check_gid group, gid
+      def check_gid(group, gid)
         regexp = "^#{group}:"
         "getent group | grep -- #{escape(regexp)} | cut -f 3 -d ':' | grep -w -- #{escape(gid)}"
       end
 
-      def check_home_directory user, path_to_home
+      def check_home_directory(user, path_to_home)
         "getent passwd #{escape(user)} | cut -f 6 -d ':' | grep -w -- #{escape(path_to_home)}"
       end
 
-      def check_login_shell user, path_to_shell
+      def check_login_shell(user, path_to_shell)
         "getent passwd #{escape(user)} | cut -f 7 -d ':' | grep -w -- #{escape(path_to_shell)}"
       end
 
-      def check_access_by_user file, user, access
+      def check_access_by_user(file, user, access)
         # http://docs.oracle.com/cd/E23823_01/html/816-5166/su-1m.html
         ## No need for login shell as it seems that behavior as superuser is favorable for us, but needs
         ## to be better tested under real solaris env

data/lib/serverspec/helper/type.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Helper
     module Type
       types = %w(
-        base service package port file cron command linux_kernel_parameter iptables host
+        base yumrepo service package port file cron command linux_kernel_parameter iptables host
         routing_table default_gateway selinux user group zfs ipnat ipfilter kernel_module
       )
 

data/lib/serverspec/subject.rb

@@ -1,6 +1,6 @@
 module Serverspec
   class Subject
-    def value v=nil
+    def value(v=nil)
       if v.nil?
         @value
       else

data/lib/serverspec/type/service.rb

@@ -5,7 +5,7 @@ module Serverspec
         backend.check_enabled(@name)
       end
 
-      def running? under
+      def running?(under)
         if under
           check_method = "check_running_under_#{under}".to_sym
 

data/lib/serverspec/type/yumrepo.rb

@@ -0,0 +1,13 @@
+module Serverspec
+  module Type
+    class Yumrepo < Base
+      def exists?
+        backend.check_yumrepo(@name)
+      end
+
+      def enabled?
+        backend.check_yumrepo_enabled(@name)
+      end
+    end
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/lib/serverspec.rb

@@ -68,8 +68,9 @@ module RSpec
           exception_class_name = exception_class_name_for(exception)
           output.puts "#{long_padding}#{failure_color("Failure/Error:")} #{failure_color(read_failed_line(exception, example).strip)}"
           output.puts "#{long_padding}#{failure_color(exception_class_name)}: #{failure_color(exception.message)}" unless exception_class_name =~ /RSpec/
-          output.puts "#{long_padding}  #{failure_color(example.metadata[:command])}"
+          output.puts "#{long_padding}  #{failure_color(example.metadata[:command])}" if example.metadata[:command]
           output.puts "#{long_padding}  #{failure_color(example.metadata[:stdout])}" if example.metadata[:stdout] != ''
+          exception.message.to_s.split("\n").each { |line| output.puts "#{long_padding}  #{failure_color(line)}" } if exception.message
 
           if shared_group = find_shared_group(example)
             dump_shared_failure_info(shared_group)
@@ -82,8 +83,9 @@ module RSpec
           exception_class_name = exception_class_name_for(exception)
           output.puts "#{long_padding}#{failure_color("Failure/Error:")} #{failure_color(read_failed_line(exception, example).strip)}"
           output.puts "#{long_padding}#{failure_color(exception_class_name)}: #{failure_color(exception.message)}" unless exception_class_name =~ /RSpec/
-          output.puts "#{long_padding}  #{failure_color(example.metadata[:command])}"
+          output.puts "#{long_padding}  #{failure_color(example.metadata[:command])}" if example.metadata[:command]
           output.puts "#{long_padding}  #{failure_color(example.metadata[:stdout])}" if example.metadata[:stdout] != ''
+          exception.message.to_s.split("\n").each { |line| output.puts "#{long_padding}  #{failure_color(line)}" } if exception.message
 
           if shared_group = find_shared_group(example)
             dump_shared_failure_info(shared_group)

data/spec/darwin/commands_spec.rb

@@ -10,6 +10,9 @@ describe 'Serverspec commands of Darwin family' do
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
   it_behaves_like 'support command check_installed_by_gem with_version', 'jekyll', '1.0.2'
 
+  it_behaves_like 'support command check_installed_by_npm', 'hubot'
+  it_behaves_like 'support command check_installed_by_npm with_version', 'hubot', '1.0.2'
+
   it_behaves_like 'support command check_installed_by_pecl', 'mongo'
   it_behaves_like 'support command check_installed_by_pecl with_version', 'mongo', '1.4.1'
 

data/spec/debian/commands_spec.rb

@@ -10,6 +10,9 @@ describe 'Serverspec commands of Debian family' do
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
   it_behaves_like 'support command check_installed_by_gem with_version', 'jekyll', '1.0.2'
 
+  it_behaves_like 'support command check_installed_by_npm', 'hubot'
+  it_behaves_like 'support command check_installed_by_npm with_version', 'hubot', '1.0.2'
+
   it_behaves_like 'support command check_installed_by_pecl', 'mongo'
   it_behaves_like 'support command check_installed_by_pecl with_version', 'mongo', '1.4.1'
 

data/spec/debian/file_spec.rb

@@ -4,8 +4,11 @@ include Serverspec::Helper::Debian
 
 describe 'Serverspec file matchers of Debian family' do
   it_behaves_like 'support file be_file matcher', '/etc/ssh/sshd_config'
+  it_behaves_like 'support file be_a_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support file be_directory matcher', '/etc/ssh'
+  it_behaves_like 'support file be_a_directory matcher', '/etc/ssh'
   it_behaves_like 'support file be_socket matcher', '/var/run/unicorn.sock'
+  it_behaves_like 'support file be_a_socket matcher', '/var/run/unicorn.sock'
   it_behaves_like 'support file contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'
   it_behaves_like 'support file contain from to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/
   it_behaves_like 'support file contain after matcher', 'Gemfile', 'rspec', /^group :test do/

data/spec/gentoo/commands_spec.rb

@@ -10,6 +10,9 @@ describe 'Serverspec commands of Gentoo family' do
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
   it_behaves_like 'support command check_installed_by_gem with_version', 'jekyll', '1.0.2'
 
+  it_behaves_like 'support command check_installed_by_npm', 'hubot'
+  it_behaves_like 'support command check_installed_by_npm with_version', 'hubot', '1.0.2'
+
   it_behaves_like 'support command check_installed_by_pecl', 'mongo'
   it_behaves_like 'support command check_installed_by_pecl with_version', 'mongo', '1.4.1'
 

data/spec/redhat/commands_spec.rb

@@ -10,6 +10,9 @@ describe 'Serverspec commands of Red Hat' do
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
   it_behaves_like 'support command check_installed_by_gem with_version', 'jekyll', '1.0.2'
 
+  it_behaves_like 'support command check_installed_by_npm', 'hubot'
+  it_behaves_like 'support command check_installed_by_npm with_version', 'hubot', '1.0.2'
+
   it_behaves_like 'support command check_installed_by_pecl', 'mongo'
   it_behaves_like 'support command check_installed_by_pecl with_version', 'mongo', '1.4.1'
 
@@ -63,6 +66,16 @@ describe 'check_enabled' do
   it { should eq 'chkconfig --list httpd | grep 3:on' }
 end
 
+describe 'check_yumrepo' do
+  subject { commands.check_yumrepo('epel') }
+  it { should eq 'yum repolist -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
+
 describe 'check_installed' do
   subject { commands.check_installed('httpd') }
   it { should eq 'rpm -q httpd' }

data/spec/redhat/file_spec.rb

@@ -4,8 +4,11 @@ include Serverspec::Helper::RedHat
 
 describe 'Serverspec file matchers of Red Hat family' do
   it_behaves_like 'support file be_file matcher', '/etc/ssh/sshd_config'
+  it_behaves_like 'support file be_a_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support file be_directory matcher', '/etc/ssh'
+  it_behaves_like 'support file be_a_directory matcher', '/etc/ssh'
   it_behaves_like 'support file be_socket matcher', '/var/run/unicorn.sock'
+  it_behaves_like 'support file be_a_socket matcher', '/var/run/unicorn.sock'
   it_behaves_like 'support file contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'
   it_behaves_like 'support file contain from to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/
   it_behaves_like 'support file contain after matcher', 'Gemfile', 'rspec', /^group :test do/

data/spec/redhat/yumrepo_spec.rb

@@ -0,0 +1,25 @@
+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/solaris/commands_spec.rb

@@ -10,6 +10,9 @@ describe 'Serverspec commands of Solaris family' do
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
   it_behaves_like 'support command check_installed_by_gem with_version', 'jekyll', '1.0.2'
 
+  it_behaves_like 'support command check_installed_by_npm', 'hubot'
+  it_behaves_like 'support command check_installed_by_npm with_version', 'hubot', '1.0.2'
+
   it_behaves_like 'support command check_installed_by_pecl', 'mongo'
   it_behaves_like 'support command check_installed_by_pecl with_version', 'mongo', '1.4.1'
 

data/spec/support/shared_commands_examples.rb

@@ -14,7 +14,7 @@ shared_examples_for 'support command check_installed_by_npm' do |package|
 end
 
 shared_examples_for 'support command check_installed_by_npm with_version' do |package, version|
-  subject { commands.check_installed_by_npm(package) }
+  subject { commands.check_installed_by_npm(package, version) }
   it { should eq "npm ls #{package} -g | grep -w -- #{version}" }
 end
 

data/spec/support/shared_file_examples.rb

@@ -10,6 +10,18 @@ shared_examples_for 'support file be_file matcher' do |name|
   end
 end
 
+shared_examples_for 'support file be_a_file matcher' do |name|
+  describe 'be_a_file' do
+    describe file(name) do
+      it { should be_a_file }
+    end
+
+    describe file('/etc/invalid_file') do
+      it { should_not be_a_file }
+    end
+  end
+end
+
 shared_examples_for 'support file be_directory matcher' do |name|
   describe 'be_directory' do
     describe file(name) do
@@ -22,6 +34,18 @@ shared_examples_for 'support file be_directory matcher' do |name|
   end
 end
 
+shared_examples_for 'support file be_a_directory matcher' do |name|
+  describe 'be_a_directory' do
+    describe file(name) do
+      it { should be_a_directory }
+    end
+
+    describe file('/etc/invalid_directory') do
+      it { should_not be_a_directory }
+    end
+  end
+end
+
 shared_examples_for 'support file be_socket matcher' do |name|
   describe 'be_socket' do
     describe file(name) do
@@ -34,6 +58,18 @@ shared_examples_for 'support file be_socket matcher' do |name|
   end
 end
 
+shared_examples_for 'support file be_a_socket matcher' do |name|
+  describe 'be_a_socket' do
+    describe file(name) do
+      it { should be_a_socket }
+    end
+
+    describe file('/etc/invalid_socket') do
+      it { should_not be_a_socket }
+    end
+  end
+end
+
 shared_examples_for 'support file contain matcher' do |name, pattern|
   describe 'contain' do
     describe file(name) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -203,6 +203,7 @@ files:
 - lib/serverspec/type/selinux.rb
 - lib/serverspec/type/service.rb
 - lib/serverspec/type/user.rb
+- lib/serverspec/type/yumrepo.rb
 - lib/serverspec/type/zfs.rb
 - lib/serverspec/version.rb
 - serverspec.gemspec
@@ -268,6 +269,7 @@ files:
 - spec/redhat/selinux_spec.rb
 - spec/redhat/service_spec.rb
 - spec/redhat/user_spec.rb
+- spec/redhat/yumrepo_spec.rb
 - spec/solaris/command_spec.rb
 - spec/solaris/commands_spec.rb
 - spec/solaris/cron_spec.rb
@@ -322,7 +324,7 @@ 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 servers configured by Puppet, Chef or anything else
@@ -389,6 +391,7 @@ test_files:
 - spec/redhat/selinux_spec.rb
 - spec/redhat/service_spec.rb
 - spec/redhat/user_spec.rb
+- spec/redhat/yumrepo_spec.rb
 - spec/solaris/command_spec.rb
 - spec/solaris/commands_spec.rb
 - spec/solaris/cron_spec.rb