serverspec 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f502abc758e26c7cfb76742374fdf0db5642bf
-  data.tar.gz: a0a70007cdc068ab6ade47ef33fea5bafbe9eaf9
+  metadata.gz: ad379a62eebf7068f9f41a32b0557edbdf3c04ea
+  data.tar.gz: 4a67c75a8da7a3364d58a5e1505a9c2ccaaff27d
 SHA512:
-  metadata.gz: 0bdeb0cec5793191834f45f3b232bb869ca39434cb56cbc45b67e3d966d8c0b5057af3b978fcb9c20c746adf89f09d3146a3e3f4c159b8f6111c911111605051
-  data.tar.gz: c4dd76983de73726cf79e3042522071057191c4dfc133c3e5e78f55f0bb06c5cb4eb289b8b6c6ba50587ababb92733431b0cc66ffb65bf3572b710bb3947c3f8
+  metadata.gz: d67fafaa7283fcf224a2a48317dd9215a3ee7ffa44e1778d80a276affe3306f00592fd91a5047fe3481c5ca60631d3704275722de42793a2a742920ade190f3f
+  data.tar.gz: 270af033cdf46ae4e01e1d756e356d48ac3c740f05e2f433349eef64ebfba3c5ace429d1104a4948ee238ef1a23f2c596a14bf067f574907e96d1fa99e213157

data/README.md

@@ -1,4 +1,4 @@
-# Serverspec [![Gem Version](https://badge.fury.io/rb/serverspec.png)](http://badge.fury.io/rb/serverspec) [![BuildStatus](https://secure.travis-ci.org/serverspec/serverspec.png)](http://travis-ci.org/serverspec/serverspec) [![Code Climate](https://codeclimate.com/github/serverspec/serverspec.png)](https://codeclimate.com/github/serverspec/serverspec)
+# Serverspec [![Gem Version](https://badge.fury.io/rb/serverspec.png)](http://badge.fury.io/rb/serverspec) [![BuildStatus](https://secure.travis-ci.org/serverspec/serverspec.png)](http://travis-ci.org/serverspec/serverspec) [![Code Climate](https://codeclimate.com/github/serverspec/serverspec.png)](https://codeclimate.com/github/serverspec/serverspec) [![wercker status](https://app.wercker.com/status/526d1ff4df6eadaa793dca1affcaed35/s/ "wercker status")](https://app.wercker.com/project/bykey/526d1ff4df6eadaa793dca1affcaed35)
 
 RSpec tests for your servers configured by Puppet, Chef or anything else
 

data/lib/serverspec/helper.rb

@@ -3,7 +3,11 @@ require 'serverspec/helper/backend'
 
 # Subject type helper
 require 'serverspec/helper/type'
-include Serverspec::Helper::Type
+extend Serverspec::Helper::Type
+class RSpec::Core::ExampleGroup
+  extend Serverspec::Helper::Type
+  include Serverspec::Helper::Type
+end
 
 require 'serverspec/helper/properties'
 

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/aix/cron_spec.rb

