serverspec 0.4.1 → 0.4.2

data/Guardfile

@@ -0,0 +1,4 @@
+guard :rspec do
+  watch(%r{^spec/.+/.+_spec\.rb$})
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/lib/serverspec/commands/base.rb

@@ -109,7 +109,11 @@ module Serverspec
 
       def check_cron_entry user, entry
         entry_escaped = entry.gsub(/\*/, '\\*')
-        "crontab -u #{escape(user)} -l | grep -- #{escape(entry_escaped)}"
+        if user.nil?
+          "crontab -l | grep -- #{escape(entry_escaped)}"
+        else
+          "crontab -u #{escape(user)} -l | grep -- #{escape(entry_escaped)}"
+        end
       end
 
       def check_link link, target

data/lib/serverspec/commands/solaris.rb

@@ -20,7 +20,11 @@ module Serverspec
 
       def check_cron_entry user, entry
         entry_escaped = entry.gsub(/\*/, '\\*')
-        "crontab -l #{escape(user)} | grep -- #{escape(entry_escaped)}"
+        if user.nil?
+          "crontab -l | grep -- #{escape(entry_escaped)}"
+        else
+          "crontab -l #{escape(user)} | grep -- #{escape(entry_escaped)}"
+        end
       end
 
       def check_zfs zfs, property=nil

data/lib/serverspec/helper/type.rb

@@ -1,14 +1,21 @@
-require 'serverspec/type/base'
-require 'serverspec/type/service'
-require 'serverspec/type/package'
-require 'serverspec/type/port'
-require 'serverspec/type/file'
-
 module Serverspec
   module Helper
     module Type
-      %w( service package port file ).each do |type|
-        define_method type do |name|
+      types = %w(
+        base
+        service
+        package
+        port
+        file
+        cron
+        command
+      )
+
+      types.each {|type| require "serverspec/type/#{type}" }
+
+      types.each do |type|
+        define_method type do |*args|
+          name = args.first
           self.class.const_get('Serverspec').const_get('Type').const_get(type.capitalize).new(name)
         end
       end

data/lib/serverspec/matchers.rb

@@ -17,7 +17,6 @@ require 'serverspec/matchers/be_grouped_into'
 require 'serverspec/matchers/have_entry'
 require 'serverspec/matchers/have_cron_entry'
 require 'serverspec/matchers/be_linked_to'
-require 'serverspec/matchers/be_installed_by_gem'
 require 'serverspec/matchers/belong_to_group'
 require 'serverspec/matchers/have_gid'
 require 'serverspec/matchers/have_uid'

data/lib/serverspec/matchers/have_entry.rb

@@ -1,5 +1,13 @@
-RSpec::Matchers.define :have_entry do |attr|
+RSpec::Matchers.define :have_entry do |entry|
   match do |subject|
-    backend.check_routing_table(example, attr)
+    if subject.class.name == 'Serverspec::Type::Cron'
+       subject.has_entry?(@user, entry)
+    else
+      backend.check_routing_table(example, entry)
+    end
+  end
+  # For cron type
+  chain :with_user do |user|
+    @user = user
   end
 end

data/lib/serverspec/matchers/return_exit_status.rb

@@ -1,6 +1,10 @@
 RSpec::Matchers.define :return_exit_status do |status|
   match do |command|
-    ret = backend.run_command(command)
-    ret[:exit_status].to_i == status
+    if command.respond_to?(:return_exit_status?)
+      command.return_exit_status?(status)
+    else
+      ret = backend.run_command(command)
+      ret[:exit_status].to_i == status
+    end
   end
 end

data/lib/serverspec/matchers/return_stderr.rb

@@ -1,10 +1,14 @@
 RSpec::Matchers.define :return_stderr do |content|
   match do |command|
-    ret = backend.run_command(command)
-    if content.instance_of?(Regexp)
-      ret[:stderr] =~ content
+    if command.respond_to?(:return_stderr?)
+      command.return_stderr?(content)
     else
-      ret[:stderr].strip == content
+      ret = backend.run_command(command)
+      if content.instance_of?(Regexp)
+        ret[:stderr] =~ content
+      else
+        ret[:stderr].strip == content
+      end
     end
   end
 end

data/lib/serverspec/matchers/return_stdout.rb

@@ -1,10 +1,14 @@
 RSpec::Matchers.define :return_stdout do |content|
   match do |command|
-    ret = backend.run_command(command)
-    if content.instance_of?(Regexp)
-      ret[:stdout] =~ content
+    if command.respond_to?(:return_stdout?)
+      command.return_stdout?(content)
     else
