serverspec 0.2.16 → 0.2.17

data/lib/serverspec/commands/base.rb

@@ -83,6 +83,22 @@ module Serverspec
         "id #{user} | awk '{print $3}' | grep #{group}"
       end
 
+      def check_gid group, gid
+        "getent group | grep -w ^#{group} | cut -f 3 -d ':' | grep -w #{gid}"
+      end
+
+      def check_uid user, uid
+        "id #{user} | grep uid=#{uid}("
+      end
+
+      def check_login_shell user, path_to_shell
+        "grep -w ^#{user} /etc/passwd | cut -f 7 -d ':' | grep -w #{path_to_shell}"
+      end
+
+      def check_home_directory user, path_to_home
+        "grep -w ^#{user} /etc/passwd | cut -f 6 -d ':' | grep -w #{path_to_home}"
+      end
+
       def check_iptables_rule rule, table=nil, chain=nil
         cmd = "iptables"
         cmd += " -t #{table}" if table

data/lib/serverspec/commands/solaris.rb

@@ -53,6 +53,17 @@ module Serverspec
         end
         commands.join(' && ')
       end
+
+      def check_file_contain_within file, expected_pattern, from=nil, to=nil
+        from ||= '1'
+        to ||= '$'
+        checker = check_file_contain("/dev/stdin", expected_pattern)
+        "sed -n '#{from},#{to}p' #{file} | #{checker}"
+      end
+
+      def check_belonging_group user, group
+        "id -Gn #{user} | grep #{group}"
+      end
     end
   end
 end

data/lib/serverspec/matchers.rb

@@ -14,6 +14,10 @@ require 'serverspec/matchers/have_cron_entry'
 require 'serverspec/matchers/be_linked_to'
 require 'serverspec/matchers/be_installed_by_gem'
 require 'serverspec/matchers/belong_to_group'
+require 'serverspec/matchers/have_gid'
+require 'serverspec/matchers/have_uid'
+require 'serverspec/matchers/have_login_shell'
+require 'serverspec/matchers/have_home_directory'
 require 'serverspec/matchers/have_iptables_rule'
 require 'serverspec/matchers/get_stdout'
 require 'serverspec/matchers/be_zfs'

data/lib/serverspec/matchers/have_gid.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :have_gid do |gid|
+  match do |group|
+    backend.check_gid(example, group, gid)
+  end
+end
+

data/lib/serverspec/matchers/have_home_directory.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :have_home_directory do |path_to_home|
+  match do |user|
+    backend.check_home_directory(example, user, path_to_home)
+  end
+end
+

data/lib/serverspec/matchers/have_login_shell.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :have_login_shell do |path_to_shell|
+  match do |user|
+    backend.check_login_shell(example, user, path_to_shell)
+  end
+end
+

data/lib/serverspec/matchers/have_uid.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :have_uid do |uid|
+  match do |user|
+    backend.check_uid(example, user, uid)
+  end
+end
+

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.2.16"
+  VERSION = "0.2.17"
 end

data/spec/debian/commands_spec.rb

@@ -113,6 +113,26 @@ describe 'check_belonging_group', :os => :debian do
   it { should eq "id root | awk '{print $3}' | grep wheel" }
 end
 
+describe 'have_gid', :os => :debian do
+  subject { commands.check_gid('root', 0) }
+  it { should eq "getent group | grep -w ^root | cut -f 3 -d ':' | grep -w 0" }
+end
+
+describe 'have_uid', :os => :debian do
+  subject { commands.check_uid('root', 0) }
+  it { should eq "id root | grep uid=0(" }
+end
+
+describe 'have_login_shell', :os => :debian do
+  subject { commands.check_login_shell('root', '/bin/bash') }
+  it { should eq "grep -w ^root /etc/passwd | cut -f 7 -d ':' | grep -w /bin/bash" }
+end
+
+describe 'have_home_directory', :os => :debian do
+  subject { commands.check_home_directory('root', '/root') }
+  it { should eq "grep -w ^root /etc/passwd | cut -f 6 -d ':' | grep -w /root" }
+end
+
 describe 'check_ipatbles', :os => :debian do
   context 'check a rule without a table and a chain' do
     subject { commands.check_iptables_rule('-P INPUT ACCEPT') }

data/spec/debian/matchers_spec.rb

@@ -31,6 +31,10 @@ describe 'Serverspec matchers of Debian family', :os => :debian do
   it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
+  it_behaves_like 'support have_gid matcher', 'root', 0
+  it_behaves_like 'support have_uid matcher', 'root', 0
+  it_behaves_like 'support have_login_shell matcher', 'root', '/bin/bash'
+  it_behaves_like 'support have_home_directory matcher', 'root', '/root'
 
   it_behaves_like 'support have_iptables_rule matcher', '-P INPUT ACCEPT'
   it_behaves_like 'support have_iptables_rule.with_table.with_chain matcher', '-P INPUT ACCEPT', 'mangle', 'INPUT'

data/spec/gentoo/commands_spec.rb

@@ -112,6 +112,26 @@ describe 'check_belonging_group', :os => :gentoo do
   it { should eq "id root | awk '{print $3}' | grep wheel" }
 end
 
+describe 'have_gid', :os => :gentoo do
+  subject { commands.check_gid('root', 0) }
+  it { should eq "getent group | grep -w ^root | cut -f 3 -d ':' | grep -w 0" }
+end
+
+describe 'have_uid', :os => :gentoo do
+  subject { commands.check_uid('root', 0) }
+  it { should eq "id root | grep uid=0(" }
+end
+
+describe 'have_login_shell', :os => :gentoo do
+  subject { commands.check_login_shell('root', '/bin/bash') }
+  it { should eq "grep -w ^root /etc/passwd | cut -f 7 -d ':' | grep -w /bin/bash" }
+end
+
+describe 'have_home_directory', :os => :gentoo do
+  subject { commands.check_home_directory('root', '/root') }
+  it { should eq "grep -w ^root /etc/passwd | cut -f 6 -d ':' | grep -w /root" }
+end
+
 describe 'check_ipatbles', :os => :gentoo do
   context 'check a rule without a table and a chain' do
     subject { commands.check_iptables_rule('-P INPUT ACCEPT') }

data/spec/gentoo/matchers_spec.rb

@@ -32,6 +32,10 @@ describe 'Serverspec matchers of Gentoo family', :os => :gentoo do
   it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
+  it_behaves_like 'support have_gid matcher', 'root', 0
+  it_behaves_like 'support have_uid matcher', 'root', 0
+  it_behaves_like 'support have_login_shell matcher', 'root', '/bin/bash'
+  it_behaves_like 'support have_home_directory matcher', 'root', '/root'
 
   it_behaves_like 'support have_iptables_rule matcher', '-P INPUT ACCEPT'
   it_behaves_like 'support have_iptables_rule.with_table.with_chain matcher', '-P INPUT ACCEPT', 'mangle', 'INPUT'

data/spec/redhat/commands_spec.rb

@@ -112,6 +112,26 @@ describe 'check_belonging_group', :os => :redhat do
   it { should eq "id root | awk '{print $3}' | grep wheel" }
 end
 
+describe 'have_gid', :os => :redhat do
+  subject { commands.check_gid('root', 0) }
+  it { should eq "getent group | grep -w ^root | cut -f 3 -d ':' | grep -w 0" }
+end
+
+describe 'have_uid', :os => :redhat do
+  subject { commands.check_uid('root', 0) }
+  it { should eq "id root | grep uid=0(" }
+end
+
+describe 'have_login_shell', :os => :redhat do
+  subject { commands.check_login_shell('root', '/bin/bash') }
+  it { should eq "grep -w ^root /etc/passwd | cut -f 7 -d ':' | grep -w /bin/bash" }
+end
+
+describe 'have_home_directory', :os => :redhat do
+  subject { commands.check_home_directory('root', '/root') }
+  it { should eq "grep -w ^root /etc/passwd | cut -f 6 -d ':' | grep -w /root" }
+end
+
 describe 'check_ipatbles', :os => :redhat do
   context 'check a rule without a table and a chain' do
     subject { commands.check_iptables_rule('-P INPUT ACCEPT') }

