serverspec 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95d8da0ffbf3b43d3b0d0a487a1139274a7ace7b
-  data.tar.gz: 9033f985981bca13abcb52ccd0c3b176f31a6073
+  metadata.gz: 8cfe0b0f03cef8a61058d7b48a53da4cbf55a3f7
+  data.tar.gz: 8d9d8657762f5fb4a92cdd50b74a1941adeb7c0f
 SHA512:
-  metadata.gz: 457d3354e927adccffd7ee9fc75a78921c203e8ccdabf38c58e58ba24fc48f87d9ac37a7cd940ab413c50fc17aa7c8ffa57a9d6910ec555f5fcdc7359159d567
-  data.tar.gz: f8e11dff56aa715e7934187b2b0e31ff6a739d5ce538d7a6dc69909b53c08f91f699503d5686c9ff4565313d982f0c4581784d0c9961e1c1958c160f5a346a59
+  metadata.gz: 54d90b1c111146d960149565d1db9e193a14b7fdc20393e28e608f023480d5a889006fbf63c437864a13e8a335367c46e0d267ccf3d8beb02c7ac27db85d8280
+  data.tar.gz: 46ac7b5a8ea0b1d9c53883b6f5841b786073588d2ee576093612afd81875be43052ce80e8874178ffe08a9e9882cfd4c98cd51b9d56da357c1dfba9343164568

data/lib/serverspec/type/package.rb

@@ -14,6 +14,15 @@ module Serverspec
           backend.send(check_method, @name, version)
         end
       end
+
+      def version
+        ret = backend.run_command(commands.get_package_version(@name))[:stdout].strip
+        if ret.empty?
+          nil
+        else
+          ret
+        end
+      end
     end
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.13.3"
+  VERSION = "0.13.4"
 end

data/serverspec.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "net-ssh"
   spec.add_runtime_dependency "rspec", ">= 2.13.0"
   spec.add_runtime_dependency "highline"
-  spec.add_runtime_dependency "specinfra", ">= 0.0.6"
+  spec.add_runtime_dependency "specinfra", ">= 0.0.14"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/spec/debian/package_spec.rb

@@ -4,7 +4,7 @@ include SpecInfra::Helper::Debian
 
 describe package('apache2') do
   it { should be_installed }
-  its(:command) { should eq "dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
+  its(:command) { should eq "dpkg-query -f '${Status}' -W apache2 | grep '^install ok installed$'" }
 end
 
 describe package('invalid-package') do
@@ -13,7 +13,7 @@ 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$'" }
+  its(:command) { should eq "dpkg-query -f '${Status} ${Version}' -W apache2 | grep -E '^install ok installed 1.1.1$'" }
 end
 
 describe package('invalid-package') do

data/spec/debian/service_spec.rb

@@ -4,7 +4,7 @@ include SpecInfra::Helper::Debian
 
 describe service('sshd') do
   it { should be_enabled }
-  its(:command) { should eq "ls /etc/rc3.d/ | grep -- sshd || grep 'start on' /etc/init/sshd.conf" }
+  its(:command) { should eq "ls /etc/rc3.d/ | grep -- '^S..sshd' || grep 'start on' /etc/init/sshd.conf" }
 end
 
 describe service('invalid-service') do
@@ -13,7 +13,7 @@ end
 
 describe service('sshd') do
   it { should be_enabled.with_level(4) }
-  its(:command) { should eq "ls /etc/rc4.d/ | grep -- sshd || grep 'start on' /etc/init/sshd.conf" }
+  its(:command) { should eq "ls /etc/rc4.d/ | grep -- '^S..sshd' || grep 'start on' /etc/init/sshd.conf" }
 end
 
 describe service('invalid-service') do

data/spec/redhat/package_spec.rb

@@ -107,3 +107,9 @@ describe package('App::Ack') do
   it { should be_installed.by('cpan').with_version('2.04') }
   its(:command) { should eq "cpan -l | grep -w -- \\^App::Ack | grep -w -- 2.04" }
 end
+
+describe package('httpd') do
+  let(:stdout) { "2.2.15\n" }
+  its(:version) { should eq '2.2.15' }
+  its(:command) { should eq "rpm -qi httpd | grep Version | awk '{print $3}'" }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,6 @@ files:
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/configuration_spec.rb
 - spec/backend/powershell/script_helper_spec.rb
-- spec/backend/ssh/build_command_spec.rb
 - spec/backend/ssh/configuration_spec.rb
 - spec/backend/winrm/configuration_spec.rb
 - spec/darwin/command_spec.rb
@@ -389,7 +388,6 @@ test_files:
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/configuration_spec.rb
 - spec/backend/powershell/script_helper_spec.rb
-- spec/backend/ssh/build_command_spec.rb
 - spec/backend/ssh/configuration_spec.rb
 - spec/backend/winrm/configuration_spec.rb
 - spec/darwin/command_spec.rb

data/spec/backend/ssh/build_command_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-include SpecInfra::Helper::Ssh
-
-ssh = double
-
-
-describe 'build command with sudo' do
-  before :each do
-    RSpec.configure do |c|
-      ssh.stub(:options) { { :user => 'foo' } }
-      c.ssh = ssh
-      c.sudo_path = nil
-    end
-  end
-
-  context 'command pattern 1' do
-    subject { backend.build_command('test -f /etc/passwd') }
-    it { should eq 'sudo test -f /etc/passwd' }
-  end
-
-  context 'command pattern 2' do
-    subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
-    it { should eq 'sudo test ! -f /etc/selinux/config || (sudo getenforce | grep -i -- disabled && sudo grep -i -- ^SELINUX=disabled$ /etc/selinux/config)' }
-  end
-
-  context 'command pattern 3' do
-    subject { backend.build_command("dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'") }
-    it { should eq "sudo dpkg -s apache2 && ! sudo dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
-  end
-end
-
-# Alternate path for sudo command:
-sudo_path = '/usr/local/bin'
-
-describe 'build command with sudo on alternate path' do
-  before :each do
-    RSpec.configure do |c|
-      ssh.stub(:options) { { :user => 'foo' } }
-      c.ssh = ssh
-      c.sudo_path = "#{sudo_path}"
-    end
-  end
-
-
-  context 'command pattern 1a' do
-    subject { backend.build_command('test -f /etc/passwd') }
-    it { should eq "#{sudo_path}/sudo test -f /etc/passwd" }
-  end
-
-  context 'command pattern 2a' do
-    subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
-    it { should eq "#{sudo_path}/sudo test ! -f /etc/selinux/config || (#{sudo_path}/sudo getenforce | grep -i -- disabled && #{sudo_path}/sudo grep -i -- ^SELINUX=disabled$ /etc/selinux/config)" }
-  end
-
-  context 'command pattern 3a' do
-    subject { backend.build_command("dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'") }
-    it { should eq "#{sudo_path}/sudo dpkg -s apache2 && ! #{sudo_path}/sudo dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
-  end
-
-  after :each do
-    RSpec.configure do |c|
-      c.sudo_path = nil
-    end
-  end
-
-end