serverspec 0.6.7 → 0.6.8

data/lib/serverspec/commands/debian.rb

@@ -6,7 +6,7 @@ module Serverspec
         "ls /etc/rc3.d/ | grep -- #{escape(service)} || grep 'start on' /etc/init/#{escape(service)}.conf"      
       end
 
-      def check_installed(package)
+      def check_installed(package, version=nil)
         escaped_package = escape(package)
         "dpkg -s #{escaped_package} && ! dpkg -s #{escaped_package} | grep -E '^Status: .+ not-installed$'"
       end

data/lib/serverspec/commands/gentoo.rb

@@ -6,7 +6,7 @@ module Serverspec
         "rc-update show | grep -- #{escape(regexp)}"
       end
 
-      def check_installed(package)
+      def check_installed(package, version=nil)
         "eix #{escape(package)} --installed"
       end
 

data/lib/serverspec/commands/redhat.rb

@@ -11,15 +11,19 @@ module Serverspec
       end
 
       def check_yumrepo(repository)
-        "yum repolist -C | grep ^#{escape(repository)}"
+        "yum repolist all -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)}"
+      def check_installed(package,version=nil)
+        cmd = "rpm -q #{escape(package)}"
+        if ! version.nil?
+          cmd = "#{cmd} | grep -w -- #{escape(version)}"
+        end
+        cmd
       end
     end
   end

data/lib/serverspec/commands/solaris.rb

@@ -5,7 +5,7 @@ module Serverspec
         "svcs -l #{escape(service)} 2> /dev/null | grep 'enabled      true'"
       end
 
-      def check_installed(package)
+      def check_installed(package, version=nil)
         "pkg list -H #{escape(package)} 2> /dev/null"
       end
 

data/lib/serverspec/type/package.rb

@@ -3,7 +3,7 @@ module Serverspec
     class Package < Base
       def installed?(provider, version)
         if provider.nil?
-          backend.check_installed(@name)
+          backend.check_installed(@name, version)
         else
           check_method = "check_installed_by_#{provider}".to_sym
 

data/lib/serverspec/version.rb

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

data/spec/redhat/commands_spec.rb

@@ -68,7 +68,7 @@ end
 
 describe 'check_yumrepo' do
   subject { commands.check_yumrepo('epel') }
-  it { should eq 'yum repolist -C | grep ^epel' }
+  it { should eq 'yum repolist all -C | grep ^epel' }
 end
 
 describe 'check_yumrepo_enabled' do
@@ -81,6 +81,11 @@ describe 'check_installed' do
   it { should eq 'rpm -q httpd' }
 end
 
+describe 'check_installed' do
+  subject { commands.check_installed('httpd','2.2') }
+  it { should eq 'rpm -q httpd | grep -w -- 2.2' }
+end
+
 describe 'check_running' do
   subject { commands.check_running('httpd') }
   it { should eq 'service httpd status' }

data/spec/redhat/package_spec.rb

@@ -4,6 +4,7 @@ include Serverspec::Helper::RedHat
 
 describe 'Serverspec package matchers of Red Hat family' do
   it_behaves_like 'support package installed matcher', 'httpd'
+  it_behaves_like 'support package installed with version matcher', 'httpd', '2.2'
   it_behaves_like 'support package installed by gem matcher', 'jekyll'
   it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
   it_behaves_like 'support package installed by npm matcher', 'bower'

data/spec/support/shared_package_examples.rb

@@ -10,6 +10,18 @@ shared_examples_for 'support package installed matcher' do |name|
   end
 end
 
+shared_examples_for 'support package installed with version matcher' do |name,version|
+  describe 'installed with version' do
+    describe package(name) do
+      it { should be_installed.with_version(version) }
+    end
+
+    describe package('invalid-package') do
+      it { should_not be_installed.with_version(version) }
+    end
+  end
+end
+
 shared_examples_for 'support package installed by gem matcher' do |name|
   describe 'installed by gem' do
     describe package(name) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -324,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your servers configured by Puppet, Chef or anything else