serverspec 0.6.23 → 0.6.24

data/lib/serverspec/commands/debian.rb

@@ -3,7 +3,7 @@ module Serverspec
     class Debian < Linux
       def check_enabled(service, level=3)
         # Until everything uses Upstart, this needs an OR.
-        "ls /etc/rc#{level}.d/ | grep -- #{escape(service)} || grep 'start on' /etc/init/#{escape(service)}.conf"      
+        "ls /etc/rc#{level}.d/ | grep -- #{escape(service)} || grep 'start on' /etc/init/#{escape(service)}.conf"
       end
 
       def check_installed(package, version=nil)

data/lib/serverspec/matchers/be_enabled.rb

@@ -1,7 +1,7 @@
 RSpec::Matchers.define :be_enabled do
   match do |subject|
     if subject.class.name == 'Serverspec::Type::Service'
-       subject.enabled?(@level)
+      subject.enabled?(@level || 3)
     else
       subject.enabled?
     end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.6.23"
+  VERSION = "0.6.24"
 end

data/spec/darwin/commands_spec.rb

@@ -3,19 +3,7 @@ require 'spec_helper'
 include Serverspec::Helper::Darwin
 
 describe 'Serverspec commands of Darwin family' do
-  it_behaves_like 'support command check_user', 'root'
-  it_behaves_like 'support command check_user', 'wheel'
-
   it_behaves_like 'support command check_running_under_supervisor', 'httpd'
   it_behaves_like 'support command check_monitored_by_monit', 'unicorn'
   it_behaves_like 'support command check_process', 'httpd'
-
-  it_behaves_like 'support command check_belonging_group', 'root', 'wheel'
-
-  it_behaves_like 'support command check_uid', 'root', 0
-
-  it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
-  it_behaves_like 'support command check_home_directory', 'root', '/root'
-
-  it_behaves_like 'support command check_authorized_key'
 end

data/spec/darwin/user_spec.rb

@@ -2,11 +2,56 @@ require 'spec_helper'
 
 include Serverspec::Helper::Darwin
 
