serverspec 0.6.9 → 0.6.10

data/lib/serverspec/commands/solaris.rb

@@ -6,7 +6,11 @@ module Serverspec
       end
 
       def check_installed(package, version=nil)
-        "pkg list -H #{escape(package)} 2> /dev/null"
+        cmd = "pkg list -H #{escape(package)} 2> /dev/null"
+        if version
+          cmd = "#{cmd} | grep -qw -- #{escape(version)}"
+        end
+        cmd
       end
 
       def check_listening(port)

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.6.9"
+  VERSION = "0.6.10"
 end

data/spec/solaris/commands_spec.rb

@@ -57,6 +57,11 @@ describe 'check_installed' do
   it { should eq 'pkg list -H httpd 2> /dev/null' }
 end
 
+describe 'check_installed' do
+  subject { commands.check_installed('httpd', '2.2') }
+  it { should eq 'pkg list -H httpd 2> /dev/null | grep -qw -- 2.2' }
+end
+
 describe 'check_file_contain_within' do
   context 'contain a pattern in the file' do
     subject { commands.check_file_contain_within('Gemfile', 'rspec') }

data/spec/solaris/package_spec.rb

@@ -4,6 +4,7 @@ include Serverspec::Helper::Solaris
 
 describe 'Serverspec package matchers of Solaris 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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-26 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