data/spec/redhat/matchers_spec.rb

@@ -33,6 +33,10 @@ describe 'Serverspec matchers of Red Hat family', :os => :redhat do
   it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
+  it_behaves_like 'support have_gid matcher', 'root', 0
+  it_behaves_like 'support have_uid matcher', 'root', 0
+  it_behaves_like 'support have_login_shell matcher', 'root', '/bin/bash'
+  it_behaves_like 'support have_home_directory matcher', 'root', '/root'
 
   it_behaves_like 'support have_iptables_rule matcher', '-P INPUT ACCEPT'
   it_behaves_like 'support have_iptables_rule.with_table.with_chain matcher', '-P INPUT ACCEPT', 'mangle', 'INPUT'

data/spec/solaris/commands_spec.rb

@@ -58,22 +58,22 @@ end
 describe 'check_file_contain_within', :os => :solaris do
   context 'contain a pattern in the file' do
     subject { commands.check_file_contain_within('Gemfile', 'rspec') }
-    it { should eq "sed -n '1,$p' Gemfile | grep -q 'rspec' -" }
+    it { should eq "sed -n '1,$p' Gemfile | grep -q 'rspec' /dev/stdin" }
   end
 
   context 'contain a pattern after a line in a file' do
     subject { commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/') }
-    it { should eq "sed -n '/^group :test do/,$p' Gemfile | grep -q 'rspec' -" }
+    it { should eq "sed -n '/^group :test do/,$p' Gemfile | grep -q 'rspec' /dev/stdin" }
   end
 
   context 'contain a pattern before a line in a file' do
     subject {commands.check_file_contain_within('Gemfile', 'rspec', nil, '/^end/') }
-    it { should eq "sed -n '1,/^end/p' Gemfile | grep -q 'rspec' -" }
+    it { should eq "sed -n '1,/^end/p' Gemfile | grep -q 'rspec' /dev/stdin" }
   end
 
   context 'contain a pattern from within a line and another line in a file' do
     subject { commands.check_file_contain_within('Gemfile', 'rspec', '/^group :test do/', '/^end/') }
-    it { should eq "sed -n '/^group :test do/,/^end/p' Gemfile | grep -q 'rspec' -" }
+    it { should eq "sed -n '/^group :test do/,/^end/p' Gemfile | grep -q 'rspec' /dev/stdin" }
   end
 end
 
@@ -109,9 +109,28 @@ end
 
 describe 'check_belonging_group', :os => :solaris do
   subject { commands.check_belonging_group('root', 'wheel') }
-  it { should eq "id root | awk '{print $3}' | grep wheel" }
+  it { should eq "id -Gn root | grep wheel" }
 end
 
+describe 'have_gid', :os => :solaris do
+  subject { commands.check_gid('root', 0) }
+  it { should eq "getent group | grep -w ^root | cut -f 3 -d ':' | grep -w 0" }
+end
+
+describe 'have_uid', :os => :solaris do
+  subject { commands.check_uid('root', 0) }
+  it { should eq "id root | grep uid=0(" }
+end
+
+describe 'have_login_shell', :os => :solaris do
+  subject { commands.check_login_shell('root', '/bin/bash') }
+  it { should eq "grep -w ^root /etc/passwd | cut -f 7 -d ':' | grep -w /bin/bash" }
+end
+
+describe 'have_home_directory', :os => :solaris do
+  subject { commands.check_home_directory('root', '/root') }
+  it { should eq "grep -w ^root /etc/passwd | cut -f 6 -d ':' | grep -w /root" }
+end
 
 describe 'check_zfs', :os => :solaris do
   context 'check without properties' do

data/spec/solaris/matchers_spec.rb

@@ -32,6 +32,10 @@ describe 'Serverspec matchers of Solaris family', :os => :solaris do
   it_behaves_like 'support be_installed.by(gem).with_version matcher', 'jekyll', '1.0.0'
 
   it_behaves_like 'support belong_to_group matcher', 'root', 'root'
+  it_behaves_like 'support have_gid matcher', 'root', 0
+  it_behaves_like 'support have_uid matcher', 'root', 0
+  it_behaves_like 'support have_login_shell matcher', 'root', '/bin/bash'
+  it_behaves_like 'support have_home_directory matcher', 'root', '/root'
 
   it_behaves_like 'support be_zfs matcher', 'rpool'
   it_behaves_like 'support be_zfs.property matcher', 'rpool', { 'mountpoint' => '/rpool' }

data/spec/support/shared_matcher_examples.rb

@@ -322,6 +322,54 @@ shared_examples_for 'support belong_to_group matcher' do |user, group|
   end
 end
 
+shared_examples_for 'support have_gid matcher' do |group, gid|
+  describe 'have_gid' do
+    describe group do
+      it { should have_gid gid }
+    end
+
+    describe 'dummygroup' do
+      it { should_not have_gid 'invalid-gid' }
+    end
+  end
+end
+
+shared_examples_for 'support have_uid matcher' do |user, uid|
+  describe 'have_uid' do
+    describe user do
+      it { should have_uid uid }
+    end
+
+    describe 'dummyuser' do
+      it { should_not have_uid 'invalid-uid' }
+    end
+  end
+end
+
+shared_examples_for 'support have_login_shell matcher' do |user, path_to_shell|
+  describe 'have_login_shell' do
+    describe user do
+      it { should have_login_shell path_to_shell }
+    end
+
+    describe 'dummyuser' do
+      it { should_not have_login_shell 'invalid-login-shell' }
+    end
+  end
+end
+
+shared_examples_for 'support have_home_directory matcher' do |user, path_to_home|
+  describe 'have_home_directory' do
+    describe user do
+      it { should have_home_directory path_to_home }
+    end
+
+    describe 'dummyuser' do
+      it { should_not have_home_directory 'invalid-home-directory' }
+    end
+  end
+end
+
 shared_examples_for 'support have_iptables_rule matcher' do |rule|
   describe 'have_iptables_rule' do
     describe 'iptables' do

metadata

@@ -1,105 +1,104 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: serverspec
-version: !ruby/object:Gem::Version
-  version: 0.2.16
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 53
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 17
+  version: 0.2.17
 platform: ruby
-authors:
+authors: 
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-05-01 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !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:
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+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
@@ -153,11 +152,15 @@ files:
 - lib/serverspec/matchers/contain.rb
 - lib/serverspec/matchers/get_stdout.rb
 - lib/serverspec/matchers/have_cron_entry.rb
+- lib/serverspec/matchers/have_gid.rb
+- lib/serverspec/matchers/have_home_directory.rb
 - lib/serverspec/matchers/have_ipfilter_rule.rb
 - lib/serverspec/matchers/have_ipnat_rule.rb
 - lib/serverspec/matchers/have_iptables_rule.rb
+- lib/serverspec/matchers/have_login_shell.rb
 - lib/serverspec/matchers/have_svcprop.rb
 - lib/serverspec/matchers/have_svcprops.rb
+- lib/serverspec/matchers/have_uid.rb
 - lib/serverspec/matchers/return_exit_status.rb
 - lib/serverspec/matchers/return_stderr.rb
 - lib/serverspec/matchers/return_stdout.rb
@@ -175,32 +178,41 @@ 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.3.7
 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