serverspec 0.6.13 → 0.6.15

data/lib/serverspec/backend/exec.rb

@@ -60,16 +60,16 @@ module Serverspec
         check_zero(meth, *args)
       end
 
-      def check_running(process, level)
-        ret = run_command(commands.check_running(process, level))
+      def check_running(process)
+        ret = run_command(commands.check_running(process))
         if ret[:exit_status] == 1 || ret[:stdout] =~ /stopped/
           ret = run_command(commands.check_process(process))
         end
         ret[:exit_status] == 0
       end
 
-      def check_running_under_supervisor(process, level)
-        ret = run_command(commands.check_running_under_supervisor(process, level))
+      def check_running_under_supervisor(process)
+        ret = run_command(commands.check_running_under_supervisor(process))
         ret[:exit_status] == 0 && ret[:stdout] =~ /RUNNING/
       end
 

data/lib/serverspec/commands/base.rb

@@ -77,11 +77,11 @@ module Serverspec
         "netstat -tunl | grep -- #{escape(regexp)}"
       end
 
-      def check_running(service, level=3)
+      def check_running(service)
         "service #{escape(service)} status"
       end
 
-      def check_running_under_supervisor(service, level=3)
+      def check_running_under_supervisor(service)
         "supervisorctl status #{escape(service)}"
       end
 

data/lib/serverspec/commands/debian.rb

@@ -11,7 +11,7 @@ module Serverspec
         "dpkg -s #{escaped_package} && ! dpkg -s #{escaped_package} | grep -E '^Status: .+ not-installed$'"
       end
 
-      def check_running(service, level=3)
+      def check_running(service)
         # This is compatible with Debian >Jaunty and Ubuntu derivatives
         "service #{escape(service)} status | grep 'running'"
       end

data/lib/serverspec/commands/gentoo.rb

@@ -1,7 +1,7 @@
 module Serverspec
   module Commands
     class Gentoo < Linux
-      def check_enabled(service)
+      def check_enabled(service, level=3)
         regexp = "^\\s*#{service}\\s*|\\s*\\(boot\\|default\\)"
         "rc-update show | grep -- #{escape(regexp)}"
       end
@@ -10,7 +10,7 @@ module Serverspec
         "eix #{escape(package)} --installed"
       end
 
-      def check_running(service, level=3)
+      def check_running(service)
         "/etc/init.d/#{escape(service)} status"
       end
     end

data/lib/serverspec/commands/solaris.rb

@@ -18,7 +18,7 @@ module Serverspec
         "netstat -an 2> /dev/null | egrep 'LISTEN|Idle' | grep -- #{escape(regexp)}"
       end
 
-      def check_running(service, level=3)
+      def check_running(service)
         "svcs -l #{escape(service)} status 2> /dev/null |grep 'state        online'"
       end
 

data/lib/serverspec/matchers.rb

@@ -14,6 +14,7 @@ require 'serverspec/matchers/be_reachable'
 require 'serverspec/matchers/be_installed'
 
 # service
+require 'serverspec/matchers/be_enabled'
 require 'serverspec/matchers/be_running'
 
 # user

data/lib/serverspec/matchers/be_enabled.rb

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

data/lib/serverspec/matchers/be_running.rb

@@ -1,13 +1,9 @@
 RSpec::Matchers.define :be_running do
   match do |process|
-    process.running?(@under, @level)
+    process.running?(@under)
   end
 
   chain :under do |under|
     @under = under
   end
-  
-  chain :with_level do |level|
-    @level = level
-  end
 end

data/lib/serverspec/type/service.rb

@@ -1,11 +1,11 @@
 module Serverspec
   module Type
     class Service < Base
-      def enabled?
-        backend.check_enabled(@name)
+      def enabled?(level=3)
+        backend.check_enabled(@name, level)
       end
 
-      def running?(under, level=3)
+      def running?(under)
         if under
           check_method = "check_running_under_#{under}".to_sym
 
@@ -13,9 +13,9 @@ module Serverspec
             raise ArgumentError.new("`be_running` matcher doesn't support #{@under}")
           end
 
-          backend.send(check_method, @name, level)
+          backend.send(check_method, @name)
         else
-          backend.check_running(@name, level)
+          backend.check_running(@name)
         end
       end
 

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.6.13"
+  VERSION = "0.6.15"
 end

data/spec/debian/service_spec.rb