@@ -4,7 +4,7 @@ include SpecInfra::Helper::AIX
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }
-  its(:command) { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -l | grep -v "#" -- | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do
@@ -13,7 +13,7 @@ end
 
 describe cron do
   it { should have_entry('* * * * * /usr/local/bin/batch.sh').with_user('root') }
-  its(:command) { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -u root -l | grep -v "#" | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do

data/spec/darwin/cron_spec.rb

@@ -4,7 +4,7 @@ include SpecInfra::Helper::Darwin
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }
-  its(:command) { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -l | grep -v "#" -- | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do
@@ -13,7 +13,7 @@ end
 
 describe cron do
   it { should have_entry('* * * * * /usr/local/bin/batch.sh').with_user('root') }
-  its(:command) { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -u root -l | grep -v "#" | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do

data/spec/debian/cron_spec.rb

@@ -4,7 +4,7 @@ include SpecInfra::Helper::Debian
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }
-  its(:command) { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -l | grep -v "#" -- | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do
@@ -13,7 +13,7 @@ end
 
 describe cron do
   it { should have_entry('* * * * * /usr/local/bin/batch.sh').with_user('root') }
-  its(:command) { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -u root -l | grep -v "#" | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do

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-query -f '${Status}' -W apache2 | grep '^install ok installed$'" }
+  its(:command) { should eq "dpkg-query -f '${Status}' -W apache2 | grep -E '^(install|hold) 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-query -f '${Status} ${Version}' -W apache2 | grep -E '^install ok installed 1.1.1$'" }
+  its(:command) { should eq "dpkg-query -f '${Status} ${Version}' -W apache2 | grep -E '^(install|hold) ok installed 1.1.1$'" }
 end
 
 describe package('invalid-package') do

data/spec/freebsd/cron_spec.rb

@@ -4,7 +4,7 @@ include SpecInfra::Helper::FreeBSD
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }
-  its(:command) { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -l | grep -v "#" -- | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do
@@ -13,7 +13,7 @@ end
 
 describe cron do
   it { should have_entry('* * * * * /usr/local/bin/batch.sh').with_user('root') }
-  its(:command) { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -u root -l | grep -v "#" | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do

data/spec/gentoo/cron_spec.rb

@@ -4,7 +4,7 @@ include SpecInfra::Helper::Gentoo
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }
-  its(:command) { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -l | grep -v "#" -- | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do
@@ -13,7 +13,7 @@ end
 
 describe cron do
   it { should have_entry('* * * * * /usr/local/bin/batch.sh').with_user('root') }
-  its(:command) { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -u root -l | grep -v "#" | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do

data/spec/helper/type_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe String do
+  subject { String.new }
+  it { should_not respond_to :host }
+end

data/spec/plamo/cron_spec.rb

@@ -4,7 +4,7 @@ include SpecInfra::Helper::Plamo
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }
-  its(:command) { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -l | grep -v "#" -- | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do
@@ -13,7 +13,7 @@ end
 
 describe cron do
   it { should have_entry('* * * * * /usr/local/bin/batch.sh').with_user('root') }
-  its(:command) { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -u root -l | grep -v "#" | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do

data/spec/redhat/cron_spec.rb

@@ -4,7 +4,7 @@ include SpecInfra::Helper::RedHat
 
 describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }
-  its(:command) { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -l | grep -v "#" -- | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do
@@ -13,7 +13,7 @@ end
 
 describe cron do
   it { should have_entry('* * * * * /usr/local/bin/batch.sh').with_user('root') }
-  its(:command) { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  its(:command) { should eq 'crontab -u root -l | grep -v "#" | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
 describe cron do

data/wercker.yml

@@ -1,4 +1,4 @@
-box: wercker/ruby
+box: mizzy/serverspec-base
 build:
   steps:
     - script:
@@ -30,11 +30,23 @@ build:
         name: Run rake spec:centos65
         code: rake spec:centos65
         cwd: $WORKING_DIR
+    - script:
+        name: Run vagrant up ubuntu1310
+        code: vagrant up ubuntu1310 --provider=digital_ocean
+        cwd: $WORKING_DIR
+    - script:
+        name: Run rake spec:ubuntu1310
+        code: rake spec:ubuntu1310
+        cwd: $WORKING_DIR
 
   after-steps:
     - script:
-        name: Run vagrant destroy
+        name: Run vagrant destroy centos65
         code: vagrant destroy centos65 --force
         cwd: $WORKING_DIR
+    - script:
+        name: Run vagrant destroy ubuntu1310
+        code: vagrant destroy ubuntu1310 --force
+        cwd: $WORKING_DIR
     - 1syo/idobata-notify@0.1.1:
         token: $IDOBATA_TOKEN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -296,6 +296,7 @@ files:
 - spec/gentoo/user_spec.rb
 - spec/gentoo/zfs_spec.rb
 - spec/helper/properties_spec.rb
+- spec/helper/type_spec.rb
 - spec/plamo/cgroup_spec.rb
 - spec/plamo/command_spec.rb
 - spec/plamo/cron_spec.rb
@@ -514,6 +515,7 @@ test_files:
 - spec/gentoo/user_spec.rb
 - spec/gentoo/zfs_spec.rb
 - spec/helper/properties_spec.rb
+- spec/helper/type_spec.rb
 - spec/plamo/cgroup_spec.rb
 - spec/plamo/command_spec.rb
 - spec/plamo/cron_spec.rb