serverspec 0.6.26 → 0.6.27

data/lib/serverspec/backend/exec.rb

@@ -68,11 +68,6 @@ module Serverspec
         ret[:exit_status] == 0
       end
 
-      def check_running_under_upstart(process)
-        ret = run_command(commands.check_running_under_upstart(process))
-        ret[:exit_status] == 0 && ret[:stdout] =~ /running/
-      end
-
       def check_monitored_by_monit(process)
         ret = run_command(commands.check_monitored_by_monit(process))
         return false unless ret[:stdout] != nil && ret[:exit_status] == 0

data/lib/serverspec/commands/base.rb

@@ -91,13 +91,17 @@ module Serverspec
       end
 
       def check_running_under_upstart(service)
-        "initctl status #{escape(service)}"
+        "initctl status #{escape(service)} | grep running"
       end
 
       def check_monitored_by_monit(service)
         "monit status"
       end
 
+      def check_monitored_by_god(service)
+        "god status #{escape(service)}"
+      end
+
       def check_process(process)
         "ps aux | grep -w -- #{escape(process)} | grep -qv grep"
       end

data/lib/serverspec/type/service.rb

@@ -21,9 +21,10 @@ module Serverspec
 
       def monitored_by?(monitor)
         check_method = "check_monitored_by_#{monitor}".to_sym
-        unless monitor && backend.respond_to?(check_method)
-          raise ArgumentError.new("`be_monitored_by` matcher doesn't support #{monitor}") 
+        unless monitor && commands.respond_to?(check_method)
+          raise ArgumentError.new("`be_monitored_by` matcher doesn't support #{monitor}")
         end
+
         backend.send(check_method, @name)
       end
 

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.6.26"
+  VERSION = "0.6.27"
 end

data/spec/darwin/service_spec.rb

@@ -34,6 +34,7 @@ end
 
 describe service('sshd') do
   it { should be_running.under('supervisor') }
+  its(:command) { should eq "supervisorctl status sshd | grep RUNNING" }
 end
 
 describe service('invalid-daemon') do
@@ -41,13 +42,8 @@ describe service('invalid-daemon') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd running\r\n" }
   it { should be_running.under('upstart') }
-end
-
-describe service('sshd') do
-  let(:stdout) { "sshd waiting\r\n" }
-  it { should_not be_running.under('upstart') }
+  its(:command) { should eq "initctl status sshd | grep running" }
 end
 
 describe service('invalid-daemon') do
@@ -77,6 +73,15 @@ describe service('invalid-daemon') do
   it { should_not be_monitored_by('monit') }
 end
 
