serverspec 0.2.19 → 0.2.20

data/README.md

@@ -1,4 +1,4 @@
-# Serverspec [![BuildStatus](https://secure.travis-ci.org/mizzy/serverspec.png)](http://travis-ci.org/mizzy/serverspec)
+# Serverspec [![Gem Version](https://badge.fury.io/rb/serverspec.png)](http://badge.fury.io/rb/serverspec) [![BuildStatus](https://secure.travis-ci.org/mizzy/serverspec.png)](http://travis-ci.org/mizzy/serverspec)
 
 RSpec tests for your servers provisioned by Puppet, Chef or anything else
 

data/lib/serverspec/backend/exec.rb

@@ -11,7 +11,7 @@ module Serverspec
         @commands
       end
 
-      def do_check(cmd, opts={})
+      def run_command(cmd, opts={})
         # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
         #stdout, stderr, status = Open3.capture3(cmd)
         # So get exit status with `command`
@@ -26,7 +26,7 @@ module Serverspec
       end
 
       def check_zero(cmd, *args)
-        ret = do_check(commands.send(cmd, *args))
+        ret = run_command(commands.send(cmd, *args))
         ret[:exit_status] == 0
       end
 
@@ -38,7 +38,7 @@ module Serverspec
       end
 
       def check_installed_by_gem(example, package, version)
