Add cron type

mizzy · May 18, 2013 · 46c4897 · 46c4897
1 parent 658ce8b
commit 46c4897
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 17 deletions.
diff --git a/lib/serverspec/commands/base.rb b/lib/serverspec/commands/base.rb
@@ -109,7 +109,11 @@ def check_grouped file, group
 
       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

diff --git a/lib/serverspec/commands/solaris.rb b/lib/serverspec/commands/solaris.rb
@@ -20,7 +20,11 @@ def check_running service
 
       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

diff --git a/lib/serverspec/helper/type.rb b/lib/serverspec/helper/type.rb
@@ -3,12 +3,14 @@
 require 'serverspec/type/package'
 require 'serverspec/type/port'
 require 'serverspec/type/file'
+require 'serverspec/type/cron'
 
 module Serverspec
   module Helper
     module Type
-      %w( service package port file ).each do |type|
-        define_method type do |name|
+      %w( service package port file cron ).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

diff --git a/lib/serverspec/matchers/have_entry.rb b/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
diff --git a/lib/serverspec/type/base.rb b/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
 

diff --git a/lib/serverspec/type/cron.rb b/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
diff --git a/spec/darwin/commands_spec.rb b/spec/darwin/commands_spec.rb
@@ -130,8 +130,15 @@
 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

diff --git a/spec/debian/commands_spec.rb b/spec/debian/commands_spec.rb
@@ -142,8 +142,15 @@
 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

diff --git a/spec/gentoo/commands_spec.rb b/spec/gentoo/commands_spec.rb
@@ -138,8 +138,15 @@
 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

diff --git a/spec/redhat/commands_spec.rb b/spec/redhat/commands_spec.rb
@@ -140,8 +140,15 @@
 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

diff --git a/spec/solaris/commands_spec.rb b/spec/solaris/commands_spec.rb
@@ -140,8 +140,15 @@
 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