+describe service('unicorn') do
+  it { should be_monitored_by('god') }
+  its(:command) { should eq "god status unicorn" }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_monitored_by('god') }
+end
+
 describe service('sshd') do
   it {
     expect {

data/spec/debian/service_spec.rb

@@ -36,6 +36,7 @@ end
 
 describe service('sshd') do
   it { should be_running.under('supervisor') }
+  its(:command) { should eq "supervisorctl status sshd | grep RUNNING" }
 end
 
 describe service('invalid-daemon') do
@@ -43,13 +44,8 @@ describe service('invalid-daemon') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd running\r\n" }
   it { should be_running.under('upstart') }
-end
-
-describe service('sshd') do
-  let(:stdout) { "sshd waiting\r\n" }
-  it { should_not be_running.under('upstart') }
+  its(:command) { should eq "initctl status sshd | grep running" }
 end
 
 describe service('invalid-daemon') do
@@ -79,6 +75,15 @@ describe service('invalid-daemon') do
   it { should_not be_monitored_by('monit') }
 end
 
+describe service('unicorn') do
+  it { should be_monitored_by('god') }
+  its(:command) { should eq "god status unicorn" }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_monitored_by('god') }
+end
+
 describe service('sshd') do
   it {
     expect {

data/spec/gentoo/service_spec.rb

@@ -36,6 +36,7 @@ end
 
 describe service('sshd') do
   it { should be_running.under('supervisor') }
+  its(:command) { should eq "supervisorctl status sshd | grep RUNNING" }
 end
 
 describe service('invalid-daemon') do
@@ -43,13 +44,8 @@ describe service('invalid-daemon') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd running\r\n" }
   it { should be_running.under('upstart') }
-end
-
-describe service('sshd') do
-  let(:stdout) { "sshd waiting\r\n" }
-  it { should_not be_running.under('upstart') }
+  its(:command) { should eq "initctl status sshd | grep running" }
 end
 
 describe service('invalid-daemon') do
@@ -79,6 +75,15 @@ describe service('invalid-daemon') do
   it { should_not be_monitored_by('monit') }
 end
 
+describe service('unicorn') do
+  it { should be_monitored_by('god') }
+  its(:command) { should eq "god status unicorn" }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_monitored_by('god') }
+end
+
 describe service('sshd') do
   it {
     expect {

data/spec/redhat/service_spec.rb

@@ -36,6 +36,7 @@ end
 
 describe service('sshd') do
   it { should be_running.under('supervisor') }
+  its(:command) { should eq "supervisorctl status sshd | grep RUNNING" }
 end
 
 describe service('invalid-daemon') do
@@ -43,13 +44,8 @@ describe service('invalid-daemon') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd running\r\n" }
   it { should be_running.under('upstart') }
-end
-
-describe service('sshd') do
-  let(:stdout) { "sshd waiting\r\n" }
-  it { should_not be_running.under('upstart') }
+  its(:command) { should eq "initctl status sshd | grep running" }
 end
 
 describe service('invalid-daemon') do
@@ -79,6 +75,15 @@ describe service('invalid-daemon') do
   it { should_not be_monitored_by('monit') }
 end
 
+describe service('unicorn') do
+  it { should be_monitored_by('god') }
+  its(:command) { should eq "god status unicorn" }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_monitored_by('god') }
+end
+
 describe service('sshd') do
   it {
     expect {

data/spec/solaris/service_spec.rb

@@ -36,6 +36,7 @@ end
 
 describe service('sshd') do
   it { should be_running.under('supervisor') }
+  its(:command) { should eq "supervisorctl status sshd | grep RUNNING" }
 end
 
 describe service('invalid-daemon') do
@@ -43,13 +44,8 @@ describe service('invalid-daemon') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd running\r\n" }
   it { should be_running.under('upstart') }
-end
-
-describe service('sshd') do
-  let(:stdout) { "sshd waiting\r\n" }
-  it { should_not be_running.under('upstart') }
+  its(:command) { should eq "initctl status sshd | grep running" }
 end
 
 describe service('invalid-daemon') do
@@ -79,6 +75,15 @@ describe service('invalid-daemon') do
   it { should_not be_monitored_by('monit') }
 end
 
+describe service('unicorn') do
+  it { should be_monitored_by('god') }
+  its(:command) { should eq "god status unicorn" }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_monitored_by('god') }
+end
+
 describe service('sshd') do
   it {
     expect {

data/spec/solaris11/service_spec.rb

@@ -36,6 +36,7 @@ end
 
 describe service('sshd') do
   it { should be_running.under('supervisor') }
+  its(:command) { should eq "supervisorctl status sshd | grep RUNNING" }
 end
 
 describe service('invalid-daemon') do
@@ -43,13 +44,8 @@ describe service('invalid-daemon') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd running\r\n" }
   it { should be_running.under('upstart') }
-end
-
-describe service('sshd') do
-  let(:stdout) { "sshd waiting\r\n" }
-  it { should_not be_running.under('upstart') }
+  its(:command) { should eq "initctl status sshd | grep running" }
 end
 
 describe service('invalid-daemon') do
@@ -79,6 +75,15 @@ describe service('invalid-daemon') do
   it { should_not be_monitored_by('monit') }
 end
 
+describe service('unicorn') do
+  it { should be_monitored_by('god') }
+  its(:command) { should eq "god status unicorn" }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_monitored_by('god') }
+end
+
 describe service('sshd') do
   it {
     expect {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.26
+  version: 0.6.27
   prerelease: 
 platform: ruby
 authors: