serverspec 0.4.0 → 0.4.1

data/lib/serverspec/helper/type.rb

@@ -1,10 +1,16 @@
+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
-      def service name
-        Serverspec::Type::Service.new(name)
+      %w( service package port file ).each do |type|
+        define_method type do |name|
+          self.class.const_get('Serverspec').const_get('Type').const_get(type.capitalize).new(name)
+        end
       end
     end
   end

data/lib/serverspec/matchers/be_directory.rb

@@ -1,5 +1,9 @@
 RSpec::Matchers.define :be_directory do
   match do |actual|
-    backend.check_directory(example, actual)
+    if actual.respond_to?(:directory?)
+      actual.directory?
+    else
+      backend.check_directory(example, actual)
+    end
   end
 end

data/lib/serverspec/matchers/be_executable.rb

@@ -1,9 +1,13 @@
 RSpec::Matchers.define :be_executable do
   match do |file|
-    if @by_user != nil
-      backend.check_access_by_user(example, file, @by_user, 'x')
+    if file.respond_to?(:executable?)
+      file.executable?(@by_whom, @by_user)
     else
-      backend.check_executable(example, file, @by_whom)
+      if @by_user != nil
+        backend.check_access_by_user(example, file, @by_user, 'x')
+      else
+        backend.check_executable(example, file, @by_whom)
+      end
     end
   end
   chain :by do |by_whom|

data/lib/serverspec/matchers/be_file.rb

@@ -1,5 +1,9 @@
 RSpec::Matchers.define :be_file do
   match do |actual|
-    backend.check_file(example, actual)
+    if actual.respond_to?(:file?)
+      actual.file?
+    else
+      backend.check_file(example, actual)
+    end
   end
 end

data/lib/serverspec/matchers/be_grouped_into.rb

@@ -1,5 +1,9 @@
 RSpec::Matchers.define :be_grouped_into do |group|
   match do |file|
-    backend.check_grouped(example, file, group)
+    if file.respond_to?(:grouped_into?)
+      file.grouped_into?(group)
+    else
+      backend.check_grouped(example, file, group)
+    end
   end
 end

data/lib/serverspec/matchers/be_installed.rb

@@ -1,15 +1,19 @@
 RSpec::Matchers.define :be_installed do
   match do |name|
-    if @provider.nil?
-      backend.check_installed(example, name)
+    if name.respond_to?(:installed?)
+      name.installed?(@provider, @version)
     else
-      check_method = "check_installed_by_#{@provider}".to_sym
+      if @provider.nil?
+        backend.check_installed(example, name)
+      else
+        check_method = "check_installed_by_#{@provider}".to_sym
 
-      unless backend.respond_to?(check_method)
-        raise ArgumentError.new("`be_installed` matcher doesn't support #{@under}")
-      end
+        unless backend.respond_to?(check_method)
+          raise ArgumentError.new("`be_installed` matcher doesn't support #{@under}")
+        end
 
-      backend.send(check_method, example, name, @version)
+        backend.send(check_method, example, name, @version)
+      end
     end
   end
 

data/lib/serverspec/matchers/be_linked_to.rb

@@ -1,5 +1,9 @@
 RSpec::Matchers.define :be_linked_to do |target|
   match do |link|
-    backend.check_link(example, link, target)
+    if link.respond_to?(:linked_to?)
+      link.linked_to?(target)
+    else
+      backend.check_link(example, link, target)
+    end
   end
 end

data/lib/serverspec/matchers/be_listening.rb

@@ -1,6 +1,10 @@
 RSpec::Matchers.define :be_listening do
   match do |actual|
-    port = actual.gsub(/port\s+/, '')
-    backend.check_listening(example, port)
+    if actual.respond_to?(:listening?)
+      actual.listening?
+    else
+      port = actual.gsub(/port\s+/, '')
+      backend.check_listening(example, port)
+    end
   end
 end

data/lib/serverspec/matchers/be_mode.rb

@@ -1,5 +1,9 @@
 RSpec::Matchers.define :be_mode do |mode|
   match do |file|
-    backend.check_mode(example, file, mode)
+    if file.respond_to?(:mode?)
+      file.mode?(mode)
+    else
+      backend.check_mode(example, file, mode)
+    end
   end
 end

data/lib/serverspec/matchers/be_mounted.rb

