mspec 1.5.11 → 1.5.12

data/Rakefile

@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors                   = ["Brian Ford"]
-  s.date                      = %q{2009-3-30}
+  s.date                      = %q{2009-6-8}
   s.email                     = %q{bford@engineyard.com}
   s.has_rdoc                  = true
   s.extra_rdoc_files          = %w[ README LICENSE ]

data/lib/mspec/commands/mspec-ci.rb

@@ -42,6 +42,7 @@ class MSpecCI < MSpecScript
     options.action_filters
 
     options.doc "\n Help!"
+    options.debug
     options.version MSpec::VERSION
     options.help
 

data/lib/mspec/commands/mspec-run.rb

@@ -53,6 +53,7 @@ class MSpecRun < MSpecScript
     options.action_filters
 
     options.doc "\n Help!"
+    options.debug
     options.version MSpec::VERSION
     options.help
 

data/lib/mspec/commands/mspec-tag.rb

@@ -72,6 +72,7 @@ class MSpecTag < MSpecScript
     end
 
     options.doc "\n Help!"
+    options.debug
     options.version MSpec::VERSION
     options.help
 

data/lib/mspec/helpers.rb

@@ -1,11 +1,15 @@
 require 'mspec/helpers/argv'
 require 'mspec/helpers/bignum'
 require 'mspec/helpers/const_lookup'
+require 'mspec/helpers/ducktype'
+require 'mspec/helpers/enumerator_class'
 require 'mspec/helpers/environment'
 require 'mspec/helpers/fixture'
 require 'mspec/helpers/flunk'
+require 'mspec/helpers/hash'
 require 'mspec/helpers/io'
 require 'mspec/helpers/language_version'
+require 'mspec/helpers/metaclass'
 require 'mspec/helpers/ruby_exe'
 require 'mspec/helpers/scratch'
 require 'mspec/helpers/tmp'

data/lib/mspec/helpers/ducktype.rb

@@ -0,0 +1,33 @@
+class Object
+  def responds_to(sym)
+    metaclass.class_eval <<-END
+      def respond_to?(sym, include_private=false)
+        sym.to_sym == #{sym.to_sym.inspect} ? true : super
+      end
+    END
+  end
+
+  def does_not_respond_to(sym)
+    metaclass.class_eval <<-END
+      def respond_to?(sym, include_private=false)
+        sym.to_sym == #{sym.to_sym.inspect} ? false : super
+      end
+    END
+  end
+
+  def undefine(sym)
+    metaclass.class_eval <<-END
+      undef_method #{sym.to_sym.inspect}
+    END
+  end
+
+  def fake!(sym, value=nil)
+    responds_to sym
+
+    metaclass.class_eval <<-END
+      def method_missing(sym, *args)
+        return #{value.inspect} if sym.to_sym == #{sym.to_sym.inspect}
+      end
+    END
+  end
+end

data/lib/mspec/helpers/enumerator_class.rb

@@ -0,0 +1,9 @@
+class Object
+
+  # Returns the Enumerator class (either Enumerator or Enumerable::Enumerator)
+  # depending of the version.
+  #
+  def enumerator_class
+    SpecVersion.new(RUBY_VERSION) < "1.9" ? Enumerable::Enumerator : Enumerator
+  end
+end

data/lib/mspec/helpers/environment.rb

@@ -11,13 +11,22 @@ class Object
     env
   end
 
+  def windows_env_echo(var)
+    `cmd.exe /C ECHO %#{var}%`.strip
+  end  
+
   def username
     user = ""
     if SpecGuard.windows?
-      user = `cmd.exe /C ECHO %USERNAME%`.strip
+      user = windows_env_echo('USERNAME')
     else
       user = `whoami`.strip
     end
     user
   end
+
+  def home_directory
+    return ENV['HOME'] unless SpecGuard.windows?
+    windows_env_echo('HOMEDRIVE') + windows_env_echo('HOMEPATH')
+  end  
 end

data/lib/mspec/helpers/hash.rb

@@ -0,0 +1,27 @@
+class Object
+  # The following helpers provide a level of indirection for running the specs
+  # against a Hash implementation that has a different name than Hash.
+
+  # Returns the Hash class.
+  unless method_defined?(:hash_class)
+    def hash_class
+      Hash
+    end
+  end
+
+  # Returns a new instance of hash_class.
+  def new_hash(*args, &block)
+    if block
+      hash_class.new(&block)
+    elsif args.size == 1
+      value = args.first
+      if value.is_a?(Hash) or value.is_a?(hash_class)
+        hash_class[value]
+      else
+        hash_class.new value
+      end
+    else
+      hash_class[*args]
+    end
+  end
+end

data/lib/mspec/helpers/io.rb

@@ -11,6 +11,10 @@ class IOStub < String
     write(str.collect { |s| s.to_s.chomp }.concat([nil]).join("\n"))
   end
 
+  def printf(format, *args)
+    self << sprintf(format, *args)
+  end
+
   def flush
     self
   end

data/lib/mspec/helpers/metaclass.rb

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

