serverspec 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81dfca1b27052f6fde88b707a39a88b9aa6b2f2d
-  data.tar.gz: 89eb5ad29b3113ef22451c013a5160797551f74b
+  metadata.gz: 474f5248cc40037fdd84c1bf78442a634deec8c7
+  data.tar.gz: 0cfa035a3b82be9b37ce21cc88582cec8c4c817c
 SHA512:
-  metadata.gz: 44674d6f99cacae928100c6abcb4101107721eb33ba53eea3b27c05d3d2889ed4cf37c3ceb383c4af163599b35f2e1bb4254b36a09fdc62d178e3a072100dce8
-  data.tar.gz: bd01d518d19c6f06a32c454aac243e9a70b562526e0da8102a992f3dbb95bae4119d00dc7659cf9b6e179c922f9dc8f1aaf6f862c8ec666d068b70a0439a85ab
+  metadata.gz: 09319d6728e2139736dc24bdc2f34b7d3de39e726b04c93c039d35869e5705fdba04cb719b85e4f8eb7eb76235a3c3616c2cca37f0c0dfdf998979eb355ba52c
+  data.tar.gz: 077f9ccbe971a224726156d74ae2b0253946944e3f72b7a536c6a49e4324996f55a6656cb83012b3c0192e6d5f4f9ed90ed2983720bd9455a265371b1d0417f6

data/lib/serverspec/commands/base.rb

@@ -165,20 +165,20 @@ module Serverspec
       def check_installed_by_gem(name, version=nil)
         regexp = "^#{name}"
         cmd = "gem list --local | grep -w -- #{escape(regexp)}"
-        cmd = "#{cmd} | grep -w -- #{escape(version)}" unless version.nil?
+        cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
         cmd
       end
 
       def check_installed_by_npm(name, version=nil)
         cmd = "npm ls #{escape(name)} -g"
-        cmd = "#{cmd} | grep -w -- #{escape(version)}" unless version.nil?
+        cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
         cmd
       end
 
       def check_installed_by_pecl(name, version=nil)
         regexp = "^#{name}"
         cmd = "pecl list | grep -w -- #{escape(regexp)}"
-        cmd = "#{cmd} | grep -w -- #{escape(version)}" unless version.nil?
+        cmd = "#{cmd} | grep -w -- #{escape(version)}" if version
         cmd
       end
 

data/lib/serverspec/commands/debian.rb

@@ -8,7 +8,11 @@ module Serverspec
 
       def check_installed(package, version=nil)
         escaped_package = escape(package)
-        "dpkg -s #{escaped_package} && ! dpkg -s #{escaped_package} | grep -E '^Status: .+ not-installed$'"
+        cmd = "dpkg -s #{escaped_package} && ! dpkg -s #{escaped_package} | grep -E '^Status: .+ not-installed$'"
+        if version
+          cmd = "#{cmd} && dpkg -s #{escaped_package} | grep -E '^Version: #{escape(version)}$'"
+        end
+        cmd
       end
 
       def check_running(service)

data/lib/serverspec/commands/redhat.rb

@@ -20,7 +20,7 @@ module Serverspec
 
       def check_installed(package,version=nil)
         cmd = "rpm -q #{escape(package)}"
-        if ! version.nil?
+        if version
           cmd = "#{cmd} | grep -w -- #{escape(version)}"
         end
         cmd

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
 end

data/serverspec.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "net-ssh"
-  spec.add_runtime_dependency "rspec", "~> 2.13.0"
+  spec.add_runtime_dependency "rspec", ">= 2.13.0"
   spec.add_runtime_dependency "highline"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/debian/package_spec.rb

@@ -11,6 +11,15 @@ describe package('invalid-package') do
   it { should_not be_installed }
 end
 
+describe package('apache2') do
+  it { should be_installed.with_version('1.1.1') }
+  its(:command) { should eq "dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$' && dpkg -s apache2 | grep -E '^Version: 1.1.1$'" }
+end
+
+describe package('invalid-package') do
+  it { should_not be_installed.with_version('invalid-version') }
+end
+
 describe package('jekyll') do
   it { should be_installed.by('gem') }
   its(:command) { should eq "gem list --local | grep -w -- \\^jekyll" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -28,14 +28,14 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency