mspec 1.5.17 → 1.5.18

data/lib/mspec/helpers/singleton_class.rb

@@ -0,0 +1,7 @@
+class Object
+  unless method_defined? :singleton_class
+    def singleton_class
+      class << self; self; end
+    end
+  end
+end

data/lib/mspec/helpers/stasy.rb

@@ -0,0 +1,33 @@
+require 'mspec/utils/version'
+require 'mspec/guards/guard'
+
+class Object
+  # Accepts either a single argument or an Array of arguments. If RUBY_VERSION
+  # is less than 1.9, converts the argument(s) to Strings; otherwise, converts
+  # the argument(s) to Symbols.
+  #
+  # If one argument is passed, the converted argument is returned. If an Array
+  # is passed, an Array is returned.
+  #
+  # For example, if RUBY_VERSION == 1.8.7
+  #
+  #   stasy(:some) => "some"
+  #   stasy("nom") => "nom"
+  #
+  # while if RUBY_VERSION == 1.9.0
+  #
+  #   stasy(:some) => :some
+  #   stasy("nom") => :nom
+
+  def stasy(one, *rest)
+    era = SpecVersion.new(SpecGuard.ruby_version) < "1.9"
+    convert = era ? :to_s : :to_sym
+
+    one = one.send convert
+    if rest.empty?
+      one
+    else
+      [one].concat rest.map { |x| x.send convert }
+    end
+  end
+end

data/lib/mspec/helpers/tmp.rb

@@ -5,15 +5,22 @@
 
 SPEC_TEMP_DIR = "#{File.expand_path(Dir.pwd)}/rubyspec_temp"
 
+SPEC_TEMP_UNIQUIFIER = "0"
+
+SPEC_TMEM_DIR_PID = Process.pid
+
 at_exit do
   begin
-    Dir.delete SPEC_TEMP_DIR if File.directory? SPEC_TEMP_DIR
+    if SPEC_TMEM_DIR_PID == Process.pid
+      Dir.delete SPEC_TEMP_DIR if File.directory? SPEC_TEMP_DIR
+    end
   rescue SystemCallError
     STDERR.puts <<-EOM
 
 -----------------------------------------------------
 The rubyspec temp directory is not empty. Ensure that
-all specs are cleaning up temporary files.
+all specs are cleaning up temporary files:
+  #{SPEC_TEMP_DIR}
 -----------------------------------------------------
 
     EOM
@@ -24,9 +31,15 @@ all specs are cleaning up temporary files.
 end
 
 class Object
-  def tmp(name)
+  def tmp(name, uniquify=true)
     Dir.mkdir SPEC_TEMP_DIR unless File.exists? SPEC_TEMP_DIR
 
+    if uniquify and !name.empty?
+      slash = name.rindex "/"
+      index = slash ? slash + 1 : 0
+      name.insert index, "#{SPEC_TEMP_UNIQUIFIER.succ!}-"
+    end
+
     File.join SPEC_TEMP_DIR, name
   end
 end

data/lib/mspec/matchers.rb

@@ -2,11 +2,15 @@ require 'mspec/matchers/base'
 require 'mspec/matchers/be_an_instance_of'
 require 'mspec/matchers/be_ancestor_of'
 require 'mspec/matchers/be_close'
+require 'mspec/matchers/be_computed_by'
+require 'mspec/matchers/be_computed_by_function'
 require 'mspec/matchers/be_empty'
 require 'mspec/matchers/be_false'
 require 'mspec/matchers/be_kind_of'
+require 'mspec/matchers/be_nan'
 require 'mspec/matchers/be_nil'
 require 'mspec/matchers/be_true'
+require 'mspec/matchers/be_valid_dns_name'
 require 'mspec/matchers/complain'
 require 'mspec/matchers/eql'
 require 'mspec/matchers/equal'
@@ -19,11 +23,15 @@ require 'mspec/matchers/have_instance_method'
 require 'mspec/matchers/have_instance_variable'
 require 'mspec/matchers/have_method'
 require 'mspec/matchers/have_private_instance_method'
+require 'mspec/matchers/have_private_method'
 require 'mspec/matchers/have_protected_instance_method'
 require 'mspec/matchers/have_public_instance_method'
+require 'mspec/matchers/have_singleton_method'
 require 'mspec/matchers/include'
+require 'mspec/matchers/infinity'
 require 'mspec/matchers/match_yaml'
 require 'mspec/matchers/raise_error'
 require 'mspec/matchers/output'
 require 'mspec/matchers/output_to_fd'
 require 'mspec/matchers/respond_to'
+require 'mspec/matchers/signed_zero'

data/lib/mspec/matchers/be_computed_by.rb

@@ -0,0 +1,37 @@
+class BeComputedByMatcher
+  def initialize(sym, *args)
+    @method = sym
+    @args = args
+  end
+
+  def matches?(array)
+    array.each do |line|
+      @receiver = line.shift
+      @value = line.pop
+      @arguments = line
+      @arguments += @args
+      @actual = @receiver.send(@method, *@arguments)
+      return false unless @actual == @value
+    end
+
+    return true
+  end
+
+  def method_call
+    method_call = "#{@receiver.inspect}.#{@method}"
+    unless @arguments.empty?
+      method_call << " from #{@arguments.map { |x| x.inspect }.join(", ")}"
+    end
+    method_call
+  end
+
+  def failure_message
+    ["Expected #{@value.inspect}", "to be computed by #{method_call} (computed #{@actual.inspect} instead)"]
+  end
+end
+
+class Object
+  def be_computed_by(sym, *args)
+    BeComputedByMatcher.new(sym, *args)
+  end
+end

data/lib/mspec/matchers/be_computed_by_function.rb

@@ -0,0 +1,35 @@
+class BeComputedByFunctionMatcher
+  def initialize(sym, *args)
+    @function = sym
+    @args = args
+  end
+
+  def matches?(array)
+    array.each do |line|
+      @value = line.pop
+      @arguments = line
+      @arguments += @args
+      return false unless send(@function, *@arguments) == @value
+    end
+
+    return true
+  end
+
+  def function_call
+    function_call = "#{@function}"
+    unless @arguments.empty?
+      function_call << "(#{@arguments.map { |x| x.inspect }.join(", ")})"
+    end
+    function_call
+  end
+
+  def failure_message
+    ["Expected #{@value.inspect}", "to be computed by #{function_call}"]
+  end
+end
+
+class Object
+  def be_computed_by_function(sym, *args)
+    BeComputedByFunctionMatcher.new(sym, *args)
+  end
+end

data/lib/mspec/matchers/be_nan.rb

@@ -0,0 +1,20 @@
+class BeNaNMatcher
+  def matches?(actual)
+    @actual = actual
+    @actual.kind_of?(Float) && @actual.nan?
+  end
+
+  def failure_message
+    ["Expected #{@actual}", "to be NaN"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@actual}", "not to be NaN"]
+  end
+end
+
+class Object
+  def be_nan
+    BeNaNMatcher.new
+  end
+end

data/lib/mspec/matchers/be_valid_dns_name.rb

@@ -0,0 +1,25 @@
+class BeValidDNSName
+  # http://stackoverflow.com/questions/106179/regular-expression-to-match-hostname-or-ip-address
+  # ftp://ftp.rfc-editor.org/in-notes/rfc3696.txt
+  # http://domainkeys.sourceforge.net/underscore.html
+  VALID_DNS = /^(([a-zA-Z0-9_]|[a-zA-Z0-9_][a-zA-Z0-9\-_]*[a-zA-Z0-9_])\.)*([A-Za-z_]|[A-Za-z_][A-Za-z0-9\-_]*[A-Za-z0-9_])\.?$/
+
+  def matches?(actual)
+    @actual = actual
+    (VALID_DNS =~ @actual) == 0
+  end
+
+  def failure_message
+    ["Expected '#{@actual}'", "to be a valid DNS name"]
+  end
+
+  def negative_failure_message
+    ["Expected '#{@actual}'", "not to be a valid DNS name"]
+  end
+end
+
+class Object
+  def be_valid_DNS_name
+    BeValidDNSName.new
+  end
+end

