serverspec 0.2.1 → 0.2.2

data/lib/serverspec/backend/exec.rb

@@ -94,6 +94,10 @@ module Serverspec
       def check_iptables_rule(rule, table, chain)
         check_zero(:check_iptables_rule, rule, table, chain)
       end
+
+      def check_zfs(zfs, property)
+        check_zero(:check_zfs, zfs, property)
+      end
     end
   end
 end

data/lib/serverspec/commands/base.rb

@@ -51,15 +51,15 @@ module Serverspec
       end
 
       def check_mode file, mode
-        "stat -c %a #{file} | grep #{mode}"
+        "stat -c %a #{file} | grep '^#{mode}$'"
       end
 
       def check_owner file, owner
-        "stat -c %U #{file} | grep #{owner}"
+        "stat -c %U #{file} | grep '^#{owner}$'"
       end
 
       def check_grouped file, group
-        "stat -c %G #{file} | grep #{group}"
+        "stat -c %G #{file} | grep '^#{group}$'"
       end
 
       def check_cron_entry user, entry
@@ -88,6 +88,10 @@ module Serverspec
         cmd += " | grep '#{rule}'"
         cmd
       end
+
+      def check_zfs zfs, property=nil, value=nil
+        raise NotImplementedError.new
+      end
     end
   end
 end

data/lib/serverspec/commands/solaris.rb

@@ -22,6 +22,17 @@ module Serverspec
         "crontab -l #{user} | grep '#{entry_escaped}'"
       end
 
+      def check_zfs zfs, property=nil
+        if property.nil?
+          "/sbin/zfs list -H #{zfs}"
+        else
+          commands = []
+          property.sort.each do |key, value|
+            commands << "/sbin/zfs list -H -o #{key} #{zfs} | grep ^#{value}$"
+          end
+          commands.join(' && ')
+        end
+      end
     end
   end
 end

data/lib/serverspec/matchers.rb

@@ -16,3 +16,4 @@ require 'serverspec/matchers/be_installed_by_gem'
 require 'serverspec/matchers/belong_to_group'
 require 'serverspec/matchers/have_iptables_rule'
 require 'serverspec/matchers/get_stdout'
+require 'serverspec/matchers/be_zfs'

data/lib/serverspec/matchers/be_zfs.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :be_zfs do
+  match do |zfs|
+    backend.check_zfs(zfs, @property)
+  end
+
+  chain :with do |property|
+    @property = property
+  end
+end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/debian/commands_spec.rb

@@ -59,15 +59,15 @@ describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test d
 end
 
 describe commands.check_mode('/etc/sudoers', 440) do
-  it { should eq 'stat -c %a /etc/sudoers | grep 440' }
+  it { should eq 'stat -c %a /etc/sudoers | grep \'^440$\'' }
 end
 
 describe commands.check_owner('/etc/passwd', 'root') do
-  it { should eq 'stat -c %U /etc/passwd | grep root' }
+  it { should eq 'stat -c %U /etc/passwd | grep \'^root$\'' }
 end
 
 describe commands.check_grouped('/etc/passwd', 'wheel') do
-  it { should eq 'stat -c %G /etc/passwd | grep wheel' }
+  it { should eq 'stat -c %G /etc/passwd | grep \'^wheel$\'' }
 end
 
 describe commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') do

data/spec/gentoo/commands_spec.rb

@@ -59,15 +59,15 @@ describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test d
 end
 
 describe commands.check_mode('/etc/sudoers', 440) do
-  it { should eq 'stat -c %a /etc/sudoers | grep 440' }
+  it { should eq 'stat -c %a /etc/sudoers | grep \'^440$\'' }
 end
 
 describe commands.check_owner('/etc/passwd', 'root') do
-  it { should eq 'stat -c %U /etc/passwd | grep root' }
+  it { should eq 'stat -c %U /etc/passwd | grep \'^root$\'' }
 end
 
 describe commands.check_grouped('/etc/passwd', 'wheel') do
-  it { should eq 'stat -c %G /etc/passwd | grep wheel' }
+  it { should eq 'stat -c %G /etc/passwd | grep \'^wheel$\'' }
 end
 
 describe commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') do

data/spec/redhat/commands_spec.rb

@@ -59,15 +59,15 @@ describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test d
 end
 
 describe commands.check_mode('/etc/sudoers', 440) do
-  it { should eq 'stat -c %a /etc/sudoers | grep 440' }
+  it { should eq 'stat -c %a /etc/sudoers | grep \'^440$\'' }
 end
 
 describe commands.check_owner('/etc/passwd', 'root') do
-  it { should eq 'stat -c %U /etc/passwd | grep root' }
+  it { should eq 'stat -c %U /etc/passwd | grep \'^root$\'' }
 end
 
 describe commands.check_grouped('/etc/passwd', 'wheel') do
-  it { should eq 'stat -c %G /etc/passwd | grep wheel' }
+  it { should eq 'stat -c %G /etc/passwd | grep \'^wheel$\'' }
 end
 
 describe commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') do

data/spec/solaris/commads_spec.rb

@@ -59,15 +59,15 @@ describe commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test d
 end
 
 describe commands.check_mode('/etc/sudoers', 440) do
-  it { should eq 'stat -c %a /etc/sudoers | grep 440' }
+  it { should eq 'stat -c %a /etc/sudoers | grep \'^440$\'' }
 end
 
 describe commands.check_owner('/etc/passwd', 'root') do
-  it { should eq 'stat -c %U /etc/passwd | grep root' }
+  it { should eq 'stat -c %U /etc/passwd | grep \'^root$\'' }
 end
 
 describe commands.check_grouped('/etc/passwd', 'wheel') do
-  it { should eq 'stat -c %G /etc/passwd | grep wheel' }
+  it { should eq 'stat -c %G /etc/passwd | grep \'^wheel$\'' }
 end
 
 describe commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') do
@@ -85,3 +85,24 @@ end
 describe commands.check_belonging_group('root', 'wheel') do
   it { should eq "id root | awk '{print $2}' | grep wheel" }
 end
+
+describe commands.check_zfs('rpool') do
+  it { should eq "/sbin/zfs list -H rpool" }
+end
+
+describe commands.check_zfs('rpool', { 'mountpoint' => '/rpool' }) do
+  it { should eq "/sbin/zfs list -H -o mountpoint rpool | grep ^/rpool$" }
+end
+
+describe commands.check_zfs('rpool', { 'mountpoint' => '/rpool' }) do
+  it { should eq "/sbin/zfs list -H -o mountpoint rpool | grep ^/rpool$" }
+end
+
+check_zfs_with_multiple_properties = commands.check_zfs('rpool', {
+  'mountpoint'  => '/rpool',
+  'compression' => 'off',
+})
+
+describe check_zfs_with_multiple_properties do
+  it { should eq "/sbin/zfs list -H -o compression rpool | grep ^off$ && /sbin/zfs list -H -o mountpoint rpool | grep ^/rpool$" }
+end

data/spec/solaris/matchers_spec.rb

@@ -33,4 +33,6 @@ describe 'Serverspec matchers of Solaris family', :os => :solaris do
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
 
   it_behaves_like 'support get_stdout matcher', 'whoami', 'root'
+  it_behaves_like 'support be_zfs matcher', 'rpool'
+  it_behaves_like 'support be_zfs.property matcher', 'rpool', { 'mountpoint' => '/rpool' }
 end

data/spec/support/shared_matcher_examples.rb

@@ -305,3 +305,27 @@ shared_examples_for 'support get_stdout matcher' do |command, output|
     it { should_not get_stdout 'invalid-output' }
   end
 end
+
+shared_examples_for 'support be_zfs matcher' do |zfs|
+  describe 'be_zfs' do
+    describe zfs do
+      it { should be_zfs }
+    end
+
+    describe 'this-is-invalid-zfs' do
+      it { should_not be_zfs }
+    end
+  end
+end
+
+shared_examples_for 'support be_zfs.property matcher' do |zfs, property|
+  describe 'be_zfs' do
+    describe zfs do
+      it { should be_zfs.with(property) }
+    end
+
+    describe 'this-is-invalid-zfs' do
+      it { should_not be_zfs.with(property) }
+    end
+  end
+end

metadata

@@ -1,90 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: serverspec
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.2.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-08 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: RSpec tests for your servers provisioned by Puppet, Chef or anything else
-email: 
+  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:
 - gosukenator@gmail.com
-executables: 
+executables:
 - serverspec-init
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -125,6 +124,7 @@ files:
 - lib/serverspec/matchers/be_owned_by.rb
 - lib/serverspec/matchers/be_running.rb
 - lib/serverspec/matchers/be_user.rb
+- lib/serverspec/matchers/be_zfs.rb
 - lib/serverspec/matchers/belong_to_group.rb
 - lib/serverspec/matchers/contain.rb
 - lib/serverspec/matchers/get_stdout.rb
@@ -143,41 +143,32 @@ files:
 - spec/solaris/matchers_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_matcher_examples.rb
-has_rdoc: true
 homepage: http://serverspec.org/
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your servers provisioned by Puppet, Chef or anything else
-test_files: 
+test_files:
 - spec/debian/commands_spec.rb
 - spec/debian/matchers_spec.rb
 - spec/gentoo/commands_spec.rb