serverspec 0.6.25 → 0.6.26

data/lib/serverspec.rb

@@ -50,22 +50,6 @@ RSpec.configure do |c|
 end
 
 module RSpec
-  module Matchers
-    module DSL
-      class Matcher
-        def failure_message_for_should(&block)
-          message =  "#{example.metadata[:command]}\n"
-          message += "#{example.metadata[:stdout]}"
-          message
-        end
-        def failure_message_for_should_not(&block)
-          message =  "#{example.metadata[:command]}\n"
-          message += "#{example.metadata[:stdout]}"
-          message
-        end
-      end
-    end
-  end
   module Core
     module Formatters
       class BaseTextFormatter < BaseFormatter

data/lib/serverspec/backend/exec.rb

@@ -68,11 +68,6 @@ module Serverspec
         ret[:exit_status] == 0
       end
 
-      def check_running_under_supervisor(process)
-        ret = run_command(commands.check_running_under_supervisor(process))
-        ret[:exit_status] == 0 && ret[:stdout] =~ /RUNNING/
-      end
-
       def check_running_under_upstart(process)
         ret = run_command(commands.check_running_under_upstart(process))
         ret[:exit_status] == 0 && ret[:stdout] =~ /running/

data/lib/serverspec/commands/base.rb

@@ -87,7 +87,7 @@ module Serverspec
       end
 
       def check_running_under_supervisor(service)
-        "supervisorctl status #{escape(service)}"
+        "supervisorctl status #{escape(service)} | grep RUNNING"
       end
 
       def check_running_under_upstart(service)

data/lib/serverspec/type/service.rb

@@ -9,7 +9,7 @@ module Serverspec
         if under
           check_method = "check_running_under_#{under}".to_sym
 
-          unless backend.respond_to?(check_method)
+          unless commands.respond_to?(check_method)
             raise ArgumentError.new("`be_running` matcher doesn't support #{under}")
           end
 

data/lib/serverspec/version.rb

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

data/spec/darwin/service_spec.rb

@@ -33,15 +33,9 @@ describe service('sshd') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd RUNNING\r\n" }
   it { should be_running.under('supervisor') }
 end
 
-describe service('sshd') do
-  let(:stdout) { "sshd STOPPED\r\n" }
-  it { should_not be_running.under('supervisor') }
-end
-
 describe service('invalid-daemon') do
   it { should_not be_running.under('supervisor') }
 end

data/spec/debian/service_spec.rb

@@ -35,15 +35,9 @@ describe service('sshd') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd RUNNING\r\n" }
   it { should be_running.under('supervisor') }
 end
 
-describe service('sshd') do
-  let(:stdout) { "sshd STOPPED\r\n" }
-  it { should_not be_running.under('supervisor') }
-end
-
 describe service('invalid-daemon') do
   it { should_not be_running.under('supervisor') }
 end

data/spec/gentoo/service_spec.rb

@@ -35,15 +35,9 @@ describe service('sshd') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd RUNNING\r\n" }
   it { should be_running.under('supervisor') }
 end
 
-describe service('sshd') do
-  let(:stdout) { "sshd STOPPED\r\n" }
-  it { should_not be_running.under('supervisor') }
-end
-
 describe service('invalid-daemon') do
   it { should_not be_running.under('supervisor') }
 end

data/spec/redhat/service_spec.rb

@@ -35,15 +35,9 @@ describe service('sshd') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd RUNNING\r\n" }
   it { should be_running.under('supervisor') }
 end
 
-describe service('sshd') do
-  let(:stdout) { "sshd STOPPED\r\n" }
-  it { should_not be_running.under('supervisor') }
-end
-
 describe service('invalid-daemon') do
   it { should_not be_running.under('supervisor') }
 end

data/spec/solaris/service_spec.rb

@@ -35,15 +35,9 @@ describe service('sshd') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd RUNNING\r\n" }
   it { should be_running.under('supervisor') }
 end
 
-describe service('sshd') do
-  let(:stdout) { "sshd STOPPED\r\n" }
-  it { should_not be_running.under('supervisor') }
-end
-
 describe service('invalid-daemon') do
   it { should_not be_running.under('supervisor') }
 end

data/spec/solaris11/service_spec.rb

@@ -35,15 +35,9 @@ describe service('sshd') do
 end
 
 describe service('sshd') do
-  let(:stdout) { "sshd RUNNING\r\n" }
   it { should be_running.under('supervisor') }
 end
 
-describe service('sshd') do
-  let(:stdout) { "sshd STOPPED\r\n" }
-  it { should_not be_running.under('supervisor') }
-end
-
 describe service('invalid-daemon') do
   it { should_not be_running.under('supervisor') }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.6.25
+  version: 0.6.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh