serverspec 0.3.2 → 0.4.0

data/spec/redhat/matchers_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-describe 'Serverspec matchers of Red Hat family', :os => :redhat do
+include Serverspec::Helper::RedHat
+
+describe 'Serverspec matchers of Red Hat family' do
   it_behaves_like 'support be_enabled matcher', 'sshd'
   it_behaves_like 'support be_installed matcher', 'openssh'
   it_behaves_like 'support be_running matcher', 'sshd'

data/spec/redhat/service_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+include Serverspec::Helper::RedHat
+
+describe 'Serverspec service matchers of Red Hat family' do
+  it_behaves_like 'support service enabled matcher', 'sshd'
+  it_behaves_like 'support service running matcher', 'sshd'
+  it_behaves_like 'support service running under supervisor matcher', 'sshd'
+  it_behaves_like 'support service running under unimplemented matcher', 'sshd'
+end

data/spec/solaris/commands_spec.rb

@@ -1,26 +1,28 @@
 require 'spec_helper'
 
-describe 'check_enabled', :os => :solaris do
+include Serverspec::Helper::Solaris
+
+describe 'check_enabled' do
   subject { commands.check_enabled('httpd') }
   it { should eq "svcs -l httpd 2> /dev/null | grep 'enabled      true'" }
 end
 
-describe 'check_file', :os => :solaris do
+describe 'check_file' do
   subject { commands.check_file('/etc/passwd') }
   it { should eq 'test -f /etc/passwd' }
 end
 
-describe 'check_mounted', :os => :solaris  do
+describe 'check_mounted'  do
   subject { commands.check_mounted('/') }
   it { should eq "mount | grep -w -- on\\ /" }
 end
 
-describe 'check_routing_table', :os => :solaris do
+describe 'check_routing_table' do
   subject { commands.check_routing_table('192.168.100.0/24') }
   it { should eq "ip route | grep -E '^192.168.100.0/24 |^default '" }
 end
 
-describe 'check_reachable', :os => :solaris  do
+describe 'check_reachable'  do
   context "connect with name from /etc/services to localhost" do
     subject { commands.check_reachable('localhost', 'ssh', 'tcp', 1) }
     it { should eq "nc -vvvvzt localhost ssh -w 1" }
@@ -35,7 +37,7 @@ describe 'check_reachable', :os => :solaris  do
   end
 end
 
-describe 'check_resolvable', :os => :solaris  do
+describe 'check_resolvable'  do
   context "resolve localhost by hosts" do
     subject { commands.check_resolvable('localhost', 'hosts') }
     it { should eq "grep -w -- localhost /etc/hosts" }
@@ -50,52 +52,52 @@ describe 'check_resolvable', :os => :solaris  do
   end
 end
 
-describe 'check_directory', :os => :solaris do
+describe 'check_directory' do
   subject { commands.check_directory('/var/log') }
   it { should eq 'test -d /var/log' }
 end
 
-describe 'check_user', :os => :solaris do
+describe 'check_user' do
   subject { commands.check_user('root') }
   it { should eq 'id root' }
 end
 
-describe 'check_group', :os => :solaris do
+describe 'check_group' do
   subject { commands.check_group('wheel') }
   it { should eq 'getent group | grep -wq -- wheel' }
 end
 
-describe 'check_installed', :os => :solaris do
+describe 'check_installed' do
   subject { commands.check_installed('httpd') }
   it { should eq 'pkg list -H httpd 2> /dev/null' }
 end
 
-describe 'check_listening', :os => :solaris do
+describe 'check_listening' do
   subject { commands.check_listening(80) }
   it { should eq "netstat -an 2> /dev/null | egrep 'LISTEN|Idle' | grep -- .80\\ " }
 end
 
-describe 'check_running', :os => :solaris do
+describe 'check_running' do
   subject { commands.check_running('httpd') }
   it { should eq "svcs -l httpd status 2> /dev/null |grep 'state        online'" }
 end
 