@@ -1,6 +1,10 @@
 RSpec::Matchers.define :be_mounted do
   match do |path|
-    backend.check_mounted(example, path, @attr, @only_with)
+    if path.respond_to?(:mounted?)
+      path.mounted?(@attr, @only_with)
+    else
+      backend.check_mounted(example, path, @attr, @only_with)
+    end
   end
   chain :with do |attr|
     @attr      = attr

data/lib/serverspec/matchers/be_owned_by.rb

@@ -1,5 +1,9 @@
 RSpec::Matchers.define :be_owned_by do |owner|
   match do |file|
-    backend.check_owner(example, file, owner)
+    if file.respond_to?(:owned_by?)
+      file.owned_by?(owner)
+    else
+      backend.check_owner(example, file, owner)
+    end
   end
 end

data/lib/serverspec/matchers/be_readable.rb

@@ -1,9 +1,13 @@
 RSpec::Matchers.define :be_readable do
   match do |file|
-    if @by_user != nil
-      backend.check_access_by_user(example, file, @by_user, 'r')
+    if file.respond_to?(:readable?)
+      file.readable?(@by_whom, @by_user)
     else
-      backend.check_readable(example, file, @by_whom)
+      if @by_user != nil
+        backend.check_access_by_user(example, file, @by_user, 'r')
+      else
+        backend.check_readable(example, file, @by_whom)
+      end
     end
   end
   chain :by do |by_whom|

data/lib/serverspec/matchers/be_writable.rb

@@ -1,9 +1,13 @@
 RSpec::Matchers.define :be_writable do
   match do |file|
-    if @by_user != nil
-      backend.check_access_by_user(example, file, @by_user, 'w')
+    if file.respond_to?(:writable?)
+      file.writable?(@by_whom, @by_user)
     else
-      backend.check_writable(example, file, @by_whom)
+      if @by_user != nil
+        backend.check_access_by_user(example, file, @by_user, 'w')
+      else
+        backend.check_writable(example, file, @by_whom)
+      end
     end
   end
   chain :by do |by_whom|

data/lib/serverspec/matchers/contain.rb

@@ -1,12 +1,16 @@
 RSpec::Matchers.define :contain do |pattern|
   match do |file|
-    if (@from || @to).nil?
-      cmd = backend.commands.check_file_contain(file, pattern)
+    if file.respond_to?(:contain)
+      file.contain(pattern, @from, @to)
     else
-      cmd = backend.commands.check_file_contain_within(file, pattern, @from, @to)
+      if (@from || @to).nil?
+        cmd = backend.commands.check_file_contain(file, pattern)
+      else
+        cmd = backend.commands.check_file_contain_within(file, pattern, @from, @to)
+      end
+      ret = backend.run_command(cmd)
+      ret[:exit_status] == 0
     end
-    ret = backend.run_command(cmd)
-    ret[:exit_status] == 0
   end
   # for contain(pattern).from(/A/).to(/B/)
   chain :from do |from|

data/lib/serverspec/matchers/match_md5checksum.rb

@@ -1,5 +1,9 @@
 RSpec::Matchers.define :match_md5checksum do |pattern|
   match do |file|
-    backend.check_file_md5checksum(example, file, pattern)
+    if file.respond_to?(:match_md5checksum)
+      file.match_md5checksum(pattern)
+    else
+      backend.check_file_md5checksum(example, file, pattern)
+    end
   end
 end

data/lib/serverspec/type/base.rb

@@ -0,0 +1,14 @@
+module Serverspec
+  module Type
+    class Base
+      def initialize name
+        @name = name
+      end
+
+      def to_s
+       type = self.class.name.split(':')[-1]
+        %Q!#{type} "#{@name}"!
+      end
+    end
+  end
+end

data/lib/serverspec/type/file.rb

