serverspec 0.5.8 → 0.6.0

data/lib/serverspec.rb

@@ -5,7 +5,6 @@ require 'serverspec/matchers'
 require 'serverspec/backend'
 require 'serverspec/helper'
 require 'serverspec/setup'
-require 'serverspec/filter'
 require 'serverspec/subject'
 require 'serverspec/commands/base'
 require 'serverspec/commands/linux'
@@ -15,6 +14,7 @@ require 'serverspec/commands/gentoo'
 require 'serverspec/commands/solaris'
 require 'serverspec/commands/darwin'
 require 'serverspec/configuration'
+require 'rspec/core/formatters/base_formatter'
 
 include Serverspec
 
@@ -40,20 +40,6 @@ RSpec.configure do |c|
   Serverspec.configuration.defaults.each { |k, v| c.add_setting k, :default => v }
   c.before :each do
     backend.set_example(example)
-    if described_class.nil?
-      puts
-      puts "*****************************************"
-      puts "Using a string as a subject is obsoleted."
-      puts "Please use a subject type object instead."
-      puts "See: http://serverspec.org/matchers.html"
-      puts "*****************************************"
-      puts
-    end
-    if described_class.nil? && subject == 'value'
-      def subject
-        Serverspec::Filter.filter_subject example
-      end
-    end
   end
 end
 
@@ -62,27 +48,45 @@ module RSpec
     module DSL
       class Matcher
         def failure_message_for_should(&block)
-          if block.to_s =~ /serverspec\/matchers\/.+\.rb/
-            @custom = true
-          end
-          if @custom
-            cache_or_call_cached(:failure_message_for_should, &block)
-          else
-            message =  "#{example.metadata[:command]}\n"
-            message += "#{example.metadata[:stdout]}"
-            message
-          end
+          message =  "#{example.metadata[:command]}\n"
+          message += "#{example.metadata[:stdout]}"
+          message
         end
         def failure_message_for_should_not(&block)
-          if block.to_s =~ /serverspec\/matchers\/.+\.rb/
-            @custom = true
+          message =  "#{example.metadata[:command]}\n"
+          message += "#{example.metadata[:stdout]}"
+          message
+        end
+      end
+    end
+  end
+  module Core
+    module Formatters
+      class BaseTextFormatter < BaseFormatter
+        def dump_failure_info(example)
+          exception = example.execution_result[:exception]
+          exception_class_name = exception_class_name_for(exception)
+          output.puts "#{long_padding}#{failure_color("Failure/Error:")} #{failure_color(read_failed_line(exception, example).strip)}"
+          output.puts "#{long_padding}#{failure_color(exception_class_name)}:" unless exception_class_name =~ /RSpec/
+          output.puts "#{long_padding}  #{failure_color(example.metadata[:command])}"
+          output.puts "#{long_padding}  #{failure_color(example.metadata[:stdout])}" if example.metadata[:stdout] != ''
+
+          if shared_group = find_shared_group(example)
+            dump_shared_failure_info(shared_group)
           end
-          if @custom
-            cache_or_call_cached(:failure_message_for_should, &block)
-          else
-            message =  "#{example.metadata[:command]}\n"
-            message += "#{example.metadata[:stdout]}"
-            message
+        end
+      end
+      class ProgressFormatter < BaseTextFormatter
+        def dump_failure_info(example)
+          exception = example.execution_result[:exception]
+          exception_class_name = exception_class_name_for(exception)
+          output.puts "#{long_padding}#{failure_color("Failure/Error:")} #{failure_color(read_failed_line(exception, example).strip)}"
+          output.puts "#{long_padding}#{failure_color(exception_class_name)}:" unless exception_class_name =~ /RSpec/
+          output.puts "#{long_padding}  #{failure_color(example.metadata[:command])}"
+          output.puts "#{long_padding}  #{failure_color(example.metadata[:stdout])}" if example.metadata[:stdout] != ''
+
+          if shared_group = find_shared_group(example)
+            dump_shared_failure_info(shared_group)
           end
         end
       end

data/lib/serverspec/helper.rb

@@ -13,9 +13,6 @@ require 'serverspec/helper/solaris'
 require 'serverspec/helper/darwin'
 require 'serverspec/helper/detect_os'
 
-# Obsoleted helpers
-require 'serverspec/helper/obsoleted'
-
 # Attributes helper
 require 'serverspec/helper/attributes'
 

data/lib/serverspec/matchers.rb

@@ -1,46 +1,30 @@
+# file
 require 'serverspec/matchers/be_mounted'
+require 'serverspec/matchers/contain'
+require 'serverspec/matchers/be_readable'
+require 'serverspec/matchers/be_writable'
+require 'serverspec/matchers/be_executable'
+require 'serverspec/matchers/match_md5checksum'
+
+# host
 require 'serverspec/matchers/be_resolvable'
-require 'serverspec/matchers/be_enabled'
-require 'serverspec/matchers/be_file'
 require 'serverspec/matchers/be_reachable'