data/lib/mspec/matchers.rb

@@ -1,4 +1,5 @@
 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_empty'
@@ -12,9 +13,13 @@ require 'mspec/matchers/equal'
 require 'mspec/matchers/equal_element'
 require 'mspec/matchers/equal_utf16'
 require 'mspec/matchers/have_constant'
+require 'mspec/matchers/have_class_variable'
 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_protected_instance_method'
+require 'mspec/matchers/have_public_instance_method'
 require 'mspec/matchers/include'
 require 'mspec/matchers/match_yaml'
 require 'mspec/matchers/raise_error'

data/lib/mspec/matchers/have_class_variable.rb

@@ -0,0 +1,12 @@
+require 'mspec/matchers/variable'
+
+class HaveClassVariableMatcher < VariableMatcher
+  self.variables_method = :class_variables
+  self.description      = 'class variable'
+end
+
+class Object
+  def have_class_variable(variable)
+    HaveClassVariableMatcher.new(variable)
+  end
+end

data/lib/mspec/matchers/have_constant.rb

@@ -1,30 +1,12 @@
-require 'mspec/matchers/stringsymboladapter'
+require 'mspec/matchers/variable'
 
-class HaveConstantMatcher
-  include StringSymbolAdapter
-
-  def initialize(name)
-    @name = convert_name name
-  end
-
-  def matches?(mod)
-    @mod = mod
-    @mod.constants.include? @name
-  end
-
-  def failure_message
-    ["Expected #{@mod} to have constant '#{@name.to_s}'",
-     "but it does not"]
-  end
-
-  def negative_failure_message
-    ["Expected #{@mod} NOT to have constant '#{@name.to_s}'",
-     "but it does"]
-  end
+class HaveConstantMatcher < VariableMatcher
+  self.variables_method = :constants
+  self.description      = 'constant'
 end
 
 class Object
-  def have_constant(name)
-    HaveConstantMatcher.new name
+  def have_constant(variable)
+    HaveConstantMatcher.new(variable)
   end
 end

data/lib/mspec/matchers/have_instance_variable.rb

@@ -0,0 +1,12 @@
+require 'mspec/matchers/variable'
+
+class HaveInstanceVariableMatcher < VariableMatcher
+  self.variables_method = :instance_variables
+  self.description      = 'instance variable'
+end
+
+class Object
+  def have_instance_variable(variable)
+    HaveInstanceVariableMatcher.new(variable)
+  end
+end

data/lib/mspec/matchers/have_protected_instance_method.rb

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

data/lib/mspec/matchers/have_public_instance_method.rb

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

data/lib/mspec/matchers/stringsymboladapter.rb

@@ -3,6 +3,6 @@ require 'mspec/utils/version'
 module StringSymbolAdapter
   def convert_name(name)
     version = SpecVersion.new(RUBY_VERSION) <=> "1.9"
-    version < 0 ? name.to_s : name
+    version < 0 ? name.to_s : name.to_sym
   end
 end

data/lib/mspec/matchers/variable.rb

@@ -0,0 +1,28 @@
+require 'mspec/matchers/stringsymboladapter'
+
+class VariableMatcher
+  include StringSymbolAdapter
+
+  class << self
+    attr_accessor :variables_method, :description
+  end
+
+  def initialize(variable)
+    @variable = convert_name(variable)
+  end
+
+  def matches?(object)
+    @object = object
+    @object.send(self.class.variables_method).include? @variable
+  end
+
+  def failure_message
+    ["Expected #{@object} to have #{self.class.description} '#{@variable}'",
+     "but it does not"]
+  end
+
+  def negative_failure_message
+    ["Expected #{@object} NOT to have #{self.class.description} '#{@variable}'",
+     "but it does"]
+  end
+end

data/lib/mspec/mocks/mock.rb

@@ -1,8 +1,13 @@
 require 'mspec/expectations/expectations'
+require 'mspec/helpers/metaclass'
 
 module Mock
   def self.reset
-    @mocks = @stubs = nil
+    @mocks = @stubs = @objects = nil
+  end
+
+  def self.objects
+    @objects ||= {}
   end
 
   def self.mocks
@@ -14,23 +19,38 @@ module Mock
   end
 
   def self.replaced_name(obj, sym)
-    :"__ms_#{obj.__id__}_#{sym}__"
+    :"__mspec_#{obj.__id__}_#{sym}__"
   end
 
   def self.replaced_key(obj, sym)
-    [replaced_name(obj, sym), obj, sym]
+    [replaced_name(obj, sym), sym]
   end
 
-  def self.replaced?(key)
-    !!(mocks.keys + stubs.keys).find { |k| k.first == key.first }
+  def self.has_key?(keys, sym)
+    !!keys.find { |k| k.first == sym }
+  end
+
+  def self.replaced?(sym)
+    has_key?(mocks.keys, sym) or has_key?(stubs.keys, sym)
+  end
+
+  def self.mock_respond_to?(obj, sym)
+    name = replaced_name(obj, :respond_to?)
+    if replaced? name
+      obj.__send__ name, sym
+    else
+      obj.respond_to? sym
+    end
   end
 
   def self.install_method(obj, sym, type=nil)