@@ -0,0 +1,70 @@
+module Serverspec
+  module Type
+    class File < Base
+      def file?
+        backend.check_file(nil, @name)
+      end
+
+      def directory?
+        backend.check_directory(nil, @name)
+      end
+
+      def contain(pattern, from, to)
+        if (@from || @to).nil?
+          cmd = backend.check_file_contain(nil, @name, pattern)
+        else
+          cmd = backend.check_file_contain_within(nil, @name, pattern, from, to)
+        end
+      end
+
+      def mode?(mode)
+        backend.check_mode(nil, @name, mode)
+      end
+
+      def owned_by?(owner)
+        backend.check_owner(nil, @name, owner)
+      end
+
+      def grouped_into?(group)
+        backend.check_grouped(nil, @name, group)
+      end
+
+      def linked_to?(target)
+        backend.check_link(nil, @name, target)
+      end
+
+      def readable?(by_whom, by_user)
+        if by_user != nil
+          backend.check_access_by_user(nil, @name, by_user, 'r')
+        else
+          backend.check_readable(nil, @name, by_whom)
+        end
+      end
+
+      def writable?(by_whom, by_user)
+        if by_user != nil
+          backend.check_access_by_user(nil, @name, by_user, 'w')
+        else
+          backend.check_writable(nil, @name, by_whom)
+        end
+      end
+
+      def executable?(by_whom, by_user)
+        if by_user != nil
+          backend.check_access_by_user(nil, @name, by_user, 'x')
+        else
+          backend.check_executable(nil, @name, by_whom)
+        end
+      end
+
+      def mounted?(attr, only_with)
+        backend.check_mounted(nil, @name, attr, only_with)
+      end
+
+      def match_md5checksum(md5sum)
+        backend.check_file_md5checksum(nil, @name, md5sum)
+      end
+
+    end
+  end
+end

data/lib/serverspec/type/package.rb

@@ -0,0 +1,19 @@
+module Serverspec
+  module Type
+    class Package < Base
+      def installed?(provider, version)
+        if provider.nil?
+          backend.check_installed(nil, @name)
+        else
+          check_method = "check_installed_by_#{provider}".to_sym
+
+          unless backend.respond_to?(check_method)
+            raise ArgumentError.new("`be_installed` matcher doesn't support #{provider}")
+          end
+
+          backend.send(check_method, nil, @name, version)
+        end
+      end
+    end
+  end
+end

data/lib/serverspec/type/port.rb

@@ -0,0 +1,9 @@
+module Serverspec
+  module Type
+    class Port < Base
+      def listening?
+        backend.check_listening(nil, @name)
+      end
+    end
+  end
+end

data/lib/serverspec/type/service.rb

@@ -1,10 +1,6 @@
 module Serverspec
   module Type
-    class Service
-      def initialize name
-        @name = name
-      end
-
+    class Service < Base
       def enabled?
         backend.check_enabled(nil, @name)
       end
@@ -22,10 +18,6 @@ module Serverspec
           backend.check_running(nil, @name)
         end
       end
-
-      def to_s
-        "Service #{@name}"
-      end
     end
   end
 end

data/lib/serverspec/version.rb

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

data/spec/darwin/file_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Darwin
+
+describe 'Serverspec service 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'
+  it_behaves_like 'support file contain from to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/
+  it_behaves_like 'support file contain after matcher', 'Gemfile', 'rspec', /^group :test do/
+  it_behaves_like 'support file contain before matcher', 'Gemfile', 'rspec', /^end/
+  it_behaves_like 'support file be_mode matcher', '/etc/passwd', 644
+  it_behaves_like 'support file be_owned_by matcher', '/etc/passwd', 'root'
+  it_behaves_like 'support file be_grouped_into matcher', '/etc/passwd', 'root'
+  it_behaves_like 'support file be_linked_to matcher', '/etc/pam.d/system-auth', '/etc/pam.d/system-auth-ac'
+
+  it_behaves_like 'support file be_readable matcher', '/dev'
+  it_behaves_like 'support file be_readable by owner matcher', '/dev'
+  it_behaves_like 'support file be_readable by group matcher', '/dev'
+  it_behaves_like 'support file be_readable by others matcher', '/dev'
+  it_behaves_like 'support file be_readable by specific user matcher', '/tmp', 'mail'
+
+  it_behaves_like 'support file be_writable matcher', '/dev'
+  it_behaves_like 'support file be_writable by owner matcher', '/dev'
+  it_behaves_like 'support file be_writable by group matcher', '/dev'
+  it_behaves_like 'support file be_writable by others matcher', '/dev'
+  it_behaves_like 'support file be_writable by specific user matcher', '/tmp',  'mail'
+
+  it_behaves_like 'support file be_executable matcher', '/dev'
+  it_behaves_like 'support file be_executable by owner matcher', '/dev'
+  it_behaves_like 'support file be_executable by group matcher', '/dev'
+  it_behaves_like 'support file be_executable by others matcher', '/dev'
+  it_behaves_like 'support file be_executable by specific user matcher', '/tmp', 'mail'
+
+  it_behaves_like 'support file be_mounted matcher', '/'
+  it_behaves_like 'support file be_mounted with matcher', '/'
+  it_behaves_like 'support file be_mounted only with matcher', '/'
+
+  it_behaves_like 'support file match_md5checksum matcher', '/etc/services', '35435ea447c19f0ea5ef971837ab9ced'
+end

data/spec/darwin/package_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Darwin
+
+describe 'Serverspec package matchers of Darwin family' do
+  it_behaves_like 'support package installed by gem matcher', 'jekyll'
+  it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
+end

data/spec/darwin/port_spec.rb

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

data/spec/debian/file_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Debian
+
+describe 'Serverspec service 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'
+  it_behaves_like 'support file contain from to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/
+  it_behaves_like 'support file contain after matcher', 'Gemfile', 'rspec', /^group :test do/
+  it_behaves_like 'support file contain before matcher', 'Gemfile', 'rspec', /^end/
+  it_behaves_like 'support file be_mode matcher', '/etc/passwd', 644
+  it_behaves_like 'support file be_owned_by matcher', '/etc/passwd', 'root'
+  it_behaves_like 'support file be_grouped_into matcher', '/etc/passwd', 'root'
+  it_behaves_like 'support file be_linked_to matcher', '/etc/pam.d/system-auth', '/etc/pam.d/system-auth-ac'
+
+  it_behaves_like 'support file be_readable matcher', '/dev'
+  it_behaves_like 'support file be_readable by owner matcher', '/dev'
+  it_behaves_like 'support file be_readable by group matcher', '/dev'
+  it_behaves_like 'support file be_readable by others matcher', '/dev'
+  it_behaves_like 'support file be_readable by specific user matcher', '/tmp', 'mail'
+
+  it_behaves_like 'support file be_writable matcher', '/dev'
+  it_behaves_like 'support file be_writable by owner matcher', '/dev'
+  it_behaves_like 'support file be_writable by group matcher', '/dev'
+  it_behaves_like 'support file be_writable by others matcher', '/dev'
+  it_behaves_like 'support file be_writable by specific user matcher', '/tmp',  'mail'
+
+  it_behaves_like 'support file be_executable matcher', '/dev'
+  it_behaves_like 'support file be_executable by owner matcher', '/dev'
+  it_behaves_like 'support file be_executable by group matcher', '/dev'
+  it_behaves_like 'support file be_executable by others matcher', '/dev'
+  it_behaves_like 'support file be_executable by specific user matcher', '/tmp', 'mail'
+
+  it_behaves_like 'support file be_mounted matcher', '/'
+  it_behaves_like 'support file be_mounted with matcher', '/'
+  it_behaves_like 'support file be_mounted only with matcher', '/'
+
+  it_behaves_like 'support file match_md5checksum matcher', '/etc/services', '35435ea447c19f0ea5ef971837ab9ced'end

data/spec/debian/package_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Debian
+
+describe 'Serverspec package matchers of Debian family' do
+  it_behaves_like 'support package installed matcher', 'httpd'
+  it_behaves_like 'support package installed by gem matcher', 'jekyll'
+  it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
+end

data/spec/debian/port_spec.rb

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