-      ret[:stdout].strip == content
+      ret = backend.run_command(command)
+      if content.instance_of?(Regexp)
+        ret[:stdout] =~ content
+      else
+        ret[:stdout].strip == content
+      end
     end
   end
 end

data/lib/serverspec/type/base.rb

@@ -1,7 +1,7 @@
 module Serverspec
   module Type
     class Base
-      def initialize name
+      def initialize(name=nil)
         @name = name
       end
 

data/lib/serverspec/type/command.rb

@@ -0,0 +1,31 @@
+module Serverspec
+  module Type
+    class Command < Base
+      def return_stdout?(content)
+        ret = backend.run_command(@name)
+        if content.instance_of?(Regexp)
+          ret[:stdout] =~ content
+        else
+          ret[:stdout].strip == content
+        end
+      end
+
+      def return_stderr?(content)
+        ret = backend.run_command(@name)
+        # In ssh access with pty, stderr is merged to stdout
+        # See http://stackoverflow.com/questions/7937651/receiving-extended-data-with-ssh-using-twisted-conch-as-client
+        # So I use stdout instead of stderr
+        if content.instance_of?(Regexp)
+          ret[:stdout] =~ content
+        else
+          ret[:stdout].strip == content
+        end
+      end
+
+      def return_exit_status?(status)
+        ret = backend.run_command(@name)
+        ret[:exit_status].to_i == status
+      end
+    end
+  end
+end

data/lib/serverspec/type/cron.rb

@@ -0,0 +1,12 @@
+module Serverspec
+  module Type
+    class Cron < Base
+      def has_entry?(user, entry)
+        backend.check_cron_entry(nil, user, entry)
+      end
+      def to_s
+        'Cron'
+      end
+    end
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/serverspec.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "highline"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "growl"
 end

data/spec/darwin/command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Darwin
+
+describe 'Serverspec command matchers of Darwin family' do
+  it_behaves_like 'support command return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support command return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support command return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support command return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support command return_exit_status matcher', 'ls /tmp', 0
+end

data/spec/darwin/commands_spec.rb

@@ -130,8 +130,15 @@ describe 'check_grouped' do
 end
 
 describe 'check_cron_entry' do