data/lib/mspec/matchers/have_data.rb

@@ -1,9 +1,10 @@
 require 'mspec/guards/feature'
-require 'mspec/helpers/fmode'
+require 'mspec/helpers/io'
 
 class HaveDataMatcher
-  def initialize(data)
+  def initialize(data, mode="rb:binary")
     @data = data
+    @mode = mode
   end
 
   def matches?(name)
@@ -15,7 +16,7 @@ class HaveDataMatcher
       size = @data.size
     end
 
-    File.open @name, fmode("rb:binary") do |f|
+    File.open @name, fmode(@mode) do |f|
       return f.read(size) == @data
     end
   end
@@ -42,7 +43,7 @@ class Object
   # passes if the file @name has "123" as the first 3 bytes. The
   # file can contain more bytes than +data+. The extra bytes do not
   # affect the result.
-  def have_data(data)
-    HaveDataMatcher.new(data)
+  def have_data(data, mode="rb:binary")
+    HaveDataMatcher.new(data, mode)
   end
 end

data/lib/mspec/matchers/have_private_method.rb

@@ -0,0 +1,24 @@
+require 'mspec/matchers/method'
+
+class HavePrivateMethodMatcher < MethodMatcher
+  def matches?(mod)
+    @mod = mod
+    mod.private_methods(@include_super).include? @method
+  end
+
+  def failure_message
+    ["Expected #{@mod} to have private method '#{@method.to_s}'",
+     "but it does not"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@mod} NOT to have private method '#{@method.to_s}'",
+     "but it does"]
+  end
+end
+
+class Object
+  def have_private_method(method, include_super=true)
+    HavePrivateMethodMatcher.new method, include_super
+  end
+end

data/lib/mspec/matchers/have_singleton_method.rb

@@ -0,0 +1,24 @@
+require 'mspec/matchers/method'
+
+class HaveSingletonMethodMatcher < MethodMatcher
+  def matches?(obj)
+    @obj = obj
+    obj.singleton_methods(@include_super).include? @method
+  end
+
+  def failure_message
+    ["Expected #{@obj} to have singleton method '#{@method.to_s}'",
+     "but it does not"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@obj} NOT to have singleton method '#{@method.to_s}'",
+     "but it does"]
+  end
+end
+
+class Object
+  def have_singleton_method(method, include_super=true)
+    HaveSingletonMethodMatcher.new method, include_super
+  end
+end

data/lib/mspec/matchers/infinity.rb

@@ -0,0 +1,28 @@
+class InfinityMatcher
+  def initialize(expected_sign)
+    @expected_sign = expected_sign
+  end
+
+  def matches?(actual)
+    @actual = actual
+    @actual.kind_of?(Float) && @actual.infinite? == @expected_sign
+  end
+
+  def failure_message
+    ["Expected #{@actual}", "to be #{"-" if @expected_sign == -1}Infinity"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@actual}", "not to be #{"-" if @expected_sign == -1}Infinity"]
+  end
+end
+
+class Object
+  def be_positive_infinity
+    InfinityMatcher.new(1)
+  end
+
+  def be_negative_infinity
+    InfinityMatcher.new(-1)
+  end
+end

data/lib/mspec/matchers/match_yaml.rb

@@ -9,8 +9,8 @@ class MatchYAMLMatcher
   end
 
   def matches?(actual)
-    @actual = actual    
-    clean_yaml(@actual) == @expected
+    @actual = actual
+    clean_yaml(@actual) == clean_yaml(@expected)
   end
 
   def failure_message
@@ -20,11 +20,11 @@ class MatchYAMLMatcher
   def negative_failure_message
     ["Expected #{@actual.inspect}", " to match #{@expected.inspect}"]
   end
-  
+
   protected
-  
+
   def clean_yaml(yaml)