data/spec/gentoo/file_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Gentoo
+
+describe 'Serverspec service 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'
+  it_behaves_like 'support file contain from to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/
+  it_behaves_like 'support file contain after matcher', 'Gemfile', 'rspec', /^group :test do/
+  it_behaves_like 'support file contain before matcher', 'Gemfile', 'rspec', /^end/
+  it_behaves_like 'support file be_mode matcher', '/etc/passwd', 644
+  it_behaves_like 'support file be_owned_by matcher', '/etc/passwd', 'root'
+  it_behaves_like 'support file be_grouped_into matcher', '/etc/passwd', 'root'
+  it_behaves_like 'support file be_linked_to matcher', '/etc/pam.d/system-auth', '/etc/pam.d/system-auth-ac'
+
+  it_behaves_like 'support file be_readable matcher', '/dev'
+  it_behaves_like 'support file be_readable by owner matcher', '/dev'
+  it_behaves_like 'support file be_readable by group matcher', '/dev'
+  it_behaves_like 'support file be_readable by others matcher', '/dev'
+  it_behaves_like 'support file be_readable by specific user matcher', '/tmp', 'mail'
+
+  it_behaves_like 'support file be_writable matcher', '/dev'
+  it_behaves_like 'support file be_writable by owner matcher', '/dev'
+  it_behaves_like 'support file be_writable by group matcher', '/dev'
+  it_behaves_like 'support file be_writable by others matcher', '/dev'
+  it_behaves_like 'support file be_writable by specific user matcher', '/tmp',  'mail'
+
+  it_behaves_like 'support file be_executable matcher', '/dev'
+  it_behaves_like 'support file be_executable by owner matcher', '/dev'
+  it_behaves_like 'support file be_executable by group matcher', '/dev'
+  it_behaves_like 'support file be_executable by others matcher', '/dev'
+  it_behaves_like 'support file be_executable by specific user matcher', '/tmp', 'mail'
+
+  it_behaves_like 'support file be_mounted matcher', '/'
+  it_behaves_like 'support file be_mounted with matcher', '/'
+  it_behaves_like 'support file be_mounted only with matcher', '/'
+
+  it_behaves_like 'support file match_md5checksum matcher', '/etc/services', '35435ea447c19f0ea5ef971837ab9ced'
+end

data/spec/gentoo/package_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Gentoo
+
+describe 'Serverspec package matchers of Gentoo family' do
+  it_behaves_like 'support package installed matcher', 'httpd'
+  it_behaves_like 'support package installed by gem matcher', 'jekyll'
+  it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
+end

data/spec/gentoo/port_spec.rb

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

data/spec/redhat/file_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+include Serverspec::Helper::RedHat
+
+describe 'Serverspec service 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'
+  it_behaves_like 'support file contain from to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/
+  it_behaves_like 'support file contain after matcher', 'Gemfile', 'rspec', /^group :test do/
+  it_behaves_like 'support file contain before matcher', 'Gemfile', 'rspec', /^end/
+  it_behaves_like 'support file be_mode matcher', '/etc/passwd', 644
+  it_behaves_like 'support file be_owned_by matcher', '/etc/passwd', 'root'
+  it_behaves_like 'support file be_grouped_into matcher', '/etc/passwd', 'root'
+  it_behaves_like 'support file be_linked_to matcher', '/etc/pam.d/system-auth', '/etc/pam.d/system-auth-ac'
+
+  it_behaves_like 'support file be_readable matcher', '/dev'
+  it_behaves_like 'support file be_readable by owner matcher', '/dev'
+  it_behaves_like 'support file be_readable by group matcher', '/dev'
+  it_behaves_like 'support file be_readable by others matcher', '/dev'
+  it_behaves_like 'support file be_readable by specific user matcher', '/tmp', 'mail'
+
+  it_behaves_like 'support file be_writable matcher', '/dev'
+  it_behaves_like 'support file be_writable by owner matcher', '/dev'
+  it_behaves_like 'support file be_writable by group matcher', '/dev'
+  it_behaves_like 'support file be_writable by others matcher', '/dev'
+  it_behaves_like 'support file be_writable by specific user matcher', '/tmp',  'mail'
+
+  it_behaves_like 'support file be_executable matcher', '/dev'
+  it_behaves_like 'support file be_executable by owner matcher', '/dev'
+  it_behaves_like 'support file be_executable by group matcher', '/dev'
+  it_behaves_like 'support file be_executable by others matcher', '/dev'
+  it_behaves_like 'support file be_executable by specific user matcher', '/tmp', 'mail'
+
+  it_behaves_like 'support file be_mounted matcher', '/'
+  it_behaves_like 'support file be_mounted with matcher', '/'
+  it_behaves_like 'support file be_mounted only with matcher', '/'
+
+  it_behaves_like 'support file match_md5checksum matcher', '/etc/services', '35435ea447c19f0ea5ef971837ab9ced'
+end

data/spec/redhat/package_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+include Serverspec::Helper::RedHat
+
+describe 'Serverspec package matchers of Red Hat family' do
+  it_behaves_like 'support package installed matcher', 'httpd'
+  it_behaves_like 'support package installed by gem matcher', 'jekyll'
+  it_behaves_like 'support package installed by gem with version matcher', 'jekyll', '1.1.1'
+end

data/spec/redhat/port_spec.rb

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