Explicit command subject type

Guardfile

@@ -0,0 +1,4 @@
+guard :rspec do
+  watch(%r{^spec/.+/.+_spec\.rb$})
+  watch('spec/spec_helper.rb')  { "spec" }
+end

lib/serverspec/helper/type.rb

@@ -1,14 +1,19 @@
-require 'serverspec/type/base'
-require 'serverspec/type/service'
-require 'serverspec/type/package'
-require 'serverspec/type/port'
-require 'serverspec/type/file'
-require 'serverspec/type/cron'
-
 module Serverspec
   module Helper
     module Type
-      %w( service package port file cron ).each do |type|
+      types = %w(
+        base
+        service
+        package
+        port
+        file
+        cron
+        command
+      )
+
+      types.each {|type| require "serverspec/type/#{type}" }
+
+      types.each do |type|
         define_method type do |*args|
           name = args.first
           self.class.const_get('Serverspec').const_get('Type').const_get(type.capitalize).new(name)

lib/serverspec/matchers/return_exit_status.rb

@@ -1,6 +1,10 @@
 RSpec::Matchers.define :return_exit_status do |status|
   match do |command|
-    ret = backend.run_command(command)
-    ret[:exit_status].to_i == status
+    if command.respond_to?(:return_exit_status?)
+      command.return_exit_status?(status)
+    else
+      ret = backend.run_command(command)
+      ret[:exit_status].to_i == status
+    end
   end
 end

lib/serverspec/matchers/return_stderr.rb

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

lib/serverspec/matchers/return_stdout.rb

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

lib/serverspec/type/command.rb

@@ -0,0 +1,31 @@
+module Serverspec
+  module Type
+    class Command < Base
+      def return_stdout?(content)
+        ret = backend.run_command(@name)
+        if content.instance_of?(Regexp)
+          ret[:stdout] =~ content
+        else
+          ret[:stdout].strip == content
+        end
+      end
+
+      def return_stderr?(content)
+        ret = backend.run_command(@name)
+        # In ssh access with pty, stderr is merged to stdout
+        # See http://stackoverflow.com/questions/7937651/receiving-extended-data-with-ssh-using-twisted-conch-as-client
+        # So I use stdout instead of stderr
+        if content.instance_of?(Regexp)
+          ret[:stdout] =~ content
+        else
+          ret[:stdout].strip == content
+        end
+      end
+
+      def return_exit_status?(status)
+        ret = backend.run_command(@name)
+        ret[:exit_status].to_i == status
+      end
+    end
+  end
+end

serverspec.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "highline"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "growl"
 end

spec/darwin/command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Darwin
+
+describe 'Serverspec command matchers of Darwin family' do
+  it_behaves_like 'support command return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support command return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support command return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support command return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support command return_exit_status matcher', 'ls /tmp', 0
+end

spec/debian/command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Debian
+
+describe 'Serverspec command matchers of Debian family' do
+  it_behaves_like 'support command return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support command return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support command return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support command return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support command return_exit_status matcher', 'ls /tmp', 0
+end

spec/gentoo/command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Gentoo
+
+describe 'Serverspec command matchers of Gentoo family' do
+  it_behaves_like 'support command return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support command return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support command return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support command return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support command return_exit_status matcher', 'ls /tmp', 0
+end

spec/redhat/command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include Serverspec::Helper::RedHat
+
+describe 'Serverspec command matchers of Red Hat family' do
+  it_behaves_like 'support command return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support command return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support command return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support command return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support command return_exit_status matcher', 'ls /tmp', 0
+end

spec/solaris/command_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Solaris
+
+describe 'Serverspec command matchers of Solaris family' do
+  it_behaves_like 'support command return_stdout matcher', 'cat /etc/resolv.conf', 'localhost'
+  it_behaves_like 'support command return_stdout matcher with regexp', 'cat /etc/resolv.conf', /localhost/
+
+  it_behaves_like 'support command return_stderr matcher', 'cat /foo', 'cat: /foo: No such file or directory'
+  it_behaves_like 'support command return_stderr matcher with regexp', 'cat /foo', /No such file or directory/
+
+  it_behaves_like 'support command return_exit_status matcher', 'ls /tmp', 0
+end

spec/support/shared_command_examples.rb

@@ -0,0 +1,108 @@
+shared_examples_for 'support command return_stdout matcher' do |name, content|
+  describe 'return_stdout' do
+    describe command(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "#{content}\r\n"
+        end
+      end
+      it { should return_stdout(content) }
+    end
+
+    describe command(name) 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 command('invalid-command') do
+      it { should_not return_stdout(content) }
+    end
+  end
+end
+
+shared_examples_for 'support command return_stdout matcher with regexp' do |name, content|
+  describe 'return_stdout' do
+    describe command(name) 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(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "foobar\r\n"
+        end
+      end
+      it { should_not return_stdout(content) }
+    end
+
+    describe command('invalid-command') do
+      it { should_not return_stdout(content) }
+    end
+  end
+end
+
+shared_examples_for 'support command return_stderr matcher' do |name, content|
+  describe 'return_stderr' do
+    describe command(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "#{content}\r\n"
+        end
+      end
+      it { should return_stderr(content) }
+    end
+
+    describe command(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "No such file or directory\r\n"
+        end
+      end
+      it { should_not return_stderr(content) }
+    end
+  end
+end
+
+shared_examples_for 'support command return_stderr matcher with regexp' do |name, content|
+  describe 'return_stderr' do
+    describe command(name) 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(name) do
+      before :all do
+        RSpec.configure do |c|
+          c.stdout = "foobar\r\n"
+        end
+      end
+      it { should_not return_stdout(content) }
+    end
+  end
+end
+
+shared_examples_for 'support command return_exit_status matcher' do |name, status|
+  describe 'return_exit_status' do
+    describe command(name) do
+      it { should return_exit_status(status) }
+    end
+
+    describe command('invalid-command') do
+      it { should_not return_exit_status(status) }
+    end
+  end
+end