-    meta = class << obj; self; end
+    meta = obj.metaclass
 
     key = replaced_key obj, sym
-    if (sym.to_sym == :respond_to? or obj.respond_to?(sym)) and !replaced?(key)
-      meta.__send__ :alias_method, key.first, sym.to_sym
+    sym = sym.to_sym
+
+    if (sym == :respond_to? or mock_respond_to?(obj, sym)) and !replaced?(key.first)
+      meta.__send__ :alias_method, key.first, sym
     end
 
     meta.class_eval <<-END
@@ -51,6 +71,7 @@ module Mock
     else
       mocks[key] << proxy
     end
+    objects[key] = obj
 
     proxy
   end
@@ -61,7 +82,7 @@ module Mock
 
   def self.verify_count
     mocks.each do |key, proxies|
-      replaced, obj, sym = *key
+      obj = objects[key]
       proxies.each do |proxy|
         qualifier, count = proxy.count
         pass = case qualifier
@@ -78,7 +99,7 @@ module Mock
         end
         unless pass
           SpecExpectation.fail_with(
-            "Mock '#{name_or_inspect obj}' expected to receive '#{sym}' " \
+            "Mock '#{name_or_inspect obj}' expected to receive '#{key.last}' " \
             "#{qualifier.to_s.sub('_', ' ')} #{count} times",
             "but received it #{proxy.calls} times")
         end
@@ -88,50 +109,51 @@ module Mock
 
   def self.verify_call(obj, sym, *args, &block)
     compare = *args
-    if RUBY_VERSION >= '1.9'
+    if (behaves_like_ruby_1_9 = *[])
       compare = compare.first if compare.length <= 1
     end
 
     key = replaced_key obj, sym
-    proxies = mocks[key] + stubs[key]
-    proxies.each do |proxy|
-      pass = case proxy.arguments
-      when :any_args
-        true
-      when :no_args
-        compare.nil?
-      else
-        proxy.arguments == compare
-      end
+    [mocks, stubs].each do |proxies|
+      proxies[key].each do |proxy|
+        pass = case proxy.arguments
+        when :any_args
+          true
+        when :no_args
+          compare.nil?
+        else
+          proxy.arguments == compare
+        end
 
-      if proxy.yielding?
-        if block
-          proxy.yielding.each do |args_to_yield|
-            if block.arity == -1 || block.arity == args_to_yield.size
-              block.call(*args_to_yield)
-            else
-              SpecExpectation.fail_with(
-                "Mock '#{name_or_inspect obj}' asked to yield " \
-                "|#{proxy.yielding.join(', ')}| on #{sym}\n",
-                "but a block with arity #{block.arity} was passed")
+        if proxy.yielding?
+          if block
+            proxy.yielding.each do |args_to_yield|
+              if block.arity == -1 || block.arity == args_to_yield.size
+                block.call(*args_to_yield)
+              else
+                SpecExpectation.fail_with(
+                  "Mock '#{name_or_inspect obj}' asked to yield " \
+                  "|#{proxy.yielding.join(', ')}| on #{sym}\n",
+                  "but a block with arity #{block.arity} was passed")
+              end
             end
+          else
+            SpecExpectation.fail_with(
+              "Mock '#{name_or_inspect obj}' asked to yield " \
+              "|[#{proxy.yielding.join('], [')}]| on #{sym}\n",
+              "but no block was passed")
           end
-        else
-          SpecExpectation.fail_with(
-            "Mock '#{name_or_inspect obj}' asked to yield " \
-            "|[#{proxy.yielding.join('], [')}]| on #{sym}\n",
-            "but no block was passed")
         end
-      end
 
-      if pass
-        proxy.called
-        return proxy.returning
+        if pass
+          proxy.called
+          return proxy.returning
+        end
       end
     end
 
     if sym.to_sym == :respond_to?
-      return obj.__send__(replaced_name(obj, sym), compare)
+      mock_respond_to? obj, compare
     else
       SpecExpectation.fail_with("Mock '#{name_or_inspect obj}': method #{sym}\n",
                             "called with unexpected arguments (#{Array(compare).join(' ')})")
@@ -139,15 +161,16 @@ module Mock
   end
 
   def self.cleanup
-    symbols = mocks.keys + stubs.keys
-    symbols.uniq.each do |replaced, obj, sym|
-      meta = class << obj; self; end
+    objects.each do |key, obj|
+      replaced = key.first
+      sym = key.last
+      meta = obj.metaclass
 
-      if meta.instance_methods.map { |x| x.to_sym }.include?(replaced.to_sym)
-        meta.__send__ :alias_method, sym.to_sym, replaced
+      if meta.instance_methods.map { |x| x.to_sym }.include?(replaced)
+        meta.__send__ :alias_method, sym, replaced
         meta.__send__ :remove_method, replaced
       else
-        meta.__send__ :remove_method, sym.to_sym
+        meta.__send__ :remove_method, sym
       end
     end
     reset