-require 'serverspec/matchers/be_default_gateway'
-require 'serverspec/matchers/be_directory'
+
+# package
 require 'serverspec/matchers/be_installed'
-require 'serverspec/matchers/be_listening'
+
+# service
 require 'serverspec/matchers/be_running'
-require 'serverspec/matchers/contain'
-require 'serverspec/matchers/be_user'
-require 'serverspec/matchers/be_group'
-require 'serverspec/matchers/be_mode'
-require 'serverspec/matchers/be_owned_by'
-require 'serverspec/matchers/be_grouped_into'
-require 'serverspec/matchers/have_entry'
-require 'serverspec/matchers/have_cron_entry'
-require 'serverspec/matchers/be_linked_to'
+
+# user
 require 'serverspec/matchers/belong_to_group'
-require 'serverspec/matchers/have_gid'
-require 'serverspec/matchers/have_uid'
-require 'serverspec/matchers/have_login_shell'
-require 'serverspec/matchers/have_home_directory'
-require 'serverspec/matchers/have_authorized_key'
-require 'serverspec/matchers/have_iptables_rule'
-require 'serverspec/matchers/get_stdout'
-require 'serverspec/matchers/be_zfs'
-require 'serverspec/matchers/be_readable'
-require 'serverspec/matchers/be_writable'
-require 'serverspec/matchers/be_executable'
-require 'serverspec/matchers/be_enforcing'
-require 'serverspec/matchers/be_permissive'
-require 'serverspec/matchers/be_disabled'
-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'
-require 'serverspec/matchers/match_md5checksum'
 
-# For explicit types
+# ipfiter, ipnat, iptables
 require 'serverspec/matchers/have_rule'
 
+# cron, routing_table
+require 'serverspec/matchers/have_entry'

data/lib/serverspec/matchers/be_executable.rb

@@ -1,14 +1,6 @@
 RSpec::Matchers.define :be_executable do
   match do |file|
-    if file.respond_to?(:executable?)
-      file.executable?(@by_whom, @by_user)
-    else
-      if @by_user != nil
-        backend.check_access_by_user(file, @by_user, 'x')
-      else
-        backend.check_executable(file, @by_whom)
-      end
-    end
+    file.executable?(@by_whom, @by_user)
   end
   chain :by do |by_whom|
     @by_whom = by_whom

data/lib/serverspec/matchers/be_installed.rb

@@ -1,20 +1,6 @@
 RSpec::Matchers.define :be_installed do
   match do |name|
-    if name.respond_to?(:installed?)
-      name.installed?(@provider, @version)
-    else
-      if @provider.nil?
-        backend.check_installed(name)
-      else
-        check_method = "check_installed_by_#{@provider}".to_sym
-
-        unless backend.respond_to?(check_method) || commands.respond_to?(check_method)
-          raise ArgumentError.new("`be_installed` matcher doesn't support #{@under}")
-        end
-
-        backend.send(check_method, name, @version)
-      end
-    end
+    name.installed?(@provider, @version)
   end
 
   chain :by do |provider|

data/lib/serverspec/matchers/be_mounted.rb

@@ -1,10 +1,6 @@
 RSpec::Matchers.define :be_mounted do
   match do |path|
-    if path.respond_to?(:mounted?)
-      path.mounted?(@attr, @only_with)
-    else
-      backend.check_mounted(path, @attr, @only_with)
-    end
+    path.mounted?(@attr, @only_with)
   end
   chain :with do |attr|
     @attr      = attr

data/lib/serverspec/matchers/be_reachable.rb

@@ -8,11 +8,7 @@ RSpec::Matchers.define :be_reachable  do
       timeout = @attr[:timeout] if @attr[:timeout]
     end
 
-    if host.respond_to?(:reachable?)
-      host.reachable?(port, proto, timeout)
-    else
-      backend.check_reachable(host, port, proto, timeout)
-    end
+    host.reachable?(port, proto, timeout)
   end
 
   chain :with do |attr|

data/lib/serverspec/matchers/be_readable.rb

@@ -1,14 +1,6 @@
 RSpec::Matchers.define :be_readable do
   match do |file|
-    if file.respond_to?(:readable?)
-      file.readable?(@by_whom, @by_user)
-    else
-      if @by_user != nil
-        backend.check_access_by_user(file, @by_user, 'r')
-      else
-        backend.check_readable(file, @by_whom)
-      end
-    end
+    file.readable?(@by_whom, @by_user)
   end
   chain :by do |by_whom|
     @by_whom = by_whom

data/lib/serverspec/matchers/be_resolvable.rb

@@ -1,10 +1,6 @@
 RSpec::Matchers.define :be_resolvable do
   match do |name|
-    if name.respond_to?(:resolvable?)
-      name.resolvable?(@type)
-    else
-      backend.check_resolvable(name, @type)
-    end
+    name.resolvable?(@type)
   end
   chain :by do |type|
     @type = type

data/lib/serverspec/matchers/be_running.rb

@@ -1,20 +1,6 @@
 RSpec::Matchers.define :be_running do
   match do |process|
-    if process.respond_to?(:running?)
-      process.running? @under
-    else
-      if (@under)
-        check_method = "check_running_under_#{@under}".to_sym
-
-        unless backend.respond_to?(check_method)
-          raise ArgumentError.new("`be_running` matcher doesn't support #{@under}")
-        end
-
-        backend.send(check_method, process)
-      else
-        backend.check_running(process)
-      end
-    end
+    process.running?(@under)
   end
 
   chain :under do |under|

data/lib/serverspec/matchers/be_writable.rb

@@ -1,14 +1,6 @@
 RSpec::Matchers.define :be_writable do
   match do |file|
-    if file.respond_to?(:writable?)
-      file.writable?(@by_whom, @by_user)
-    else
-      if @by_user != nil
-        backend.check_access_by_user(file, @by_user, 'w')
-      else
-        backend.check_writable(file, @by_whom)
-      end
-    end
+    file.writable?(@by_whom, @by_user)
   end
   chain :by do |by_whom|
     @by_whom = by_whom

data/lib/serverspec/matchers/belong_to_group.rb

@@ -1,10 +1,6 @@
 RSpec::Matchers.define :belong_to_group do |group|
   match do |user|
-    if user.respond_to?(:belongs_to_group?)
-      user.belongs_to_group?(group)
-    else
-      backend.check_belonging_group(user, group)
-    end
+    user.belongs_to_group?(group)
   end
 end
 

data/lib/serverspec/matchers/contain.rb

@@ -1,16 +1,6 @@
 RSpec::Matchers.define :contain do |pattern|
   match do |file|
-    if file.respond_to?(:contain)
-      file.contain(pattern, @from, @to)
-    else
-      if (@from || @to).nil?
-        cmd = backend.commands.check_file_contain(file, pattern)
-      else
-        cmd = backend.commands.check_file_contain_within(file, pattern, @from, @to)
-      end
-      ret = backend.run_command(cmd)
-      ret[:exit_status] == 0
-    end
+    file.contain(pattern, @from, @to)
   end
   # for contain(pattern).from(/A/).to(/B/)
   chain :from do |from|

data/lib/serverspec/matchers/have_entry.rb

@@ -4,8 +4,6 @@ RSpec::Matchers.define :have_entry do |entry|
        subject.has_entry?(@user, entry)
     elsif subject.respond_to?(:has_entry?)
       subject.has_entry?(entry)
-    else
-      backend.check_routing_table(entry)
     end
   end
   # For cron type

data/lib/serverspec/matchers/match_md5checksum.rb

@@ -1,9 +1,5 @@
 RSpec::Matchers.define :match_md5checksum do |pattern|
   match do |file|
-    if file.respond_to?(:match_md5checksum)
-      file.match_md5checksum(pattern)
-    else
-      backend.check_file_md5checksum(file, pattern)
-    end
+    file.match_md5checksum(pattern)
   end
 end

data/lib/serverspec/matchers/return_exit_status.rb

@@ -1,10 +1,5 @@
 RSpec::Matchers.define :return_exit_status do |status|
   match do |command|
-    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
+    command.return_exit_status?(status)
   end
 end

data/lib/serverspec/matchers/return_stderr.rb

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

data/lib/serverspec/matchers/return_stdout.rb

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

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end

data/spec/darwin/commands_spec.rb

@@ -7,7 +7,7 @@ describe 'Serverspec commands of Darwin family' do
   it_behaves_like 'support command check_directory', '/var/log'
 
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
-  it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
+  it_behaves_like 'support command check_installed_by_gem with_version', 'jekyll', '1.0.2'
 
   it_behaves_like 'support command check_mounted', '/'
 

data/spec/debian/commands_spec.rb

@@ -7,7 +7,7 @@ describe 'Serverspec commands of Debian family' do
   it_behaves_like 'support command check_directory', '/var/log'
 
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
-  it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
+  it_behaves_like 'support command check_installed_by_gem with_version', 'jekyll', '1.0.2'
 
   it_behaves_like 'support command check_mounted', '/'
 

data/spec/gentoo/commands_spec.rb

@@ -7,7 +7,7 @@ describe 'Serverspec commands of Gentoo family' do
   it_behaves_like 'support command check_directory', '/var/log'
 
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
-  it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
+  it_behaves_like 'support command check_installed_by_gem with_version', 'jekyll', '1.0.2'
 
   it_behaves_like 'support command check_mounted', '/'
 

data/spec/redhat/commands_spec.rb

@@ -7,7 +7,7 @@ describe 'Serverspec commands of Red Hat' do
   it_behaves_like 'support command check_directory', '/var/log'
 
   it_behaves_like 'support command check_installed_by_gem', 'jekyll'
-  it_behaves_like 'support command check_installed_by_gem', 'jekyll', '1.0.2'
+  it_behaves_like 'support command check_installed_by_gem with_version', 'jekyll', '1.0.2'
 
   it_behaves_like 'support command check_mounted', '/'