-describe 'Serverspec user matchers of Darwin family' do
-  it_behaves_like 'support user exist matcher', 'root'
-  it_behaves_like 'support user belong_to_group matcher', 'root', 'root'
-  it_behaves_like 'support user have_uid matcher', 'root', 0
-  it_behaves_like 'support user have_login_shell matcher', 'root', '/bin/bash'
-  it_behaves_like 'support user have_home_directory matcher', 'root', '/root'
-  it_behaves_like 'support user have_authorized_key matcher', 'root', 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local'
+describe user('root') do
+  it { should exist }
+  its(:command) { should eq "id root" }
+end
+
+describe user('invalid-user') do
+  it { should_not exist }
+end
+
+describe user('root') do
+  it { should belong_to_group 'root' }
+  its(:command) { should eq "id root | awk '{print $3}' | grep -- root" }
+end
+
+describe user('root') do
+  it { should_not belong_to_group 'invalid-group' }
+end
+
+describe user('root') do
+  it { should have_uid 0 }
+  its(:command) { should eq "id root | grep -- \\^uid\\=0\\(" }
+end
+
+describe user('root') do
+  it { should_not have_uid 'invalid-uid' }
+end
+
+describe user('root') do
+  it { should have_login_shell '/bin/bash' }
+  its(:command) { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
+end
+
+describe user('root') do
+  it { should_not have_login_shell 'invalid-login-shell' }
+end
+
+describe user('root') do
+  it { should have_home_directory '/root' }
+  its(:command) { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
+end
+
+describe user('root') do
+  it { should_not have_home_directory 'invalid-home-directory' }
+end
+
+describe user('root') do
+  it { should have_authorized_key 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local' }
+  its(:command) { should eq "grep -w -- ssh-rsa\\ ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH ~root/.ssh/authorized_keys" }
+end
+
+describe user('root') do
+  it { should_not have_authorized_key 'invalid-key' }
 end

data/spec/debian/commands_spec.rb

@@ -3,9 +3,6 @@ require 'spec_helper'
 include Serverspec::Helper::Debian
 
 describe 'Serverspec commands of Debian family' do
-  it_behaves_like 'support command check_user', 'root'
-  it_behaves_like 'support command check_user', 'wheel'
-
   it_behaves_like 'support command check_running_under_supervisor', 'httpd'
 
   it_behaves_like 'support command check_running_under_upstart', 'monit'
@@ -13,15 +10,6 @@ describe 'Serverspec commands of Debian family' do
   it_behaves_like 'support command check_monitored_by_monit', 'unicorn'
 
   it_behaves_like 'support command check_process', 'httpd'
-
-  it_behaves_like 'support command check_belonging_group', 'root', 'wheel'
-
-  it_behaves_like 'support command check_uid', 'root', 0
-
-  it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
-  it_behaves_like 'support command check_home_directory', 'root', '/root'
-
-  it_behaves_like 'support command check_authorized_key'
 end
 
 describe 'check_enabled' do

data/spec/debian/user_spec.rb

@@ -2,11 +2,56 @@ require 'spec_helper'
 
 include Serverspec::Helper::Debian
 
-describe 'Serverspec user matchers of Debian family' do
-  it_behaves_like 'support user exist matcher', 'root'
-  it_behaves_like 'support user belong_to_group matcher', 'root', 'root'
-  it_behaves_like 'support user have_uid matcher', 'root', 0
-  it_behaves_like 'support user have_login_shell matcher', 'root', '/bin/bash'
-  it_behaves_like 'support user have_home_directory matcher', 'root', '/root'
-  it_behaves_like 'support user have_authorized_key matcher', 'root', 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local'
+describe user('root') do
+  it { should exist }
+  its(:command) { should eq "id root" }
+end
+
+describe user('invalid-user') do
+  it { should_not exist }
+end
+
+describe user('root') do
+  it { should belong_to_group 'root' }
+  its(:command) { should eq "id root | awk '{print $3}' | grep -- root" }
+end
+
+describe user('root') do
+  it { should_not belong_to_group 'invalid-group' }
+end
+
+describe user('root') do
+  it { should have_uid 0 }
+  its(:command) { should eq "id root | grep -- \\^uid\\=0\\(" }
+end
+
+describe user('root') do
+  it { should_not have_uid 'invalid-uid' }
+end
+
+describe user('root') do
+  it { should have_login_shell '/bin/bash' }
+  its(:command) { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
+end
+
+describe user('root') do
+  it { should_not have_login_shell 'invalid-login-shell' }
+end
+
+describe user('root') do
+  it { should have_home_directory '/root' }
+  its(:command) { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
+end
+
+describe user('root') do
+  it { should_not have_home_directory 'invalid-home-directory' }
+end
+
+describe user('root') do
+  it { should have_authorized_key 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local' }
+  its(:command) { should eq "grep -w -- ssh-rsa\\ ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH ~root/.ssh/authorized_keys" }
+end
+
+describe user('root') do
+  it { should_not have_authorized_key 'invalid-key' }
 end

data/spec/gentoo/commands_spec.rb

@@ -3,21 +3,9 @@ require 'spec_helper'
 include Serverspec::Helper::Gentoo
 
 describe 'Serverspec commands of Gentoo family' do
-  it_behaves_like 'support command check_user', 'root'
-  it_behaves_like 'support command check_user', 'wheel'
-
   it_behaves_like 'support command check_running_under_supervisor', 'httpd'
   it_behaves_like 'support command check_monitored_by_monit', 'unicorn'
   it_behaves_like 'support command check_process', 'httpd'
-
-  it_behaves_like 'support command check_belonging_group', 'root', 'wheel'
-
-  it_behaves_like 'support command check_uid', 'root', 0
-
-  it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
-  it_behaves_like 'support command check_home_directory', 'root', '/root'
-
-  it_behaves_like 'support command check_authorized_key'
 end
 
 describe 'check_enabled' do

data/spec/gentoo/user_spec.rb

@@ -2,11 +2,56 @@ require 'spec_helper'
 
 include Serverspec::Helper::Gentoo
 
-describe 'Serverspec user matchers of Gentoo family' do
-  it_behaves_like 'support user exist matcher', 'root'
-  it_behaves_like 'support user belong_to_group matcher', 'root', 'root'
-  it_behaves_like 'support user have_uid matcher', 'root', 0
-  it_behaves_like 'support user have_login_shell matcher', 'root', '/bin/bash'
-  it_behaves_like 'support user have_home_directory matcher', 'root', '/root'
-  it_behaves_like 'support user have_authorized_key matcher', 'root', 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local'
+describe user('root') do
+  it { should exist }
+  its(:command) { should eq "id root" }
+end
+
+describe user('invalid-user') do
+  it { should_not exist }
+end
+
+describe user('root') do
+  it { should belong_to_group 'root' }
+  its(:command) { should eq "id root | awk '{print $3}' | grep -- root" }
+end
+
+describe user('root') do
+  it { should_not belong_to_group 'invalid-group' }
+end
+
+describe user('root') do
+  it { should have_uid 0 }
+  its(:command) { should eq "id root | grep -- \\^uid\\=0\\(" }
+end
+
+describe user('root') do
+  it { should_not have_uid 'invalid-uid' }
+end
+
+describe user('root') do
+  it { should have_login_shell '/bin/bash' }
+  its(:command) { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
+end
+
+describe user('root') do
+  it { should_not have_login_shell 'invalid-login-shell' }
+end
+
+describe user('root') do
+  it { should have_home_directory '/root' }
+  its(:command) { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
+end
+
+describe user('root') do
+  it { should_not have_home_directory 'invalid-home-directory' }
+end
+
+describe user('root') do
+  it { should have_authorized_key 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local' }
+  its(:command) { should eq "grep -w -- ssh-rsa\\ ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH ~root/.ssh/authorized_keys" }
+end
+
+describe user('root') do
+  it { should_not have_authorized_key 'invalid-key' }
 end

data/spec/redhat/commands_spec.rb

@@ -3,9 +3,6 @@ require 'spec_helper'
 include Serverspec::Helper::RedHat
 
 describe 'Serverspec commands of Red Hat' do
-  it_behaves_like 'support command check_user', 'root'
-  it_behaves_like 'support command check_user', 'wheel'
-
   it_behaves_like 'support command check_running_under_supervisor', 'httpd'
 
   it_behaves_like 'support command check_running_under_upstart', 'monit'
@@ -13,15 +10,6 @@ describe 'Serverspec commands of Red Hat' do
   it_behaves_like 'support command check_monitored_by_monit', 'unicorn'
 
   it_behaves_like 'support command check_process', 'httpd'
-
-  it_behaves_like 'support command check_belonging_group', 'root', 'wheel'
-
-  it_behaves_like 'support command check_uid', 'root', 0
-
-  it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
-  it_behaves_like 'support command check_home_directory', 'root', '/root'
-
-  it_behaves_like 'support command check_authorized_key'
 end
 
 describe 'check_enabled' do

data/spec/redhat/user_spec.rb

@@ -2,11 +2,57 @@ require 'spec_helper'
 
 include Serverspec::Helper::RedHat
 
-describe 'Serverspec user matchers of Red Hat family' do
-  it_behaves_like 'support user exist matcher', 'root'
-  it_behaves_like 'support user belong_to_group matcher', 'root', 'root'
-  it_behaves_like 'support user have_uid matcher', 'root', 0
-  it_behaves_like 'support user have_login_shell matcher', 'root', '/bin/bash'
-  it_behaves_like 'support user have_home_directory matcher', 'root', '/root'
-  it_behaves_like 'support user have_authorized_key matcher', 'root', 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local'
+
+describe user('root') do
+  it { should exist }
+  its(:command) { should eq "id root" }
+end
+
+describe user('invalid-user') do
+  it { should_not exist }
+end
+
+describe user('root') do
+  it { should belong_to_group 'root' }
+  its(:command) { should eq "id root | awk '{print $3}' | grep -- root" }
+end
+
+describe user('root') do
+  it { should_not belong_to_group 'invalid-group' }
+end
+
+describe user('root') do
+  it { should have_uid 0 }
+  its(:command) { should eq "id root | grep -- \\^uid\\=0\\(" }
+end
+
+describe user('root') do
+  it { should_not have_uid 'invalid-uid' }
+end
+
+describe user('root') do
+  it { should have_login_shell '/bin/bash' }
+  its(:command) { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
+end
+
+describe user('root') do
+  it { should_not have_login_shell 'invalid-login-shell' }
+end
+
+describe user('root') do
+  it { should have_home_directory '/root' }
+  its(:command) { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
+end
+
+describe user('root') do
+  it { should_not have_home_directory 'invalid-home-directory' }
+end
+
+describe user('root') do
+  it { should have_authorized_key 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local' }
+  its(:command) { should eq "grep -w -- ssh-rsa\\ ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH ~root/.ssh/authorized_keys" }
+end
+
+describe user('root') do
+  it { should_not have_authorized_key 'invalid-key' }
 end

data/spec/smartos/commands_spec.rb

@@ -3,19 +3,10 @@ require 'spec_helper'
 include Serverspec::Helper::SmartOS
 
 describe 'Serverspec commands of Solaris family specified SmartOS' do
-  it_behaves_like 'support command check_user', 'root'
-  it_behaves_like 'support command check_user', 'wheel'
 
   it_behaves_like 'support command check_running_under_supervisor', 'httpd'
   it_behaves_like 'support command check_monitored_by_monit', 'unicorn'
   it_behaves_like 'support command check_process', 'httpd'
-
-  it_behaves_like 'support command check_uid', 'root', 0
-
-  it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
-  it_behaves_like 'support command check_home_directory', 'root', '/root'
-
-  it_behaves_like 'support command check_authorized_key'
 end
 
 describe 'check_enabled' do

data/spec/solaris/commands_spec.rb

@@ -3,20 +3,9 @@ require 'spec_helper'
 include Serverspec::Helper::Solaris
 
 describe 'Serverspec commands of Solaris family' do
-
-  it_behaves_like 'support command check_user', 'root'
-  it_behaves_like 'support command check_user', 'wheel'
-
   it_behaves_like 'support command check_running_under_supervisor', 'httpd'
   it_behaves_like 'support command check_monitored_by_monit', 'unicorn'
   it_behaves_like 'support command check_process', 'httpd'
-
-  it_behaves_like 'support command check_uid', 'root', 0
-
-  it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
-  it_behaves_like 'support command check_home_directory', 'root', '/root'
-
-  it_behaves_like 'support command check_authorized_key'
 end
 
 describe 'check_enabled' do

data/spec/solaris/user_spec.rb

@@ -2,11 +2,56 @@ require 'spec_helper'
 
 include Serverspec::Helper::Solaris
 
-describe 'Serverspec user matchers of Solaris family' do
-  it_behaves_like 'support user exist matcher', 'root'
-  it_behaves_like 'support user belong_to_group matcher', 'root', 'root'
-  it_behaves_like 'support user have_uid matcher', 'root', 0
-  it_behaves_like 'support user have_login_shell matcher', 'root', '/bin/bash'
-  it_behaves_like 'support user have_home_directory matcher', 'root', '/root'
-  it_behaves_like 'support user have_authorized_key matcher', 'root', 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local'
+describe user('root') do
+  it { should exist }
+  its(:command) { should eq "id root" }
+end
+
+describe user('invalid-user') do
+  it { should_not exist }
+end
+
+describe user('root') do
+  it { should belong_to_group 'root' }
+  its(:command) { should eq "id -Gn root | grep -- root" }
+end
+
+describe user('root') do
+  it { should_not belong_to_group 'invalid-group' }
+end
+
+describe user('root') do
+  it { should have_uid 0 }
+  its(:command) { should eq "id root | grep -- \\^uid\\=0\\(" }
+end
+
+describe user('root') do
+  it { should_not have_uid 'invalid-uid' }
+end
+
+describe user('root') do
+  it { should have_login_shell '/bin/bash' }
+  its(:command) { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
+end
+
+describe user('root') do
+  it { should_not have_login_shell 'invalid-login-shell' }
+end
+
+describe user('root') do
+  it { should have_home_directory '/root' }
+  its(:command) { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
+end
+
+describe user('root') do
+  it { should_not have_home_directory 'invalid-home-directory' }
+end
+
+describe user('root') do
+  it { should have_authorized_key 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local' }
+  its(:command) { should eq "grep -w -- ssh-rsa\\ ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH ~root/.ssh/authorized_keys" }
+end
+
+describe user('root') do
+  it { should_not have_authorized_key 'invalid-key' }
 end

data/spec/solaris10/commands_spec.rb

@@ -3,19 +3,9 @@ require 'spec_helper'
 include Serverspec::Helper::Solaris10
 
 describe 'Serverspec commands of Solaris family' do
-  it_behaves_like 'support command check_user', 'root'
-  it_behaves_like 'support command check_user', 'wheel'
-
   it_behaves_like 'support command check_running_under_supervisor', 'httpd'
   it_behaves_like 'support command check_monitored_by_monit', 'unicorn'
   it_behaves_like 'support command check_process', 'httpd'
-
-  it_behaves_like 'support command check_uid', 'root', 0
-
-  it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
-  it_behaves_like 'support command check_home_directory', 'root', '/root'
-
-  it_behaves_like 'support command check_authorized_key'
 end
 
 describe 'check_enabled' do

data/spec/solaris11/commands_spec.rb

@@ -3,20 +3,9 @@ require 'spec_helper'
 include Serverspec::Helper::Solaris11
 
 describe 'Serverspec commands of Solaris11 family' do
-
-  it_behaves_like 'support command check_user', 'root'
-  it_behaves_like 'support command check_user', 'wheel'
-
   it_behaves_like 'support command check_running_under_supervisor', 'httpd'
   it_behaves_like 'support command check_monitored_by_monit', 'unicorn'
   it_behaves_like 'support command check_process', 'httpd'
-
-  it_behaves_like 'support command check_uid', 'root', 0
-
-  it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
-  it_behaves_like 'support command check_home_directory', 'root', '/root'
-
-  it_behaves_like 'support command check_authorized_key'
 end
 
 describe 'check_enabled' do

data/spec/solaris11/user_spec.rb

@@ -2,11 +2,56 @@ require 'spec_helper'
 
 include Serverspec::Helper::Solaris11
 
-describe 'Serverspec user matchers of Solaris11 family' do
-  it_behaves_like 'support user exist matcher', 'root'
-  it_behaves_like 'support user belong_to_group matcher', 'root', 'root'
-  it_behaves_like 'support user have_uid matcher', 'root', 0
-  it_behaves_like 'support user have_login_shell matcher', 'root', '/bin/bash'
-  it_behaves_like 'support user have_home_directory matcher', 'root', '/root'
-  it_behaves_like 'support user have_authorized_key matcher', 'root', 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local'
+describe user('root') do
+  it { should exist }
+  its(:command) { should eq "id root" }
+end
+
+describe user('invalid-user') do
+  it { should_not exist }
+end
+
+describe user('root') do
+  it { should belong_to_group 'root' }
+  its(:command) { should eq "id -Gn root | grep -- root" }
+end
+
+describe user('root') do
+  it { should_not belong_to_group 'invalid-group' }
+end
+
+describe user('root') do
+  it { should have_uid 0 }
+  its(:command) { should eq "id root | grep -- \\^uid\\=0\\(" }
+end
+
+describe user('root') do
+  it { should_not have_uid 'invalid-uid' }
+end
+
+describe user('root') do
+  it { should have_login_shell '/bin/bash' }
+  its(:command) { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
+end
+
+describe user('root') do
+  it { should_not have_login_shell 'invalid-login-shell' }
+end
+
+describe user('root') do
+  it { should have_home_directory '/root' }
+  its(:command) { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
+end
+
+describe user('root') do
+  it { should_not have_home_directory 'invalid-home-directory' }
+end
+
+describe user('root') do
+  it { should have_authorized_key 'ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH foo@bar.local' }
+  its(:command) { should eq "grep -w -- ssh-rsa\\ ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH ~root/.ssh/authorized_keys" }
+end
+
+describe user('root') do
+  it { should_not have_authorized_key 'invalid-key' }
 end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ require 'serverspec'
 require 'pathname'
 require 'rspec/mocks/standalone'
 
+include Serverspec::Helper::Exec
+
 PROJECT_ROOT = (Pathname.new(File.dirname(__FILE__)) + '..').expand_path
 
 Dir[PROJECT_ROOT.join("spec/support/**/*.rb")].each { |file| require(file) }

data/spec/support/shared_commands_examples.rb

@@ -1,14 +1,8 @@
-shared_examples_for 'support command check_user' do |user|
-  subject { commands.check_user(user) }
-  it { should eq "id #{user}" }
-end
-
 shared_examples_for 'support command check_running_under_supervisor' do |service|
   subject { commands.check_running_under_supervisor(service) }
   it { should eq "supervisorctl status #{service}" }
 end
 
-
 shared_examples_for 'support command check_running_under_upstart' do |service|
   subject { commands.check_running_under_upstart(service) }
   it { should eq "initctl status #{service}" }
@@ -23,41 +17,3 @@ shared_examples_for 'support command check_process' do |process|
   subject { commands.check_process(process) }
   it { should eq "ps aux | grep -w -- #{process} | grep -qv grep" }
 end
-
-shared_examples_for 'support command check_belonging_group' do |user, group|
-  subject { commands.check_belonging_group(user, group) }
-  it { should eq "id #{user} | awk '{print $3}' | grep -- #{group}" }
-end
-
-shared_examples_for 'support command check_uid' do |user, uid|
-  subject { commands.check_uid('root', 0) }
-  it { should eq "id #{user} | grep -- \\^uid\\=#{uid}\\(" }
-end
-
-shared_examples_for 'support command check_login_shell' do |user, shell|
-  subject { commands.check_login_shell(user, shell) }
-  it { should eq "getent passwd #{user} | cut -f 7 -d ':' | grep -w -- #{shell}" }
-end
-
-shared_examples_for 'support command check_home_directory' do |user, home|
-  subject { commands.check_home_directory(user, home) }
-  it { should eq "getent passwd #{user} | cut -f 6 -d ':' | grep -w -- #{home}" }
-end
-
-shared_examples_for 'support command check_authorized_key' do
-  key = "ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH"
-  escaped_key = key.gsub(/ /, '\ ')
-
-  context 'with commented publickey' do
-    commented_key = key + " foo@bar.local"
-    subject { commands.check_authorized_key('root', commented_key) }
-    describe 'when command insert publickey is removed comment' do
-      it { should eq "grep -w -- #{escaped_key} ~root/.ssh/authorized_keys" }
-    end
-  end
-
-  context 'with uncomented publickey' do
-    subject { commands.check_authorized_key('root', key) }
-    it { should eq "grep -w -- #{escaped_key} ~root/.ssh/authorized_keys" }
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.23
+  version: 0.6.24
   prerelease: 
 platform: ruby
 authors:
@@ -320,7 +320,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/shared_commands_examples.rb
 - spec/support/shared_service_examples.rb
-- spec/support/shared_uer_examples.rb
 homepage: http://serverspec.org/
 licenses:
 - MIT
@@ -451,4 +450,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/shared_commands_examples.rb
 - spec/support/shared_service_examples.rb
-- spec/support/shared_uer_examples.rb

data/spec/support/shared_uer_examples.rb

@@ -1,73 +0,0 @@
-include Serverspec::Helper::Exec
-
-shared_examples_for 'support user exist matcher' do |name|
-  describe 'user exist' do
-    describe user(name) do
-      it { should exist }
-    end
-
-    describe user('invalid-user') do
-      it { should_not exist }
-    end
-  end
-end
-
-shared_examples_for 'support user belong_to_group matcher' do |name, group|
-  describe 'belong_to_group' do
-    describe user(name) do
-      it { should belong_to_group group }
-    end
-
-    describe user(name) do
-      it { should_not belong_to_group 'invalid-group' }
-    end
-  end
-end
-
-shared_examples_for 'support user have_uid matcher' do |name, uid|
-  describe 'have_uid' do
-    describe user(name) do
-      it { should have_uid uid }
-    end
-
-    describe user(name) do
-      it { should_not have_uid 'invalid-uid' }
-    end
-  end
-end
-
-shared_examples_for 'support user have_login_shell matcher' do |name, path_to_shell|
-  describe 'have_login_shell' do
-    describe user(name) do
-      it { should have_login_shell path_to_shell }
-    end
-
-    describe user(name) do
-      it { should_not have_login_shell 'invalid-login-shell' }
-    end
-  end
-end
-
-shared_examples_for 'support user have_home_directory matcher' do |name, path_to_home|
-  describe 'have_home_directory' do
-    describe user(name) do
-      it { should have_home_directory path_to_home }
-    end
-
-    describe user(name) do
-      it { should_not have_home_directory 'invalid-home-directory' }
-    end
-  end
-end
-
-shared_examples_for 'support user have_authorized_key matcher' do |name, key|
-  describe 'have_authorized_key' do
-    describe user(name) do
-      it { should have_authorized_key key }
-    end
-
-    describe user(name) do
-      it { should_not have_authorized_key 'invalid-publickey' }
-    end
-  end
-end