-    yaml.gsub(/([^-])\s+\n/, "\\1\n")
+    yaml.gsub(/([^-]|^---)\s+\n/, "\\1\n").sub(/\n\.\.\.\n$/, "\n")
   end
 
   def valid_yaml?(obj)

data/lib/mspec/matchers/raise_error.rb

@@ -6,7 +6,7 @@ class RaiseErrorMatcher
   end
 
   def matches?(proc)
-    proc.call
+    @result = proc.call
     return false
   rescue Exception => @actual
     return false unless @exception === @actual
@@ -30,14 +30,16 @@ class RaiseErrorMatcher
     if @actual then
       message << "but got #{@actual.class}#{%[ (#{@actual.message})] if @actual.message}"
     else
-      message << "but no exception was raised"
+      message << "but no exception was raised (#@result was returned)"
     end
 
     message
   end
 
   def negative_failure_message
-    ["Expected to not get #{@exception}#{%[ (#{@message})] if @message}", ""]
+    message = ["Expected to not get #{@exception}#{%[ (#{@message})] if @message}", ""]
+    message[1] = "but got #{@actual.class}#{%[ (#{@actual.message})] if @actual.message}" unless @actual.class == @exception
+    message
   end
 end
 

data/lib/mspec/matchers/signed_zero.rb

@@ -0,0 +1,28 @@
+class SignedZeroMatcher
+  def initialize(expected_sign)
+    @expected_sign = expected_sign
+  end
+
+  def matches?(actual)
+    @actual = actual
+    (1.0/actual).infinite? == @expected_sign
+  end
+
+  def failure_message
+    ["Expected #{@actual}", "to be #{"-" if @expected_sign == -1}0.0"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@actual}", "not to be #{"-" if @expected_sign == -1}0.0"]
+  end
+end
+
+class Object
+  def be_positive_zero
+    SignedZeroMatcher.new(1)
+  end
+
+  def be_negative_zero
+    SignedZeroMatcher.new(-1)
+  end
+end

data/lib/mspec/mocks/mock.rb

@@ -1,5 +1,5 @@
 require 'mspec/expectations/expectations'
-require 'mspec/helpers/metaclass'
+require 'mspec/helpers/singleton_class'
 
 class Object
   alias_method :__mspec_object_id__, :object_id
@@ -43,22 +43,22 @@ module Mock
     stubs.delete key
   end
 
-  def self.mock_respond_to?(obj, sym)
+  def self.mock_respond_to?(obj, sym, include_private = false)
     name = replaced_name(obj, :respond_to?)
     if replaced? name
-      obj.__send__ name, sym
+      obj.__send__ name, sym, include_private
     else
-      obj.respond_to? sym
+      obj.respond_to? sym, include_private
     end
   end
 
   def self.install_method(obj, sym, type=nil)
-    meta = obj.metaclass
+    meta = obj.singleton_class
 
     key = replaced_key obj, sym
     sym = sym.to_sym
 
-    if (sym == :respond_to? or mock_respond_to?(obj, sym)) and !replaced?(key.first)
+    if (sym == :respond_to? or mock_respond_to?(obj, sym, true)) and !replaced?(key.first)
       meta.__send__ :alias_method, key.first, sym
     end
 
@@ -118,7 +118,8 @@ module Mock
 
   def self.verify_call(obj, sym, *args, &block)
     compare = *args
-    if (behaves_like_ruby_1_9 = *[])
+    behaves_like_ruby_1_9 = *[]
+    if (behaves_like_ruby_1_9)
       compare = compare.first if compare.length <= 1
     end
 
@@ -176,11 +177,16 @@ module Mock
 
   def self.cleanup
     objects.each do |key, obj|
+      if obj.kind_of? MockIntObject
+        clear_replaced key
+        next
+      end
+
       replaced = key.first
       sym = key.last
-      meta = obj.metaclass
+      meta = obj.singleton_class
 
-      if mock_respond_to? obj, replaced
+      if mock_respond_to? obj, replaced, true
         meta.__send__ :alias_method, sym, replaced
         meta.__send__ :remove_method, replaced
       else