@@ -4,6 +4,7 @@ include Serverspec::Helper::Debian
 
 describe 'Serverspec service matchers of Red Hat family' do
   it_behaves_like 'support service enabled matcher', 'sshd'
+  it_behaves_like 'support service enabled with level matcher', 'sshd', 3
   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'

data/spec/gentoo/service_spec.rb

@@ -2,9 +2,10 @@ require 'spec_helper'
 
 include Serverspec::Helper::Gentoo
 
-describe 'Serverspec service matchers of Red Hat family' do
+describe 'Serverspec service matchers of Gentoo family' do
+  it_behaves_like 'support service enabled matcher', 'sshd'
+  it_behaves_like 'support service enabled with level matcher', 'sshd', 3
   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'
-  it_behaves_like 'support service enabled matcher', 'sshd'
 end

data/spec/redhat/commands_spec.rb

@@ -68,6 +68,11 @@ describe 'check_enabled' do
   it { should eq 'chkconfig --list httpd | grep 3:on' }
 end
 
+describe 'check_enabled with level 4' do
+  subject { commands.check_enabled('httpd', 4) }
+  it { should eq 'chkconfig --list httpd | grep 4:on' }
+end
+
 describe 'check_yumrepo' do
   subject { commands.check_yumrepo('epel') }
   it { should eq 'yum repolist all -C | grep ^epel' }

data/spec/redhat/service_spec.rb

@@ -4,6 +4,7 @@ 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 enabled with level matcher', 'sshd', 3
   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'

data/spec/solaris/service_spec.rb

@@ -4,6 +4,7 @@ include Serverspec::Helper::Solaris
 
 describe 'Serverspec service matchers of Solaris' do
   it_behaves_like 'support service enabled matcher', 'sshd'
+  it_behaves_like 'support service enabled with level matcher', 'sshd', 3
   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'

data/spec/support/shared_commands_examples.rb

@@ -104,15 +104,7 @@ shared_examples_for 'support command check_file_md5checksum' do |file, md5sum|
 end
 
 shared_examples_for 'support command check_running_under_supervisor' do |service|
-  subject { commands.check_running_under_supervisor(service, 3) }
-  it { should eq "supervisorctl status #{service}" }
-end
-
-shared_examples_for 'support command check_running_under_supervisor_with_level' do |service|
-  subject { commands.check_running_under_supervisor(service, 3) }
-  it { should eq "supervisorctl status #{service}" }
-  
-  subject { commands.check_running_under_supervisor(service, 3) }
+  subject { commands.check_running_under_supervisor(service) }
   it { should eq "supervisorctl status #{service}" }
 end
 

data/spec/support/shared_service_examples.rb

@@ -10,6 +10,18 @@ shared_examples_for 'support service enabled matcher' do |valid_service|
   end
 end
 
+shared_examples_for 'support service enabled with level matcher' do |valid_service, level|
+  describe 'be_enabled' do
+    describe service(valid_service) do
+      it { should be_enabled.with_level(level) }
+    end
+
+    describe service('invalid-service') do
+      it { should_not be_enabled.with_level(level) }
+    end
+  end
+end
+
 shared_examples_for 'support service running matcher' do |valid_service|
   describe 'be_running' do
     describe service(valid_service) do
@@ -56,48 +68,3 @@ shared_examples_for 'support service running under unimplemented matcher' do |va
     end
   end
 end
-
-shared_examples_for 'support service running with runlevel' do |valid_service|
-  describe 'be_running.with_level(3)' 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.with_level(3) }
-      it { should_not be_running.with_level(5) }
-    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.with_level(3) }
-    end
-
-    describe service('invalid-daemon') do
-      it { should_not be_running.with_level(3) }
-    end
-  end
-end
-
-shared_examples_for 'support service running under supervisor matcher with runlevel' do |valid_service|
-  describe 'be_running.under("supervisor").with_level(3)' 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').with_level(3) }
-      it { should_not be_running.under('supervisor').with_level(5) }
-    end
-
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.15
   prerelease: 
 platform: ruby
 authors:
@@ -167,6 +167,7 @@ files:
 - lib/serverspec/helper/ssh.rb
 - lib/serverspec/helper/type.rb
 - lib/serverspec/matchers.rb
+- lib/serverspec/matchers/be_enabled.rb
 - lib/serverspec/matchers/be_executable.rb
 - lib/serverspec/matchers/be_installed.rb
 - lib/serverspec/matchers/be_mounted.rb