serverspec 0.6.22 → 0.6.23

data/lib/serverspec/commands/redhat.rb

@@ -25,6 +25,8 @@ module Serverspec
         end
         cmd
       end
+
+      alias :check_installed_by_rpm :check_installed
     end
   end
 end

data/lib/serverspec/version.rb

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

data/spec/darwin/commands_spec.rb

@@ -13,7 +13,6 @@ describe 'Serverspec commands of Darwin family' do
   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_gid', 'root', 0
 
   it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
   it_behaves_like 'support command check_home_directory', 'root', '/root'

data/spec/darwin/group_spec.rb

@@ -2,7 +2,20 @@ require 'spec_helper'
 
 include Serverspec::Helper::Darwin
 
-describe 'Serverspec user matchers of Darwin family' do
-  it_behaves_like 'support group exist matcher', 'root'
-  it_behaves_like 'support group have_gid matcher', 'root', 0
+describe group('root') do
+  it { should exist }
+  its(:command) { should eq "getent group | grep -wq -- root" }
+end
+
+describe group('invalid-group') do
+  it { should_not exist }
+end
+
+describe group('root') do
+  it { should have_gid 0 }
+  its(:command) { should eq "getent group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
+end
+
+describe group('root') do
+  it { should_not have_gid 'invalid-gid' }
 end

data/spec/debian/commands_spec.rb

@@ -17,7 +17,6 @@ describe 'Serverspec commands of Debian family' do
   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_gid', 'root', 0
 
   it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
   it_behaves_like 'support command check_home_directory', 'root', '/root'

data/spec/debian/group_spec.rb

@@ -2,7 +2,21 @@ require 'spec_helper'
 
 include Serverspec::Helper::Debian
 
-describe 'Serverspec user matchers of Debian family' do
-  it_behaves_like 'support group exist matcher', 'root'
-  it_behaves_like 'support group have_gid matcher', 'root', 0
+describe group('root') do
+  it { should exist }
+  its(:command) { should eq "getent group | grep -wq -- root" }
 end
+
+describe group('invalid-group') do
+  it { should_not exist }
+end
+
+describe group('root') do
+  it { should have_gid 0 }
+  its(:command) { should eq "getent group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
+end
+
+describe group('root') do
+  it { should_not have_gid 'invalid-gid' }
+end
+

data/spec/gentoo/commands_spec.rb

@@ -13,7 +13,6 @@ describe 'Serverspec commands of Gentoo family' do
   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_gid', 'root', 0
 
   it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
   it_behaves_like 'support command check_home_directory', 'root', '/root'

data/spec/gentoo/group_spec.rb

@@ -2,7 +2,20 @@ require 'spec_helper'
 
 include Serverspec::Helper::Gentoo
 
-describe 'Serverspec user matchers of Gentoo family' do
-  it_behaves_like 'support group exist matcher', 'root'
-  it_behaves_like 'support group have_gid matcher', 'root', 0
+describe group('root') do
+  it { should exist }
+  its(:command) { should eq "getent group | grep -wq -- root" }
+end
+
+describe group('invalid-group') do
+  it { should_not exist }
+end
+
+describe group('root') do
+  it { should have_gid 0 }
+  its(:command) { should eq "getent group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
+end
+
+describe group('root') do
+  it { should_not have_gid 'invalid-gid' }
 end

data/spec/redhat/commands_spec.rb

@@ -17,7 +17,6 @@ describe 'Serverspec commands of Red Hat' do
   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_gid', 'root', 0
 
   it_behaves_like 'support command check_login_shell', 'root', '/bin/bash'
   it_behaves_like 'support command check_home_directory', 'root', '/root'

data/spec/redhat/group_spec.rb

@@ -2,7 +2,20 @@ require 'spec_helper'
 
 include Serverspec::Helper::RedHat
 
-describe 'Serverspec user matchers of Red Hat family' do
-  it_behaves_like 'support group exist matcher', 'root'
-  it_behaves_like 'support group have_gid matcher', 'root', 0
+describe group('root') do
+  it { should exist }
+  its(:command) { should eq "getent group | grep -wq -- root" }
+end
+
+describe group('invalid-group') do
+  it { should_not exist }
+end
+
+describe group('root') do
+  it { should have_gid 0 }
+  its(:command) { should eq "getent group | grep -w -- \\^root | cut -f 3 -d ':' | grep -w -- 0" }
+end
+
+describe group('root') do
+  it { should_not have_gid 'invalid-gid' }
 end

data/spec/redhat/package_spec.rb

@@ -11,11 +11,20 @@ describe package('invalid-package') do
   it { should_not be_installed }
 end
 
+package('invalid-package') do
+  it { should_not be_installed.by('rpm') }
+end
+
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
   its(:command) { should eq "rpm -q httpd | grep -w -- 2.2.15-28.el6" }
 end
 
+describe package('httpd') do
+  it { should be_installed.by('rpm').with_version('2.2.15-28.el6') }
+  its(:command) { should eq "rpm -q httpd | grep -w -- 2.2.15-28.el6" }
+end
+
 describe package('httpd') do
   it { should_not be_installed.with_version('invalid-version') }
 end

data/spec/smartos/commands_spec.rb

@@ -49,11 +49,6 @@ describe 'check_belonging_group' do
   it { should eq "id -Gn root | grep -- wheel" }
 end
 
-describe 'check_gid' do
-  subject { commands.check_gid('root', 0) }
-  it { should eq "getent group | grep -- \\^root: | cut -f 3 -d ':' | grep -w -- 0" }
-end
-
 describe 'check_zfs' do
   context 'check without properties' do
     subject { commands.check_zfs('rpool') }

data/spec/solaris/commands_spec.rb

@@ -49,11 +49,6 @@ describe 'check_belonging_group' do
   it { should eq "id -Gn root | grep -- wheel" }
 end
 
-describe 'check_gid' do
-  subject { commands.check_gid('root', 0) }
-  it { should eq "getent group | grep -- \\^root: | cut -f 3 -d ':' | grep -w -- 0" }
-end
-
 describe 'check_zfs' do
   context 'check without properties' do
     subject { commands.check_zfs('rpool') }

data/spec/solaris/group_spec.rb

@@ -2,7 +2,20 @@ require 'spec_helper'
 
 include Serverspec::Helper::Solaris
 
-describe 'Serverspec user matchers of Solaris family' do
-  it_behaves_like 'support group exist matcher', 'root'
-  it_behaves_like 'support group have_gid matcher', 'root', 0
+describe group('root') do
+  it { should exist }
+  its(:command) { should eq "getent group | grep -wq -- root" }
+end
+
+describe group('invalid-group') do
+  it { should_not exist }
+end
+
+describe group('root') do
+  it { should have_gid 0 }
+  its(:command) { should eq "getent group | grep -- \\^root: | cut -f 3 -d ':' | grep -w -- 0" }
+end
+
+describe group('root') do
+  it { should_not have_gid 'invalid-gid' }
 end

data/spec/solaris10/commands_spec.rb

@@ -33,11 +33,6 @@ describe 'check_belonging_group' do
   it { should eq "id -Gn root | grep -- wheel" }
 end
 
-describe 'check_gid' do
-  subject { commands.check_gid('root', 0) }
-  it { should eq "getent group | grep -- \\^root: | cut -f 3 -d ':' | grep -w -- 0" }
-end
-
 describe 'check_zfs' do
   context 'check without properties' do
     subject { commands.check_zfs('rpool') }

data/spec/solaris11/commands_spec.rb

@@ -34,11 +34,6 @@ describe 'check_belonging_group' do
   it { should eq "id -Gn root | grep -- wheel" }
 end
 
-describe 'check_gid' do
-  subject { commands.check_gid('root', 0) }
-  it { should eq "getent group | grep -- \\^root: | cut -f 3 -d ':' | grep -w -- 0" }
-end
-
 describe 'check_zfs' do
   context 'check without properties' do
     subject { commands.check_zfs('rpool') }

data/spec/solaris11/group_spec.rb

@@ -2,7 +2,20 @@ require 'spec_helper'
 
 include Serverspec::Helper::Solaris11
 
-describe 'Serverspec user matchers of Solaris11 family' do
-  it_behaves_like 'support group exist matcher', 'root'
-  it_behaves_like 'support group have_gid matcher', 'root', 0
+describe group('root') do
+  it { should exist }
+  its(:command) { should eq "getent group | grep -wq -- root" }
+end
+
+describe group('invalid-group') do
+  it { should_not exist }
+end
+
+describe group('root') do
+  it { should have_gid 0 }
+  its(:command) { should eq "getent group | grep -- \\^root: | cut -f 3 -d ':' | grep -w -- 0" }
+end
+
+describe group('root') do
+  it { should_not have_gid 'invalid-gid' }
 end

data/spec/support/shared_commands_examples.rb

@@ -3,10 +3,6 @@ shared_examples_for 'support command check_user' do |user|
   it { should eq "id #{user}" }
 end
 
-shared_examples_for 'support command check_group' do |group|
-  subject { commands.check_group(group) }
-  it { should eq "getent group | grep -wq -- #{group}" }
-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}" }
@@ -38,11 +34,6 @@ shared_examples_for 'support command check_uid' do |user, uid|
   it { should eq "id #{user} | grep -- \\^uid\\=#{uid}\\(" }
 end
 
-shared_examples_for 'support command check_gid' do |group, gid|
-  subject { commands.check_gid('root', 0) }
-  it { should eq "getent group | grep -w -- \\^#{group} | cut -f 3 -d ':' | grep -w -- #{gid}" }
-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}" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.22
+  version: 0.6.23
   prerelease: 
 platform: ruby
 authors:
@@ -319,9 +319,8 @@ files:
 - spec/solaris11/zfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_commands_examples.rb
-- spec/support/shared_group_examples.rb
 - spec/support/shared_service_examples.rb
-- spec/support/shared_user_examples.rb
+- spec/support/shared_uer_examples.rb
 homepage: http://serverspec.org/
 licenses:
 - MIT
@@ -343,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: RSpec tests for your servers configured by Puppet, Chef or anything else
@@ -451,6 +450,5 @@ test_files:
 - spec/solaris11/zfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_commands_examples.rb
-- spec/support/shared_group_examples.rb
 - spec/support/shared_service_examples.rb
-- spec/support/shared_user_examples.rb
+- spec/support/shared_uer_examples.rb

data/spec/support/shared_user_examples.rb

@@ -1,23 +0,0 @@
-shared_examples_for 'support group exist matcher' do |name|
-  describe 'group exist' do
-    describe group(name) do
-      it { should exist }
-    end
-
-    describe group('invalid-group') do
-      it { should_not exist }
-    end
-  end
-end
-
-shared_examples_for 'support group have_gid matcher' do |name, gid|
-  describe 'have_gid' do
-    describe group(name) do
-      it { should have_gid gid }
-    end
-
-    describe group(name) do
-      it { should_not have_gid 'invalid-gid' }
-    end
-  end
-end