-describe 'check_running_under_supervisor', :os => :solaris do
+describe 'check_running_under_supervisor' do
   subject { commands.check_running_under_supervisor('httpd') }
   it { should eq 'supervisorctl status httpd' }
 end
 
-describe 'check_process', :os => :solaris do
+describe 'check_process' do
   subject { commands.check_process('httpd') }
   it { should eq 'ps aux | grep -w -- httpd | grep -qv grep' }
 end
 
-describe 'check_file_contain', :os => :solaris do
+describe 'check_file_contain' do
   subject { commands.check_file_contain('/etc/passwd', 'root') }
   it { should eq "grep -q -- root /etc/passwd" }
 end
 
-describe 'check_file_contain_within', :os => :solaris do
+describe 'check_file_contain_within' 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 /dev/stdin" }
@@ -117,67 +119,67 @@ describe 'check_file_contain_within', :os => :solaris do
   end
 end
 
-describe 'check_file_md5checksum', :os => :solaris do
+describe 'check_file_md5checksum' do
   subject { commands.check_file_md5checksum('/etc/passwd', '96c8c50f81a29965f7af6de371ab4250') }
   it { should eq "md5sum /etc/passwd | grep -iw -- ^96c8c50f81a29965f7af6de371ab4250" }
 end
 
-describe 'check_mode', :os => :solaris do
+describe 'check_mode' do
   subject { commands.check_mode('/etc/sudoers', 440) }
   it { should eq 'stat -c %a /etc/sudoers | grep -- \\^440\\$' }
 end
 
-describe 'check_owner', :os => :solaris do
+describe 'check_owner' do
   subject { commands.check_owner('/etc/passwd', 'root') }
   it { should eq 'stat -c %U /etc/passwd | grep -- \\^root\\$' }
 end
 
-describe 'check_grouped', :os => :solaris do
+describe 'check_grouped' do
   subject { commands.check_grouped('/etc/passwd', 'wheel') }
   it { should eq 'stat -c %G /etc/passwd | grep -- \\^wheel\\$' }
 end
 
-describe 'check_cron_entry', :os => :solaris do
+describe 'check_cron_entry' do
   subject { commands.check_cron_entry('root', '* * * * * /usr/local/bin/batch.sh') }
   it { should eq 'crontab -l root | grep -- \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ \\\\\\*\\ /usr/local/bin/batch.sh' }
 end
 
-describe 'check_link', :os => :solaris do
+describe 'check_link' do
   subject { commands.check_link('/etc/system-release', '/etc/redhat-release') }
   it { should eq 'stat -c %N /etc/system-release | grep -- /etc/redhat-release' }
 end
 
-describe 'check_installed_by_gem', :os => :solaris do
+describe 'check_installed_by_gem' do
   subject { commands.check_installed_by_gem('jekyll') }
   it { should eq 'gem list --local | grep -- \\^jekyll\\ ' }
 end
 
-describe 'check_belonging_group', :os => :solaris do
+describe 'check_belonging_group' do
   subject { commands.check_belonging_group('root', 'wheel') }
   it { should eq "id -Gn root | grep -- wheel" }
 end
 
-describe 'have_gid', :os => :solaris do
+describe 'have_gid' do
   subject { commands.check_gid('root', 0) }
   it { should eq "getent group | grep -- \\^root: | cut -f 3 -d ':' | grep -w -- 0" }
 end
 
-describe 'have_uid', :os => :solaris do
+describe 'have_uid' do
   subject { commands.check_uid('root', 0) }
   it { should eq "id root | grep -- \\^uid\\=0\\(" }
 end
 
-describe 'have_login_shell', :os => :solaris do
+describe 'have_login_shell' do
   subject { commands.check_login_shell('root', '/bin/bash') }
   it { should eq "getent passwd root | cut -f 7 -d ':' | grep -w -- /bin/bash" }
 end
 
-describe 'have_home_directory', :os => :solaris do
+describe 'have_home_directory' do
   subject { commands.check_home_directory('root', '/root') }
   it { should eq "getent passwd root | cut -f 6 -d ':' | grep -w -- /root" }
 end
 
-describe 'have_authorized_key', :os => :solaris do
+describe 'have_authorized_key' do
   key = "ssh-rsa ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGH"
   escaped_key = key.gsub(/ /, '\ ')
 
@@ -195,7 +197,7 @@ describe 'have_authorized_key', :os => :solaris do
   end
 end
 
-describe 'check_zfs', :os => :solaris do
+describe 'check_zfs' do
   context 'check without properties' do
     subject { commands.check_zfs('rpool') }
     it { should eq "/sbin/zfs list -H rpool" }
@@ -212,27 +214,27 @@ describe 'check_zfs', :os => :solaris do
   end
 end
 
-describe 'get_mode', :os => :solaris do
+describe 'get_mode' do
   subject { commands.get_mode('/dev') }
   it { should eq 'stat -c %a /dev' }
 end
 
-describe 'check_ip_filter_rule', :os => :solaris do
+describe 'check_ip_filter_rule' do
   subject { commands.check_ipfilter_rule('pass in quick on lo0 all') }
   it { should eq "/sbin/ipfstat -io 2> /dev/null | grep -- pass\\ in\\ quick\\ on\\ lo0\\ all" }
 end
 
-describe 'check_ipnat_rule', :os => :solaris do
+describe 'check_ipnat_rule' do
   subject { commands.check_ipnat_rule('map net1 192.168.0.0/24 -> 0.0.0.0/32') }
   it { should eq "/sbin/ipnat -l 2> /dev/null | grep -- \\^map\\ net1\\ 192.168.0.0/24\\ -\\>\\ 0.0.0.0/32\\$" }
 end
 
-describe 'check_svcprop', :os => :solaris do
+describe 'check_svcprop' do
   subject { commands.check_svcprop('svc:/network/http:apache22', 'httpd/enable_64bit','false') }
   it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$" }
 end
 
-describe 'check_svcprops', :os => :solaris do
+describe 'check_svcprops' do
   subject {
     commands.check_svcprops('svc:/network/http:apache22', {
       'httpd/enable_64bit' => 'false',
@@ -242,7 +244,7 @@ describe 'check_svcprops', :os => :solaris do
   it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$ && svcprop -p httpd/server_type svc:/network/http:apache22 | grep -- \\^worker\\$" }
 end
 
-describe 'check_access_by_user', :os => :solaris do
+describe 'check_access_by_user' do
   context 'read access' do
     subject {commands.check_access_by_user '/tmp/something', 'dummyuser1', 'r'}
     it { should eq 'su dummyuser1 -c "/usr/bin/test -r /tmp/something"' }

data/spec/solaris/matchers_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-describe 'Serverspec matchers of Solaris family', :os => :solaris do
+include Serverspec::Helper::Solaris
+
+describe 'Serverspec matchers of Solaris family' do
   it_behaves_like 'support be_enabled matcher', 'svc:/network/ssh:default'
   it_behaves_like 'support be_installed matcher', 'service/network/ssh'
   it_behaves_like 'support be_running matcher', 'svc:/network/ssh:default'

data/spec/solaris/service_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Solaris
+
+describe 'Serverspec service matchers of Red Hat family' do
+  it_behaves_like 'support service enabled matcher', 'sshd'
+  it_behaves_like 'support service running matcher', 'sshd'
+  it_behaves_like 'support service running under supervisor matcher', 'sshd'
+  it_behaves_like 'support service running under unimplemented matcher', 'sshd'
+end

data/spec/support/shared_service_examples.rb

@@ -0,0 +1,72 @@
+shared_examples_for 'support service enabled matcher' do |valid_service|
+  describe 'be_enabled' do
+    describe service(valid_service) do
+      it { should be_enabled }
+    end
+
+    describe service('invalid-service') do
+      it { should_not be_enabled }
+    end
+  end
+end
+
+shared_examples_for 'support service running matcher' do |valid_service|
+  describe 'be_running' do
+    describe service(valid_service) do
+      it { should be_running }
+    end
+
+    describe service('invalid-daemon') do
+      it { should_not be_running }
+    end
+
+    describe service(valid_service) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "#{valid_service} is stopped\r\n"
+        end
+      end
+      it { should be_running }
+    end
+  end
+end
+
+shared_examples_for 'support service running under supervisor matcher' do |valid_service|
+  describe 'be_running.under("supervisor")' do
+    describe service(valid_service) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "#{valid_service} RUNNING\r\n"
+        end
+      end
+
+      it { should be_running.under('supervisor') }
+    end
+
+    describe service(valid_service) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "#{valid_service} STOPPED\r\n"
+        end
+      end
+
+      it { should_not be_running.under('supervisor') }
+    end
+
+    describe service('invalid-daemon') do
+      it { should_not be_running.under('supervisor') }
+    end
+  end
+end
+
+shared_examples_for 'support service running under unimplemented matcher' do |valid_service|
+  describe 'be_running.under("not implemented")' do
+    describe service(valid_service) do
+      it {
+        expect {
+          should be_running.under('not implemented')
+        }.to raise_error(ArgumentError, %r/\A`be_running` matcher doesn\'t support/)
+      }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - lib/serverspec/helper/redhat.rb
 - lib/serverspec/helper/solaris.rb
 - lib/serverspec/helper/ssh.rb
+- lib/serverspec/helper/type.rb
 - lib/serverspec/matchers.rb
 - lib/serverspec/matchers/be_default_gateway.rb
 - lib/serverspec/matchers/be_directory.rb
@@ -179,21 +180,28 @@ files:
 - lib/serverspec/matchers/return_stdout.rb
 - lib/serverspec/setup.rb
 - lib/serverspec/subject.rb
+- lib/serverspec/type/service.rb
 - lib/serverspec/version.rb
 - serverspec.gemspec
 - spec/darwin/commands_spec.rb
 - spec/darwin/matchers_spec.rb
+- spec/darwin/service_spec.rb
 - spec/debian/commands_spec.rb
 - spec/debian/matchers_spec.rb
+- spec/debian/service_spec.rb
 - spec/gentoo/commands_spec.rb
 - spec/gentoo/matchers_spec.rb
+- spec/gentoo/service_spec.rb
 - spec/helpers/attributes_spec.rb
 - spec/redhat/commands_spec.rb
 - spec/redhat/matchers_spec.rb
+- spec/redhat/service_spec.rb
 - spec/solaris/commands_spec.rb
 - spec/solaris/matchers_spec.rb
+- spec/solaris/service_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_matcher_examples.rb
+- spec/support/shared_service_examples.rb
 homepage: http://serverspec.org/
 licenses:
 - MIT
@@ -222,14 +230,20 @@ summary: RSpec tests for your servers provisioned by Puppet, Chef or anything el
 test_files:
 - spec/darwin/commands_spec.rb
 - spec/darwin/matchers_spec.rb
+- spec/darwin/service_spec.rb
 - spec/debian/commands_spec.rb
 - spec/debian/matchers_spec.rb
+- spec/debian/service_spec.rb
 - spec/gentoo/commands_spec.rb
 - spec/gentoo/matchers_spec.rb
+- spec/gentoo/service_spec.rb
 - spec/helpers/attributes_spec.rb
 - spec/redhat/commands_spec.rb
 - spec/redhat/matchers_spec.rb
+- spec/redhat/service_spec.rb
 - spec/solaris/commands_spec.rb
 - spec/solaris/matchers_spec.rb
+- spec/solaris/service_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_matcher_examples.rb
+- spec/support/shared_service_examples.rb