serverspec 0.2.11 → 0.2.12

data/lib/serverspec/backend/exec.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module Serverspec
   module Backend
     class Exec
@@ -10,16 +12,22 @@ module Serverspec
       end
 
       def do_check(cmd, opts={})
-        stdout = `#{cmd} 2>&1`
         # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
         #stdout, stderr, status = Open3.capture3(cmd)
-        { :stdout => stdout, :stderr => nil,
-          :exit_code => $?, :exit_signal => nil }
+        # So get exit status with `command`
+        `#{cmd} 2>&1`
+        ret = { :exit_status => $?, :exit_signal => nil }
+
+        # Get stdout and stderr
+        stdin, stdout, stderr = Open3.popen3(cmd)
+        ret[:stdout] = stdout.read
+        ret[:stderr] = stderr.read
+        ret
       end
 
       def check_zero(cmd, *args)
         ret = do_check(commands.send(cmd, *args))
-        ret[:exit_code] == 0
+        ret[:exit_status] == 0
       end
 
       # Default action is to call check_zero with args
@@ -31,7 +39,7 @@ module Serverspec
 
       def check_installed_by_gem(example, package, version)
         ret = do_check(commands.check_installed_by_gem(package))
-        res = ret[:exit_code] == 0
+        res = ret[:exit_status] == 0
         if res && version
           res = false if not ret[:stdout].match(/\(#{version}\)/)
         end
@@ -40,15 +48,15 @@ module Serverspec
 
       def check_running(example, process)
         ret = do_check(commands.check_running(process))
-        if ret[:exit_code] == 1 || ret[:stdout] =~ /stopped/
+        if ret[:exit_status] == 1 || ret[:stdout] =~ /stopped/
           ret = do_check(commands.check_process(process))
         end
-        ret[:exit_code] == 0
+        ret[:exit_status] == 0
       end
 
       def check_running_under_supervisor(example, process)
         ret = do_check(commands.check_running_under_supervisor(process))
-        ret[:exit_code] == 0 && ret[:stdout] =~ /RUNNING/
+        ret[:exit_status] == 0 && ret[:stdout] =~ /RUNNING/
       end
 
       def check_readable(example, file, by_whom)
@@ -100,11 +108,11 @@ module Serverspec
       end
 
       def check_os
-        if do_check('ls /etc/redhat-release')[:exit_code] == 0
+        if do_check('ls /etc/redhat-release')[:exit_status] == 0
           'RedHat'
-        elsif do_check('ls /etc/debian_version')[:exit_code] == 0
+        elsif do_check('ls /etc/debian_version')[:exit_status] == 0
           'Debian'
-        elsif do_check('ls /etc/gentoo-release')[:exit_code] == 0
+        elsif do_check('ls /etc/gentoo-release')[:exit_status] == 0
           'Gentoo'
         elsif do_check('uname -s')[:stdout] =~ /SunOS/i
           'Solaris'

data/lib/serverspec/backend/ssh.rb

@@ -12,7 +12,7 @@ module Serverspec
       def ssh_exec!(command)
         stdout_data = ''
         stderr_data = ''
-        exit_code   = nil
+        exit_status   = nil
         exit_signal = nil
 
         ssh = RSpec.configuration.ssh
@@ -35,7 +35,7 @@ module Serverspec
             end
 
             channel.on_request("exit-status") do |ch, data|
-              exit_code = data.read_long
+              exit_status = data.read_long
             end
 
             channel.on_request("exit-signal") do |ch, data|
@@ -44,7 +44,7 @@ module Serverspec
           end
         end
         ssh.loop
-        { :stdout => stdout_data, :stderr => stderr_data, :exit_code => exit_code, :exit_signal => exit_signal }
+        { :stdout => stdout_data, :stderr => stderr_data, :exit_status => exit_status, :exit_signal => exit_signal }
       end
     end
   end

data/lib/serverspec/matchers/contain.rb

@@ -6,7 +6,7 @@ RSpec::Matchers.define :contain do |pattern|
       cmd = backend.commands.check_file_contain_within(file, pattern, @from, @to)
     end
     ret = backend.do_check(cmd)
-    ret[:exit_code] == 0
+    ret[:exit_status] == 0
   end
   # for contain(pattern).from(/A/).to(/B/)
   chain :from do |from|

data/lib/serverspec/matchers/return_exit_status.rb

@@ -0,0 +1,6 @@
+RSpec::Matchers.define :return_exit_status do |status|
+  match do |command|
+    ret = backend.do_check(command)
+    ret[:exit_status].to_i == status
+  end
+end

data/lib/serverspec/matchers/return_stderr.rb

@@ -0,0 +1,10 @@
+RSpec::Matchers.define :return_stderr do |content|
+  match do |command|
+    ret = backend.do_check(command)
+    if content.instance_of?(Regexp)
+      ret[:stderr] =~ content
+    else
+      ret[:stderr].strip == content
+    end
+  end
+end

data/lib/serverspec/matchers/return_stdout.rb

@@ -0,0 +1,10 @@
+RSpec::Matchers.define :return_stdout do |content|
+  match do |command|
+    ret = backend.do_check(command)
+    if content.instance_of?(Regexp)
+      ret[:stdout] =~ content
+    else
+      ret[:stdout].strip == content
+    end
+  end
+end

data/lib/serverspec/matchers.rb

@@ -24,3 +24,6 @@ require 'serverspec/matchers/have_ipfilter_rule'
 require 'serverspec/matchers/have_ipnat_rule'
 require 'serverspec/matchers/have_svcprop'
 require 'serverspec/matchers/have_svcprops'
+require 'serverspec/matchers/return_exit_status'
+require 'serverspec/matchers/return_stdout'
+require 'serverspec/matchers/return_stderr'

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

data/spec/debian/matchers_spec.rb

@@ -51,4 +51,12 @@ describe 'Serverspec matchers of Debian family', :os => :debian do
   it_behaves_like 'support be_executable_by_owner matcher', '/dev'
   it_behaves_like 'support be_executable_by_group matcher', '/dev'
   it_behaves_like 'support be_executable_by_others matcher', '/dev'
+
+  it_behaves_like 'support return_exit_status matcher', 'ls /tmp', 0
+
+  it_behaves_like 'support return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
 end

data/spec/gentoo/matchers_spec.rb

@@ -52,4 +52,12 @@ describe 'Serverspec matchers of Gentoo family', :os => :gentoo do
   it_behaves_like 'support be_executable_by_owner matcher', '/dev'
   it_behaves_like 'support be_executable_by_group matcher', '/dev'
   it_behaves_like 'support be_executable_by_others matcher', '/dev'
+
+  it_behaves_like 'support return_exit_status matcher', 'ls /tmp', 0
+
+  it_behaves_like 'support return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
 end

data/spec/redhat/matchers_spec.rb

@@ -53,4 +53,12 @@ describe 'Serverspec matchers of Red Hat family', :os => :redhat do
   it_behaves_like 'support be_executable_by_owner matcher', '/dev'
   it_behaves_like 'support be_executable_by_group matcher', '/dev'
   it_behaves_like 'support be_executable_by_others matcher', '/dev'
+
+  it_behaves_like 'support return_exit_status matcher', 'ls /tmp', 0
+
+  it_behaves_like 'support return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
 end

data/spec/solaris/matchers_spec.rb

@@ -58,4 +58,12 @@ describe 'Serverspec matchers of Solaris family', :os => :solaris do
 
   it_behaves_like 'support have_svcprop.with_value matcher', 'svc:/network/http:apache22', 'httpd/server_type', 'worker'
   it_behaves_like 'support have_svcprops matcher', 'svc:/network/http:apache22', {'httpd/enable_64bit' => 'false', 'httpd/server_type' => 'worker' }
+
+  it_behaves_like 'support return_exit_status matcher', 'ls /tmp', 0
+
+  it_behaves_like 'support return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
 end

data/spec/spec_helper.rb

@@ -10,9 +10,19 @@ module Serverspec
     class Ssh
       def do_check(cmd)
         if cmd =~ /invalid/
-          { :stdout => '', :stderr => '', :exit_code => 1, :exit_signal => nil }
+          {
+            :stdout      => ::RSpec.configuration.stdout,
+            :stderr      => ::RSpec.configuration.stderr,
+            :exit_status => 1,
+            :exit_signal => nil
+          }
         else
-          { :stdout => ::RSpec.configuration.stdout, :stderr => '', :exit_code => 0, :exit_signal => nil }
+          {
+            :stdout      => ::RSpec.configuration.stdout,
+            :stderr      => ::RSpec.configuration.stderr,
+            :exit_status => 0,
+            :exit_signal => nil
+          }
         end
       end
     end
@@ -21,4 +31,5 @@ end
 
 RSpec.configure do |c|
   c.add_setting :stdout, :default => ''
+  c.add_setting :stderr, :default => ''
 end

data/spec/support/shared_matcher_examples.rb

@@ -679,3 +679,112 @@ shared_examples_for 'support have_svcprops matcher' do |svc, property|
     end
   end
 end
+
+shared_examples_for 'support return_exit_status matcher' do |command, status|
+  describe 'return_exit_status' do
+    describe command do
+      it { should return_exit_status(status) }
+    end
+
+    describe 'this-is-invalid-command' do
+      it { should_not return_exit_status(status) }
+    end
+  end
+end
+
+shared_examples_for 'support return_stdout matcher' do |command, content|
+  describe 'return_stdout' do
+    describe command do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "#{content}\r\n"
+        end
+      end
+      it { should return_stdout(content) }
+    end
+
+    describe command do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "foo#{content}bar\r\n"
+        end
+      end
+      it { should_not return_stdout(content) }
+    end
+
+
+    describe 'this-is-invalid-command' do
+      it { should_not return_stdout(content) }
+    end
+  end
+end
+
+shared_examples_for 'support return_stdout matcher with regexp' do |command, content|
+  describe 'return_stdout' do
+    describe command do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "foo#{content}bar\r\n"
+        end
+      end
+      it { should return_stdout(content) }
+    end
+
+    describe command do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "foobar\r\n"
+        end
+      end
+      it { should_not return_stdout(content) }
+    end
+
+    describe 'this-is-invalid-command' do
+      it { should_not return_stdout(content) }
+    end
+  end
+end
+
+shared_examples_for 'support return_stderr matcher' do |command, content|
+  describe 'return_stderr' do
+    describe command do
+      before :all do
+        RSpec.configure do |c|
+          c.stderr = "#{content}\r\n"
+        end
+      end
+      it { should return_stderr(content) }
+    end
+
+    describe command do
+      before :all do
+        RSpec.configure do |c|
+          c.stderr = "No such file or directory\r\n"
+        end
+      end
+      it { should_not return_stderr(content) }
+    end
+  end
+end
+
+shared_examples_for 'support return_stderr matcher with regexp' do |command, content|
+  describe 'return_stderr' do
+    describe command do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "cat: /foo: No such file or directory\r\n"
+        end
+      end
+      it { should return_stdout(content) }
+    end
+
+    describe command do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "foobar\r\n"
+        end
+      end
+      it { should_not return_stdout(content) }
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: serverspec
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 2
-  - 11
-  version: 0.2.11
+  - 12
+  version: 0.2.12
 platform: ruby
 authors: 
 - Gosuke Miyashita
@@ -153,6 +153,9 @@ files:
 - lib/serverspec/matchers/have_iptables_rule.rb
 - lib/serverspec/matchers/have_svcprop.rb
 - lib/serverspec/matchers/have_svcprops.rb
+- lib/serverspec/matchers/return_exit_status.rb
+- lib/serverspec/matchers/return_stderr.rb
+- lib/serverspec/matchers/return_stdout.rb
 - lib/serverspec/setup.rb
 - lib/serverspec/version.rb
 - serverspec.gemspec