serverspec 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d9e70e6133900f0c4b6891b16b04f6924d8ea46
-  data.tar.gz: c7c1a7df66fed41a2db62a2ccc65c92e45fa28ee
+  metadata.gz: d9fe2a75c6d320919a500f69560daeb03d40578f
+  data.tar.gz: 6e9a93bed858b0acf275f6c6902671bc91bc0948
 SHA512:
-  metadata.gz: eae55f189109f3bc4de9ed895953e934178c2da3d8eeec58c76ff4c421e7a7867f83f4496324b03bfee90ac0903c2158c7eb1b29f7b68c4791344c917619ecae
-  data.tar.gz: d2f59861446dd5956b18dde37012556824fd7b58017852f38ea3ec193de4b3ec7f38b727219220b8b165cd6fc1f53670c4444c3d62986208c5c922a665f4f0d4
+  metadata.gz: dce043b1300590b5fa22c2cce66c5afefe7041685ef950323adb701b1fbde6531d4f5e0370a0f6bd7b8049ced8d99223524d2365c32dc3665beeccdd74f07a9d
+  data.tar.gz: 352d489a6ceb5e303ce271b1eb1e734b2e72a7da5e69bfc2277ce4cff232ae0928173ec6c3bcb065104cd0d26931785d52bad819d57eea5329b220f5a34e1f63

data/Rakefile

@@ -5,7 +5,7 @@ require "octorelease"
 task :spec => 'spec:all'
 
 namespace :spec do
-  oses = %w( darwin debian gentoo plamo redhat aix solaris solaris10 solaris11 smartos windows freebsd)
+  oses = %w( darwin debian gentoo plamo redhat aix solaris solaris10 solaris11 smartos windows freebsd freebsd10)
 
   task :all => [ oses.map {|os| "spec:#{os}" }, :exec, :ssh, :cmd, :winrm, :powershell, :helper ].flatten
 

data/lib/serverspec/helper/os.rb

@@ -6,6 +6,7 @@ module Serverspec
      'Darwin',
      'Debian',
      'FreeBSD',
+     'FreeBSD10',
      'Gentoo',
      'Plamo',
      'RedHat',

data/lib/serverspec/setup.rb

@@ -109,7 +109,7 @@ end
 
 describe file('/etc/httpd/conf/httpd.conf') do
   it { should be_file }
-  it { should contain "ServerName #{@hostname}" }
+  its(:content) { should match /ServerName #{@hostname}/ }
 end
 EOF
 

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.15.2"
+  VERSION = "0.15.3"
 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.5.6"
+  spec.add_runtime_dependency "specinfra", ">= 0.5.8"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "octorelease"

data/spec/aix/file_spec.rb

@@ -90,7 +90,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- /etc/pam.d/system-auth-ac" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
 end
 
 describe file('dummy-link') do

data/spec/debian/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- /etc/pam.d/system-auth-ac" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
 end
 
 describe file('dummy-link') do

data/spec/freebsd/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- /etc/pam.d/system-auth-ac" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
 end
 
 describe file('dummy-link') do

data/spec/freebsd10/package_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include SpecInfra::Helper::FreeBSD10
+
+describe package('httpd') do
+  it { should be_installed }
+  its(:command) { should eq "pkg info httpd" }
+end
+
+describe package('httpd') do
+  it { should be_installed.with_version('2.2.15-28.el6') }
+  its(:command) { should eq "pkg query %v httpd | grep -- 2.2.15-28.el6"}
+end

data/spec/gentoo/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- /etc/pam.d/system-auth-ac" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
 end
 
 describe file('dummy-link') do

data/spec/plamo/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- /etc/pam.d/system-auth-ac" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
 end
 
 describe file('dummy-link') do

data/spec/redhat/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- /etc/pam.d/system-auth-ac" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
 end
 
 describe file('dummy-link') do

data/spec/solaris/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- /etc/pam.d/system-auth-ac" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
 end
 
 describe file('dummy-link') do

data/spec/solaris11/file_spec.rb

@@ -99,7 +99,7 @@ end
 
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
-  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- /etc/pam.d/system-auth-ac" }
+  its(:command) { should eq "stat -c %N /etc/pam.d/system-auth | grep -- \"-> \\`/etc/pam.d/system-auth-ac'\"" }
 end
 
 describe file('dummy-link') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-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.5.6
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,7 @@ files:
 - spec/freebsd/routing_table_spec.rb
 - spec/freebsd/service_spec.rb
 - spec/freebsd/user_spec.rb
+- spec/freebsd10/package_spec.rb
 - spec/gentoo/cgroup_spec.rb
 - spec/gentoo/command_spec.rb
 - spec/gentoo/cron_spec.rb
@@ -462,6 +463,7 @@ test_files:
 - spec/freebsd/routing_table_spec.rb
 - spec/freebsd/service_spec.rb
 - spec/freebsd/user_spec.rb
+- spec/freebsd10/package_spec.rb
 - spec/gentoo/cgroup_spec.rb
 - spec/gentoo/command_spec.rb
 - spec/gentoo/cron_spec.rb