-        ret = do_check(commands.check_installed_by_gem(package))
+        ret = run_command(commands.check_installed_by_gem(package))
         res = ret[:exit_status] == 0
         if res && version
           res = false if not ret[:stdout].match(/\(#{version}\)/)
@@ -47,20 +47,20 @@ module Serverspec
       end
 
       def check_running(example, process)
-        ret = do_check(commands.check_running(process))
+        ret = run_command(commands.check_running(process))
         if ret[:exit_status] == 1 || ret[:stdout] =~ /stopped/
-          ret = do_check(commands.check_process(process))
+          ret = run_command(commands.check_process(process))
         end
         ret[:exit_status] == 0
       end
 
       def check_running_under_supervisor(example, process)
-        ret = do_check(commands.check_running_under_supervisor(process))
+        ret = run_command(commands.check_running_under_supervisor(process))
         ret[:exit_status] == 0 && ret[:stdout] =~ /RUNNING/
       end
 
       def check_readable(example, file, by_whom)
-        mode = sprintf('%04s',do_check(commands.get_mode(file))[:stdout].strip)
+        mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
         mode = mode.split('')
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
         case by_whom
@@ -76,7 +76,7 @@ module Serverspec
       end
 
       def check_writable(example, file, by_whom)
-        mode = sprintf('%04s',do_check(commands.get_mode(file))[:stdout].strip)
+        mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
         mode = mode.split('')
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
         case by_whom
@@ -92,7 +92,7 @@ module Serverspec
       end
 
       def check_executable(example, file, by_whom)
-        mode = sprintf('%04s',do_check(commands.get_mode(file))[:stdout].strip)
+        mode = sprintf('%04s',run_command(commands.get_mode(file))[:stdout].strip)
         mode = mode.split('')
         mode_octal = mode[0].to_i * 512 + mode[1].to_i * 64 + mode[2].to_i * 8 + mode[3].to_i * 1
         case by_whom
@@ -107,14 +107,48 @@ module Serverspec
         end
       end
 
+      def check_mounted(example, path, expected_attr, only_with)
+        ret = run_command(commands.check_mounted(path))
+        if expected_attr.nil? || ret[:exit_status] != 0
+          return ret[:exit_status] == 0
+        end
+
+        mount = ret[:stdout].scan(/\S+/)
+        actual_attr    = { :device => mount[0], :type => mount[4] }
+        mount[5].gsub(/\(|\)/, '').split(',').each do |option|
+          name, val = option.split('=')
+          if val.nil?
+            actual_attr[name.to_sym] = true
+          else
+            val = val.to_i if val.match(/^\d+$/)
+            actual_attr[name.to_sym] = val
+          end
+        end
+
+        if ! expected_attr[:options].nil?
+          expected_attr.merge!(expected_attr[:options])
+          expected_attr.delete(:options)
+        end
+
+        if only_with
+          actual_attr == expected_attr
+        else
+          match = true
+          expected_attr.each do |key, val|
+            match = actual_attr[key] == val
+          end
+          match
+        end
+      end
+
       def check_os
-        if do_check('ls /etc/redhat-release')[:exit_status] == 0
+        if run_command('ls /etc/redhat-release')[:exit_status] == 0
           'RedHat'
-        elsif do_check('ls /etc/debian_version')[:exit_status] == 0
+        elsif run_command('ls /etc/debian_version')[:exit_status] == 0
           'Debian'
-        elsif do_check('ls /etc/gentoo-release')[:exit_status] == 0
+        elsif run_command('ls /etc/gentoo-release')[:exit_status] == 0
           'Gentoo'
-        elsif do_check('uname -s')[:stdout] =~ /SunOS/i
+        elsif run_command('uname -s')[:stdout] =~ /SunOS/i
           'Solaris'
         end
       end

data/lib/serverspec/backend/ssh.rb

@@ -3,7 +3,7 @@ require 'serverspec/backend/exec'
 module Serverspec
   module Backend
     class Ssh < Exec
-      def do_check(cmd, opt={})
+      def run_command(cmd, opt={})
         cmd = "sudo #{cmd}" if not RSpec.configuration.ssh.options[:user] == 'root'
         ssh_exec!(cmd)
       end

data/lib/serverspec/commands/base.rb

@@ -7,6 +7,20 @@ module Serverspec
         raise NotImplementedError.new
       end
 
+      def check_mounted path
+        "mount | grep -w 'on #{path}'"
+      end
+
+      def check_resolvable name, type
+        if type == "dns"
+          "nslookup -timeout=1 #{name}"
+        elsif type == "hosts"
+          "grep -w #{name} /etc/hosts"
+        else
+          "getent hosts #{name}"
+        end
+      end
+
       def check_file file
         "test -f #{file}"
       end

data/lib/serverspec/filter.rb

@@ -6,7 +6,7 @@ module Serverspec
       # Linux kernel parameters
       %w( abi crypto debug dev fs kernel net sunrpc vm ).each do |param|
         if description_args.match(/^#{param}\./)
-          ret = backend(Serverspec::Commands::Base).do_check("/sbin/sysctl -q -n #{description_args}")
+          ret = backend(Serverspec::Commands::Base).run_command("/sbin/sysctl -q -n #{description_args}")
           val = ret[:stdout].strip
           val = val.to_i if val.match(/^\d+$/)
           subject = Serverspec::Subject.new

data/lib/serverspec/matchers.rb

@@ -1,3 +1,5 @@
+require 'serverspec/matchers/be_mounted'
+require 'serverspec/matchers/be_resolvable'
 require 'serverspec/matchers/be_enabled'
 require 'serverspec/matchers/be_file'
 require 'serverspec/matchers/be_directory'

data/lib/serverspec/matchers/be_mounted.rb

@@ -0,0 +1,13 @@
+RSpec::Matchers.define :be_mounted do
+  match do |path|
+    backend.check_mounted(example, path, @attr, @only_with)
+  end
+  chain :with do |attr|
+    @attr      = attr
+    @only_with = false
+  end
+  chain :only_with do |attr|
+    @attr      = attr
+    @only_with = true
+  end
+end

data/lib/serverspec/matchers/be_resolvable.rb

@@ -0,0 +1,8 @@
+RSpec::Matchers.define :be_resolvable do
+  match do |name|
+    backend.check_resolvable(example, name, @type)
+  end
+  chain :by do |type|
+    @type = type
+  end
+end

data/lib/serverspec/matchers/contain.rb

@@ -5,7 +5,7 @@ RSpec::Matchers.define :contain do |pattern|
     else
       cmd = backend.commands.check_file_contain_within(file, pattern, @from, @to)
     end
-    ret = backend.do_check(cmd)
+    ret = backend.run_command(cmd)
     ret[:exit_status] == 0
   end
   # for contain(pattern).from(/A/).to(/B/)

data/lib/serverspec/matchers/get_stdout.rb

@@ -8,7 +8,7 @@ Use "return_stdout" matcher instead.
 ************************************
 
 EOF
-    ret = backend.do_check(command)
+    ret = backend.run_command(command)
     ret[:stdout] =~ /#{expected}/
   end
 end

data/lib/serverspec/matchers/return_exit_status.rb

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

data/lib/serverspec/matchers/return_stderr.rb

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

data/lib/serverspec/matchers/return_stdout.rb

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

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.2.19"
+  VERSION = "0.2.20"
 end

data/spec/debian/commands_spec.rb

@@ -10,6 +10,26 @@ describe 'check_file', :os => :debian  do
   it { should eq 'test -f /etc/passwd' }
 end
 
+describe 'check_mounted', :os => :debian  do
+  subject { commands.check_mounted('/') }
+  it { should eq "mount | grep -w 'on /'" }
+end
+
+describe 'check_resolvable', :os => :debian  do
+  context "resolve localhost by hosts" do
+    subject { commands.check_resolvable('localhost', 'hosts') }
+    it { should eq "grep -w localhost /etc/hosts" }
+  end
+  context "resolve localhost by dns" do
+    subject { commands.check_resolvable('localhost', 'dns') }
+    it { should eq "nslookup -timeout=1 localhost" }
+  end
+  context "resolve localhost with default settings" do
+    subject { commands.check_resolvable('localhost',nil) }
+    it { should eq 'getent hosts localhost' }
+  end
+end
+
 describe 'check_directory', :os => :debian  do
   subject { commands.check_directory('/var/log') }
   it { should eq 'test -d /var/log' }

data/spec/debian/matchers_spec.rb

@@ -7,6 +7,14 @@ describe 'Serverspec matchers of Debian family', :os => :debian do
   it_behaves_like 'support be_running.under("supervisor") matcher', 'growthforecast'
   it_behaves_like 'support be_listening matcher', 22
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
+
+  it_behaves_like 'support be_mounted matcher', '/'
+  it_behaves_like 'support be_mounted.with matcher', '/'
+  it_behaves_like 'support be_mounted.only_with matcher', '/'
+
+  it_behaves_like 'support be_resolvable matcher', 'localhost'
+  it_behaves_like 'support be_resolvable.by matcher', 'localhost', 'hosts'
+  it_behaves_like 'support be_resolvable.by matcher', 'localhost', 'dns'
   it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'See the sshd_config(5) manpage'
   it_behaves_like 'support contain.from.to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/
   it_behaves_like 'support contain.after matcher', 'Gemfile', 'rspec', /^group :test do/

data/spec/gentoo/commands_spec.rb

@@ -10,6 +10,26 @@ describe 'check_file', :os => :gentoo do
   it { should eq 'test -f /etc/passwd' }
 end
 
+describe 'check_mounted', :os => :debian  do
+  subject { commands.check_mounted('/') }
+  it { should eq "mount | grep -w 'on /'" }
+end
+
+describe 'check_resolvable', :os => :debian  do
+  context "resolve localhost by hosts" do
+    subject { commands.check_resolvable('localhost', 'hosts') }
+    it { should eq "grep -w localhost /etc/hosts" }
+  end
+  context "resolve localhost by dns" do
+    subject { commands.check_resolvable('localhost', 'dns') }
+    it { should eq "nslookup -timeout=1 localhost" }
+  end
+  context "resolve localhost with default settings" do
+    subject { commands.check_resolvable('localhost',nil) }
+    it { should eq 'getent hosts localhost' }
+  end
+end
+
 describe 'check_directory', :os => :gentoo do
   subject { commands.check_directory('/var/log') }
   it { should eq 'test -d /var/log' }

data/spec/gentoo/matchers_spec.rb

@@ -7,6 +7,14 @@ describe 'Serverspec matchers of Gentoo family', :os => :gentoo do
   it_behaves_like 'support be_running.under("supervisor") matcher', 'growthforecast'
   it_behaves_like 'support be_listening matcher', 22
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
+
+  it_behaves_like 'support be_mounted matcher', '/'
+  it_behaves_like 'support be_mounted.with matcher', '/'
+  it_behaves_like 'support be_mounted.only_with matcher', '/'
+
+  it_behaves_like 'support be_resolvable matcher', 'localhost'
+  it_behaves_like 'support be_resolvable.by matcher', 'localhost', 'hosts'
+  it_behaves_like 'support be_resolvable.by matcher', 'localhost', 'dns'
   it_behaves_like 'support be_directory matcher', '/etc/ssh'
   it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'
   it_behaves_like 'support contain.from.to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/

data/spec/redhat/commands_spec.rb

@@ -10,6 +10,26 @@ describe 'check_file', :os => :redhat do
   it { should eq 'test -f /etc/passwd' }
 end
 
+describe 'check_mounted', :os => :debian  do
+  subject { commands.check_mounted('/') }
+  it { should eq "mount | grep -w 'on /'" }
+end
+
+describe 'check_resolvable', :os => :debian  do
+  context "resolve localhost by hosts" do
+    subject { commands.check_resolvable('localhost', 'hosts') }
+    it { should eq "grep -w localhost /etc/hosts" }
+  end
+  context "resolve localhost by dns" do
+    subject { commands.check_resolvable('localhost', 'dns') }
+    it { should eq "nslookup -timeout=1 localhost" }
+  end
+  context "resolve localhost with default settings" do
+    subject { commands.check_resolvable('localhost',nil) }
+    it { should eq 'getent hosts localhost' }
+  end
+end
+
 describe 'check_directory', :os => :redhat do
   subject { commands.check_directory('/var/log') }
   it { should eq 'test -d /var/log' }

data/spec/redhat/matchers_spec.rb

@@ -8,6 +8,14 @@ describe 'Serverspec matchers of Red Hat family', :os => :redhat do
   it_behaves_like 'support be_running.under("not implemented") matcher', 'growthforecast'
   it_behaves_like 'support be_listening matcher', 22
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
+
+  it_behaves_like 'support be_mounted matcher', '/'
+  it_behaves_like 'support be_mounted.with matcher', '/'
+  it_behaves_like 'support be_mounted.only_with matcher', '/'
+
+  it_behaves_like 'support be_resolvable matcher', 'localhost'
+  it_behaves_like 'support be_resolvable.by matcher', 'localhost', 'hosts'
+  it_behaves_like 'support be_resolvable.by matcher', 'localhost', 'dns'
   it_behaves_like 'support be_directory matcher', '/etc/ssh'
   it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'This is the sshd server system-wide configuration file'
   it_behaves_like 'support contain.from.to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/

data/spec/solaris/commands_spec.rb

@@ -10,6 +10,26 @@ describe 'check_file', :os => :solaris do
   it { should eq 'test -f /etc/passwd' }
 end
 
+describe 'check_mounted', :os => :debian  do
+  subject { commands.check_mounted('/') }
+  it { should eq "mount | grep -w 'on /'" }
+end
+
+describe 'check_resolvable', :os => :debian  do
+  context "resolve localhost by hosts" do
+    subject { commands.check_resolvable('localhost', 'hosts') }
+    it { should eq "grep -w localhost /etc/hosts" }
+  end
+  context "resolve localhost by dns" do
+    subject { commands.check_resolvable('localhost', 'dns') }
+    it { should eq "nslookup -timeout=1 localhost" }
+  end
+  context "resolve localhost with default settings" do
+    subject { commands.check_resolvable('localhost',nil) }
+    it { should eq 'getent hosts localhost' }
+  end
+end
+
 describe 'check_directory', :os => :solaris do
   subject { commands.check_directory('/var/log') }
   it { should eq 'test -d /var/log' }

data/spec/solaris/matchers_spec.rb

@@ -7,6 +7,14 @@ describe 'Serverspec matchers of Solaris family', :os => :solaris do
   it_behaves_like 'support be_running.under("supervisor") matcher', 'growthforecast'
   it_behaves_like 'support be_listening matcher', 22
   it_behaves_like 'support be_file matcher', '/etc/ssh/sshd_config'
+
+  it_behaves_like 'support be_mounted matcher', '/'
+  it_behaves_like 'support be_mounted.with matcher', '/'
+  it_behaves_like 'support be_mounted.only_with matcher', '/'
+
+  it_behaves_like 'support be_resolvable matcher', 'localhost'
+  it_behaves_like 'support be_resolvable.by matcher', 'localhost', 'hosts'
+  it_behaves_like 'support be_resolvable.by matcher', 'localhost', 'dns'
   it_behaves_like 'support be_directory matcher', '/etc/ssh'
   it_behaves_like 'support contain matcher', '/etc/ssh/sshd_config', 'Configuration file for sshd(1m) (see also sshd_config(4))'
   it_behaves_like 'support contain.from.to matcher', 'Gemfile', 'rspec', /^group :test do/, /^end/

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ Dir[PROJECT_ROOT.join("spec/support/**/*.rb")].each { |file| require(file) }
 module Serverspec
   module Backend
     class Exec
-      def do_check(cmd)
+      def run_command(cmd)
         if cmd =~ /invalid/
           {
             :stdout      => ::RSpec.configuration.stdout,

data/spec/support/shared_matcher_examples.rb

@@ -94,6 +94,149 @@ shared_examples_for 'support be_listening matcher' do |valid_port|
   end
 end
 
+shared_examples_for 'support be_mounted matcher' do |valid_mount|
+  describe 'be_mounted' do
+    describe valid_mount do
+      it { should be_mounted }
+    end
+
+    describe '/etc/thid_is_a_invalid_mount' do
+      it { should_not be_mounted }
+    end
+  end
+end
+
+shared_examples_for 'support be_mounted.with matcher' do |valid_mount|
+  describe 'be_mounted.with' do
+    before :all do
+      RSpec.configure do |c|
+        c.stdout = "/dev/mapper/VolGroup-lv_root on / type ext4 (rw,mode=620)\r\n"
+      end
+    end
+
+    describe valid_mount do
+      it { should be_mounted.with( :type => 'ext4' ) }
+    end
+
+    describe valid_mount do
+      it { should be_mounted.with( :type => 'ext4', :options => { :rw => true } ) }
+    end
+
+    describe valid_mount do
+      it { should be_mounted.with( :type => 'ext4', :options => { :mode => 620 } ) }
+    end
+
+    describe valid_mount do
+      it { should_not be_mounted.with( :type => 'xfs' ) }
+    end
+
+    describe valid_mount do
+      it { should_not be_mounted.with( :type => 'ext4', :options => { :rw => false } ) }
+    end
+
+    describe valid_mount do
+      it { should_not be_mounted.with( :type => 'ext4', :options => { :mode => 600 } ) }
+    end
+
+    describe '/etc/thid_is_a_invalid_mount' do
+      it { should_not be_mounted.with( :type => 'ext4' ) }
+    end
+  end
+end
+
+
+shared_examples_for 'support be_mounted.only_with matcher' do |valid_mount|
+  describe 'be_mounted.with' do
+    before :all do
+      RSpec.configure do |c|
+        c.stdout = "/dev/mapper/VolGroup-lv_root on / type ext4 (rw,mode=620)\r\n"
+      end
+    end
+
+    describe valid_mount do
+      it do
+        should be_mounted.only_with(
+          :device  => '/dev/mapper/VolGroup-lv_root',
+          :type    => 'ext4',
+          :options => {
+            :rw   => true,
+            :mode => 620,
+          }
+        )
+      end
+    end
+
+    describe valid_mount do
+      it do
+        should_not be_mounted.only_with(
+          :device  => '/dev/mapper/VolGroup-lv_root',
+          :type    => 'ext4',
+          :options => {
+            :rw   => true,
+            :mode => 620,
+            :bind => true,
+          }
+        )
+      end
+    end
+
+    describe valid_mount do
+      it do
+        should_not be_mounted.only_with(
+          :device  => '/dev/mapper/VolGroup-lv_root',
+          :type    => 'ext4',
+          :options => {
+            :rw   => true,
+          }
+        )
+      end
+    end
+
+    describe valid_mount do
+      it do
+        should_not be_mounted.only_with(
+          :device  => '/dev/mapper/VolGroup-lv_roooooooooot',
+          :type    => 'ext4',
+          :options => {
+            :rw   => true,
+            :mode => 620,
+          }
+        )
+      end
+    end
+
+    describe '/etc/thid_is_a_invalid_mount' do
+      it { should_not be_mounted.only_with( :type => 'ext4' ) }
+    end
+  end
+end
+
+
+shared_examples_for 'support be_resolvable matcher' do |valid_name|
+  describe 'be_resolvable' do
+    describe valid_name do
+      it { should be_resolvable }
+    end
+
+    describe 'invalid_name' do
+      it { should_not be_resolvable }
+    end
+  end
+end
+
+
+shared_examples_for 'support be_resolvable.by matcher' do |valid_name, type|
+  describe 'be_resolvable.by' do
+    describe valid_name do
+      it { should be_resolvable.by(type) }
+    end
+
+    describe 'invalid_name' do
+      it { should_not be_resolvable.by(type) }
+    end
+  end
+end
+
 shared_examples_for 'support be_file matcher' do |valid_file|
   describe 'be_file' do
     describe valid_file do
@@ -907,4 +1050,4 @@ shared_examples_for 'support linux kernel parameter checking with regexp' do |pa
       its(:value) { should_not match /invalid-string/ }
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: serverspec
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 2
-  - 19
-  version: 0.2.19
+  - 20
+  version: 0.2.20
 platform: ruby
 authors: 
 - Gosuke Miyashita
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-02 00:00:00 +09:00
+date: 2013-05-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,9 +141,11 @@ files:
 - lib/serverspec/matchers/be_linked_to.rb
 - lib/serverspec/matchers/be_listening.rb
 - lib/serverspec/matchers/be_mode.rb
+- lib/serverspec/matchers/be_mounted.rb
 - lib/serverspec/matchers/be_owned_by.rb
 - lib/serverspec/matchers/be_permissive.rb
 - lib/serverspec/matchers/be_readable.rb
+- lib/serverspec/matchers/be_resolvable.rb
 - lib/serverspec/matchers/be_running.rb
 - lib/serverspec/matchers/be_user.rb
 - lib/serverspec/matchers/be_writable.rb