-  subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
-  it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  context 'specify root user' do
+    subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
+
+  context 'no specified user' do
+    subject { commands.check_cron_entry(nil, '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
 end
 
 describe 'check_link' do

data/spec/darwin/cron_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Darwin
+
+describe 'Serverspec cron matchers of Darwin family' do
+  it_behaves_like 'support cron have_entry matcher', '* * * * * /usr/local/bin/batch.sh'
+  it_behaves_like 'support cron have_entry with user matcher', '* * * * * /usr/local/bin/batch.sh', 'root'
+end

data/spec/darwin/file_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 include Serverspec::Helper::Darwin
 
-describe 'Serverspec service matchers of Darwin family' do
+describe 'Serverspec file matchers of Darwin family' do
   it_behaves_like 'support file be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support file be_directory matcher', '/etc/ssh'
   it_behaves_like 'support file contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'

data/spec/darwin/port_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 include Serverspec::Helper::Darwin
 
-describe 'Serverspec package matchers of Darwin family' do
+describe 'Serverspec port matchers of Darwin family' do
   it_behaves_like 'support port listening matcher', 80
 end

data/spec/debian/command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Debian
+
+describe 'Serverspec command matchers of Debian family' do
+  it_behaves_like 'support command return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support command return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support command return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support command return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support command return_exit_status matcher', 'ls /tmp', 0
+end

data/spec/debian/commands_spec.rb

@@ -142,8 +142,15 @@ describe 'check_grouped' do
 end
 
 describe 'check_cron_entry' do
-  subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
-  it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  context 'specify root user' do
+    subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
+
+  context 'no specified user' do
+    subject { commands.check_cron_entry(nil, '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
 end
 
 describe 'check_link' do

data/spec/debian/cron_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Debian
+
+describe 'Serverspec cron matchers of Debian family' do
+  it_behaves_like 'support cron have_entry matcher', '* * * * * /usr/local/bin/batch.sh'
+  it_behaves_like 'support cron have_entry with user matcher', '* * * * * /usr/local/bin/batch.sh', 'root'
+end

data/spec/debian/file_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 include Serverspec::Helper::Debian
 
-describe 'Serverspec service matchers of Debian family' do
+describe 'Serverspec file matchers of Debian family' do
   it_behaves_like 'support file be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support file be_directory matcher', '/etc/ssh'
   it_behaves_like 'support file contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'

data/spec/debian/port_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 include Serverspec::Helper::Debian
 
-describe 'Serverspec package matchers of Debian family' do
+describe 'Serverspec port matchers of Debian family' do
   it_behaves_like 'support port listening matcher', 80
 end

data/spec/gentoo/command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Gentoo
+
+describe 'Serverspec command matchers of Gentoo family' do
+  it_behaves_like 'support command return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support command return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support command return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support command return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support command return_exit_status matcher', 'ls /tmp', 0
+end

data/spec/gentoo/commands_spec.rb

@@ -138,8 +138,15 @@ describe 'check_grouped' do
 end
 
 describe 'check_cron_entry' do
-  subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
-  it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  context 'specify root user' do
+    subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
+
+  context 'no specified user' do
+    subject { commands.check_cron_entry(nil, '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
 end
 
 describe 'check_link' do

data/spec/gentoo/cron_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Gentoo
+
+describe 'Serverspec cron matchers of Gentoo family' do
+  it_behaves_like 'support cron have_entry matcher', '* * * * * /usr/local/bin/batch.sh'
+  it_behaves_like 'support cron have_entry with user matcher', '* * * * * /usr/local/bin/batch.sh', 'root'
+end

data/spec/gentoo/file_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 include Serverspec::Helper::Gentoo
 
-describe 'Serverspec service matchers of Gentoo family' do
+describe 'Serverspec file matchers of Gentoo family' do
   it_behaves_like 'support file be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support file be_directory matcher', '/etc/ssh'
   it_behaves_like 'support file contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'

data/spec/gentoo/port_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 include Serverspec::Helper::Gentoo
 
-describe 'Serverspec package matchers of Gentoo family' do
+describe 'Serverspec port matchers of Gentoo family' do
   it_behaves_like 'support port listening matcher', 80
 end

data/spec/redhat/command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include Serverspec::Helper::RedHat
+
+describe 'Serverspec command matchers of Red Hat family' do
+  it_behaves_like 'support command return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support command return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support command return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support command return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support command return_exit_status matcher', 'ls /tmp', 0
+end

data/spec/redhat/commands_spec.rb

@@ -140,8 +140,15 @@ describe 'check_grouped' do
 end
 
 describe 'check_cron_entry' do
-  subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
-  it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  context 'specify root user' do
+    subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -u root -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
+
+  context 'no specified user' do
+    subject { commands.check_cron_entry(nil, '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
 end
 
 describe 'check_link' do

data/spec/redhat/cron_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+include Serverspec::Helper::RedHat
+
+describe 'Serverspec cron matchers of Red Hat family' do
+  it_behaves_like 'support cron have_entry matcher', '* * * * * /usr/local/bin/batch.sh'
+  it_behaves_like 'support cron have_entry with user matcher', '* * * * * /usr/local/bin/batch.sh', 'root'
+end

data/spec/redhat/file_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 include Serverspec::Helper::RedHat
 
-describe 'Serverspec service matchers of Red Hat family' do
+describe 'Serverspec file matchers of Red Hat family' do
   it_behaves_like 'support file be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support file be_directory matcher', '/etc/ssh'
   it_behaves_like 'support file contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'

data/spec/redhat/port_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 include Serverspec::Helper::RedHat
 
-describe 'Serverspec package matchers of Red Hat family' do
+describe 'Serverspec port matchers of Red Hat family' do
   it_behaves_like 'support port listening matcher', 80
 end

data/spec/solaris/command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Solaris
+
+describe 'Serverspec command matchers of Solaris family' do
+  it_behaves_like 'support command return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support command return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support command return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support command return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support command return_exit_status matcher', 'ls /tmp', 0
+end

data/spec/solaris/commands_spec.rb

@@ -140,8 +140,15 @@ describe 'check_grouped' do
 end
 
 describe 'check_cron_entry' do
-  subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
-  it { should eq 'crontab -l root | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  context 'specify root user' do
+    subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -l root | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
+
+  context 'no specified user' do
+    subject { commands.check_cron_entry(nil, '* * * * * /usr/local/bin/batch.sh') }
+    it { should eq 'crontab -l | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
+  end
 end
 
 describe 'check_link' do

data/spec/solaris/cron_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Solaris
+
+describe 'Serverspec cron matchers of Solaris family' do
+  it_behaves_like 'support cron have_entry matcher', '* * * * * /usr/local/bin/batch.sh'
+  it_behaves_like 'support cron have_entry with user matcher', '* * * * * /usr/local/bin/batch.sh', 'root'
+end

data/spec/solaris/file_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 include Serverspec::Helper::Solaris
 
-describe 'Serverspec service matchers of Solaris family' do
+describe 'Serverspec file matchers of Solaris family' do
   it_behaves_like 'support file be_file matcher', '/etc/ssh/sshd_config'
   it_behaves_like 'support file be_directory matcher', '/etc/ssh'
   it_behaves_like 'support file contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'

data/spec/solaris/port_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 include Serverspec::Helper::Solaris
 
-describe 'Serverspec package matchers of Solaris family' do
+describe 'Serverspec port matchers of Solaris family' do
   it_behaves_like 'support port listening matcher', 80
 end

data/spec/support/shared_command_examples.rb

@@ -0,0 +1,108 @@
+shared_examples_for 'support command return_stdout matcher' do |name, content|
+  describe 'return_stdout' do
+    describe command(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "#{content}\r\n"
+        end
+      end
+      it { should return_stdout(content) }
+    end
+
+    describe command(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "foo#{content}bar\r\n"
+        end
+      end
+      it { should_not return_stdout(content) }
+    end
+
+
+    describe command('invalid-command') do
+      it { should_not return_stdout(content) }
+    end
+  end
+end
+
+shared_examples_for 'support command return_stdout matcher with regexp' do |name, content|
+  describe 'return_stdout' do
+    describe command(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "foo#{content}bar\r\n"
+        end
+      end
+      it { should return_stdout(content) }
+    end
+
+    describe command(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "foobar\r\n"
+        end
+      end
+      it { should_not return_stdout(content) }
+    end
+
+    describe command('invalid-command') do
+      it { should_not return_stdout(content) }
+    end
+  end
+end
+
+shared_examples_for 'support command return_stderr matcher' do |name, content|
+  describe 'return_stderr' do
+    describe command(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "#{content}\r\n"
+        end
+      end
+      it { should return_stderr(content) }
+    end
+
+    describe command(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "No such file or directory\r\n"
+        end
+      end
+      it { should_not return_stderr(content) }
+    end
+  end
+end
+
+shared_examples_for 'support command return_stderr matcher with regexp' do |name, content|
+  describe 'return_stderr' do
+    describe command(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "cat: /foo: No such file or directory\r\n"
+        end
+      end
+      it { should return_stdout(content) }
+    end
+
+    describe command(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "foobar\r\n"
+        end
+      end
+      it { should_not return_stdout(content) }
+    end
+  end
+end
+
+shared_examples_for 'support command return_exit_status matcher' do |name, status|
+  describe 'return_exit_status' do
+    describe command(name) do
+      it { should return_exit_status(status) }
+    end
+
+    describe command('invalid-command') do
+      it { should_not return_exit_status(status) }
+    end
+  end
+end

data/spec/support/shared_cron_examples.rb

@@ -0,0 +1,23 @@
+shared_examples_for 'support cron have_entry matcher' do |entry|
+  describe 'have_cron_entry' do
+    describe cron do
+      it { should have_cron_entry entry }
+    end
+
+    describe cron do
+      it { should_not have_cron_entry 'invalid entry' }
+    end
+  end
+end
+
+shared_examples_for 'support cron have_entry with user matcher' do |entry, user|
+  describe 'have_cron_entry' do
+    describe cron do
+      it { should have_cron_entry(entry).with_user(user) }
+    end
+
+    describe cron do
+      it { should_not have_cron_entry('invalid entry').with_user(user) }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -91,6 +91,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RSpec tests for your servers provisioned by Puppet, Chef or anything
   else
 email:
@@ -103,6 +135,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -145,7 +178,6 @@ files:
 - lib/serverspec/matchers/be_group.rb
 - lib/serverspec/matchers/be_grouped_into.rb
 - lib/serverspec/matchers/be_installed.rb
-- lib/serverspec/matchers/be_installed_by_gem.rb
 - lib/serverspec/matchers/be_linked_to.rb
 - lib/serverspec/matchers/be_listening.rb
 - lib/serverspec/matchers/be_mode.rb
@@ -181,44 +213,58 @@ files:
 - lib/serverspec/setup.rb
 - lib/serverspec/subject.rb
 - lib/serverspec/type/base.rb
+- lib/serverspec/type/command.rb
+- lib/serverspec/type/cron.rb
 - lib/serverspec/type/file.rb
 - lib/serverspec/type/package.rb
 - lib/serverspec/type/port.rb
 - lib/serverspec/type/service.rb
 - lib/serverspec/version.rb
 - serverspec.gemspec
+- spec/darwin/command_spec.rb
 - spec/darwin/commands_spec.rb
+- spec/darwin/cron_spec.rb
 - spec/darwin/file_spec.rb
 - spec/darwin/matchers_spec.rb
 - spec/darwin/package_spec.rb
 - spec/darwin/port_spec.rb
 - spec/darwin/service_spec.rb
+- spec/debian/command_spec.rb
 - spec/debian/commands_spec.rb
+- spec/debian/cron_spec.rb
 - spec/debian/file_spec.rb
 - spec/debian/matchers_spec.rb
 - spec/debian/package_spec.rb
 - spec/debian/port_spec.rb
 - spec/debian/service_spec.rb
+- spec/gentoo/command_spec.rb
 - spec/gentoo/commands_spec.rb
+- spec/gentoo/cron_spec.rb
 - spec/gentoo/file_spec.rb
 - spec/gentoo/matchers_spec.rb
 - spec/gentoo/package_spec.rb
 - spec/gentoo/port_spec.rb
 - spec/gentoo/service_spec.rb
 - spec/helpers/attributes_spec.rb
+- spec/redhat/command_spec.rb
 - spec/redhat/commands_spec.rb
+- spec/redhat/cron_spec.rb
 - spec/redhat/file_spec.rb
 - spec/redhat/matchers_spec.rb
 - spec/redhat/package_spec.rb
 - spec/redhat/port_spec.rb
 - spec/redhat/service_spec.rb
+- spec/solaris/command_spec.rb
 - spec/solaris/commands_spec.rb
+- spec/solaris/cron_spec.rb
 - spec/solaris/file_spec.rb
 - spec/solaris/matchers_spec.rb
 - spec/solaris/package_spec.rb
 - spec/solaris/port_spec.rb
 - spec/solaris/service_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_command_examples.rb
+- spec/support/shared_cron_examples.rb
 - spec/support/shared_file_examples.rb
 - spec/support/shared_matcher_examples.rb
 - spec/support/shared_package_examples.rb
@@ -250,38 +296,50 @@ signing_key:
 specification_version: 3
 summary: RSpec tests for your servers provisioned by Puppet, Chef or anything else
 test_files:
+- spec/darwin/command_spec.rb
 - spec/darwin/commands_spec.rb
+- spec/darwin/cron_spec.rb
 - spec/darwin/file_spec.rb
 - spec/darwin/matchers_spec.rb
 - spec/darwin/package_spec.rb
 - spec/darwin/port_spec.rb
 - spec/darwin/service_spec.rb
+- spec/debian/command_spec.rb
 - spec/debian/commands_spec.rb
+- spec/debian/cron_spec.rb
 - spec/debian/file_spec.rb
 - spec/debian/matchers_spec.rb
 - spec/debian/package_spec.rb
 - spec/debian/port_spec.rb
 - spec/debian/service_spec.rb
+- spec/gentoo/command_spec.rb
 - spec/gentoo/commands_spec.rb
+- spec/gentoo/cron_spec.rb
 - spec/gentoo/file_spec.rb
 - spec/gentoo/matchers_spec.rb
 - spec/gentoo/package_spec.rb
 - spec/gentoo/port_spec.rb
 - spec/gentoo/service_spec.rb
 - spec/helpers/attributes_spec.rb
+- spec/redhat/command_spec.rb
 - spec/redhat/commands_spec.rb
+- spec/redhat/cron_spec.rb
 - spec/redhat/file_spec.rb
 - spec/redhat/matchers_spec.rb
 - spec/redhat/package_spec.rb
 - spec/redhat/port_spec.rb
 - spec/redhat/service_spec.rb
+- spec/solaris/command_spec.rb
 - spec/solaris/commands_spec.rb
+- spec/solaris/cron_spec.rb
 - spec/solaris/file_spec.rb
 - spec/solaris/matchers_spec.rb
 - spec/solaris/package_spec.rb
 - spec/solaris/port_spec.rb
 - spec/solaris/service_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_command_examples.rb
+- spec/support/shared_cron_examples.rb
 - spec/support/shared_file_examples.rb
 - spec/support/shared_matcher_examples.rb
 - spec/support/shared_package_examples.rb

data/lib/serverspec/matchers/be_installed_by_gem.rb

@@ -1,16 +0,0 @@
-RSpec::Matchers.define :be_installed_by_gem do
-  match do |name|
-    puts <<EOF
-
-***************************************************
-The matcher be_isntalled_by_gem will be depricated.
-Please use be_installed.by('gem') instead.
-***************************************************
-
-EOF
-    backend.check_installed_by_gem(example, name, @version)
-  end
-  chain :with_version do |version|
-    @version = version
-  end
-end