mspec 1.5.11 → 1.5.12

data/lib/mspec/mocks/object.rb

@@ -17,4 +17,8 @@ class Object
   def mock(name, options={})
     MockObject.new name, options
   end
+
+  def mock_numeric(name, options={})
+    NumericMockObject.new name, options
+  end
 end

data/lib/mspec/mocks/proxy.rb

@@ -9,6 +9,20 @@ class MockObject
   end
 end
 
+class NumericMockObject < Numeric
+  def initialize(name, options={})
+    @name = name
+    @null = options[:null_object]
+  end
+
+  def method_missing(sym, *args, &block)
+    @null ? self : super
+  end
+
+  def singleton_method_added(val)
+  end
+end
+
 class MockProxy
   def initialize(type=nil)
     @multiple_returns = nil
@@ -88,7 +102,7 @@ class MockProxy
   def with(*args)
     raise ArgumentError, "you must specify the expected arguments" if args.empty?
     @arguments = *args
-    if RUBY_VERSION >= '1.9'
+    if (behaves_like_ruby_1_9 = *[])
       @arguments = @arguments.first if @arguments.length <= 1
     end
     self
@@ -112,11 +126,11 @@ class MockProxy
     @yielding << args
     self
   end
-  
+
   def yielding
     @yielding
   end
-  
+
   def yielding?
     !@yielding.empty?
   end

data/lib/mspec/runner.rb

@@ -2,6 +2,7 @@ require 'mspec/mocks'
 require 'mspec/runner/mspec'
 require 'mspec/runner/context'
 require 'mspec/runner/example'
+require 'mspec/runner/exception'
 require 'mspec/runner/object'
 require 'mspec/runner/formatters'
 require 'mspec/runner/actions'

data/lib/mspec/runner/exception.rb

@@ -1,8 +1,6 @@
 class ExceptionState
   attr_reader :description, :describe, :it, :exception
 
-  PATH = /#{File.expand_path(File.dirname(__FILE__) + '/../../..')}/
-
   def initialize(state, location, exception)
     @exception = exception
 
@@ -33,11 +31,14 @@ class ExceptionState
   end
 
   def backtrace
+    @backtrace_filter ||= MSpecScript.config[:backtrace_filter]
+
     begin
       bt = @exception.awesome_backtrace.show.split "\n"
     rescue Exception
       bt = @exception.backtrace || []
     end
-    bt.reject { |line| PATH =~ line }.join("\n")
+
+    bt.select { |line| $MSPEC_DEBUG or @backtrace_filter !~ line }.join("\n")
   end
 end

data/lib/mspec/utils/options.rb

@@ -207,7 +207,7 @@ class MSpecOptions
 
   def targets
     on("-t", "--target", "TARGET",
-       "Implementation to run the specs, where:") do |t|
+       "Implementation to run the specs, where TARGET is:") do |t|
       case t
       when 'r', 'ruby'
         config[:target] = 'ruby'
@@ -232,7 +232,8 @@ class MSpecOptions
     doc "     x or rubinius          invokes ./bin/rbx"
     doc "     X or rbx               invokes rbx in PATH"
     doc "     j or jruby             invokes jruby in PATH"
-    doc "     i or ironruby          invokes ir in PATH\n"
+    doc "     i or ironruby          invokes ir in PATH"
+    doc "     full path to EXE       invokes EXE directly\n"
 
     on("-T", "--target-opt", "OPT",
        "Pass OPT as a flag to the target implementation") do |t|
@@ -440,4 +441,11 @@ class MSpecOptions
       config[:gdb] = true
     end
   end
+
+  def debug
+    on("-d", "--debug",
+       "Set MSpec debugging flag for more verbose output") do
+      $MSPEC_DEBUG = true
+    end
+  end
 end

data/lib/mspec/version.rb

@@ -1,5 +1,5 @@
 require 'mspec/utils/version'
 
 module MSpec
-  VERSION = SpecVersion.new "1.5.11"
+  VERSION = SpecVersion.new "1.5.12"
 end

data/spec/commands/mkspec_spec.rb

@@ -172,7 +172,7 @@ describe MkSpec, "#write_spec" do
 
   it "checks if specs exist for the method if the spec file exists" do
     @script.should_receive(:`).with(
-        /mspec\/bin\/mspec-run --dry-run -fs -e 'Object#inspect' spec\/core\/tcejbo\/inspect_spec.rb/)
+        %r"#{@script.ruby} #{MSPEC_HOME}/bin/mspec-run --dry-run -fs -e 'Object#inspect' spec/core/tcejbo/inspect_spec.rb")
     @script.write_spec("spec/core/tcejbo/inspect_spec.rb", "Object#inspect", true)
   end
 

data/spec/commands/mspec_ci_spec.rb

@@ -88,6 +88,11 @@ describe MSpecCI, "#options" do
     @script.options
   end
 
+  it "enables the debug option" do
+    @options.should_receive(:debug)
+    @script.options @argv
+  end
+
   it "calls #custom_options" do
     @script.should_receive(:custom_options).with(@options)
     @script.options

data/spec/commands/mspec_run_spec.rb

@@ -118,6 +118,11 @@ describe MSpecRun, "#options" do
     @script.options @argv
   end
 
+  it "enables the debug option" do
+    @options.should_receive(:debug)
+    @script.options @argv
+  end
+
   it "exits if there are no files to process" do
     @options.should_receive(:parse).and_return([])
     @script.should_receive(:exit)

data/spec/commands/mspec_spec.rb

@@ -239,7 +239,7 @@ describe MSpecMain, "#run" do
   end
 
   it "uses exec to invoke the runner script" do
-    @script.should_receive(:exec).with("ruby", "-v", %r"mspec/bin/mspec-run$")
+    @script.should_receive(:exec).with("ruby", "-v", %r"#{MSPEC_HOME}/bin/mspec-run$")
     @script.options []
     @script.run
   end
@@ -248,7 +248,7 @@ describe MSpecMain, "#run" do
     @script.should_receive(:multi_exec).and_return do |arg|
       arg.length.should == 3
       arg[0].should == "-v"
-      arg[1].should =~ %r"mspec/bin/mspec-ci$"
+      arg[1].should =~ %r"#{MSPEC_HOME}/bin/mspec-ci$"
       arg[2].should == "-fy"
     end
     @script.options ["ci", "-j"]

data/spec/commands/mspec_tag_spec.rb

@@ -98,6 +98,11 @@ describe MSpecTag, "#options" do
     @script.options @argv
   end
 
+  it "enables the debug option" do
+    @options.should_receive(:debug)
+    @script.options @argv
+  end
+
   it "calls #custom_options" do
     @script.should_receive(:custom_options).with(@options)
     @script.options @argv

data/spec/expectations/should.rb

@@ -1,5 +1,6 @@
 $: << File.dirname(__FILE__) + '/../../lib'
 require 'mspec'
+require 'mspec/utils/script'
 
 # The purpose of these specs is to confirm that the #should
 # and #should_not methods are functioning appropriately. We

data/spec/helpers/ducktype_spec.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/ducktype'
+
+describe Object, "#responds_to" do
+  it "returns true for specified symbols" do
+    obj = mock("obj")
+    obj.responds_to(:to_flo)
+    obj.should respond_to(:to_flo)
+    obj.should respond_to(:to_s)
+  end
+end
+
+describe Object, "#does_not_respond_to" do
+  it "returns false for specified symbols" do
+    obj = mock("obj")
+    obj.does_not_respond_to(:to_s)
+    obj.should_not respond_to(:to_s)
+  end
+end
+
+describe Object, "#undefine" do
+  it "undefines the method" do
+    # cannot use a mock here because of the way RSpec handles method_missing
+    obj = Object.new
+    obj.undefine(:to_s)
+    lambda { obj.send :to_s }.should raise_error(NoMethodError)
+  end
+end
+
+describe Object, "#fake!" do
+  before :each do
+    @obj = mock("obj")
+  end
+
+  it "makes the object respond to the message" do
+    @obj.fake!(:to_flo)
+    @obj.should respond_to(:to_flo)
+  end
+
+  it "returns the value when the obj is sent the message" do
+    @obj.fake!(:to_flo, 1.2)
+    @obj.to_flo.should == 1.2
+  end
+end

data/spec/helpers/enumerator_class_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/enumerator_class'
+
+describe "#enumerator_class" do
+
+  ruby_version_is ''...'1.8.7' do
+    it "returns Enumerable::Enumerator in Ruby 1.8.6-" do
+      lambda { enumerator_class }.should raise_error(NameError)
+      require 'enumerator'
+      enumerator_class.should == Enumerable::Enumerator
+    end
+  end
+
+  ruby_version_is '1.8.7' do
+    it "returns Enumerator in Ruby 1.8.7+" do
+      enumerator_class.should == Enumerator
+    end
+  end
+end

data/spec/helpers/hash_spec.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/helpers/hash'
+
+describe Object, "#hash_class" do
+  it "returns the Hash class" do
+    hash_class.should == Hash
+  end
+end
+
+describe Object, "#new_hash" do
+  it "returns a default hash" do
+    new_hash.should == {}
+  end
+
+  it "returns a hash having a default value" do
+    hash = new_hash(5)
+    hash[:none].should == 5
+  end
+
+  it "returns a hash having a default proc" do
+    hash = new_hash { |h, k| h[k] = :default }
+    hash[:none].should == :default
+  end
+
+  it "returns a hash constructed from keys and values" do
+    new_hash({:a => 1, :b => 2}).should == { :a => 1, :b => 2 }
+    new_hash(1 => 2, 3 => 4).should == { 1 => 2, 3 => 4 }
+    new_hash(1, 2, 3, 4).should == { 1 => 2, 3 => 4 }
+  end
+end

data/spec/helpers/io_spec.rb

@@ -32,6 +32,11 @@ describe IOStub do
     @out.should == "hello\n1\n2\n3\n"
   end
 
+  it "provides a printf method" do
+    @out.printf "%-10s, %03d, %2.1f", "test", 42, 4.2
+    @out.should == "test      , 042, 4.2"
+  end
+
   it "provides a flush method that does nothing and returns self" do
     @out.flush.should == @out
   end

data/spec/matchers/have_class_variable_spec.rb

@@ -0,0 +1,75 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/have_class_variable'
+
+class IVarModMock; end
+
+shared_examples_for "have_class_variable, on all Ruby versions" do
+  after :all do
+    Object.const_set :RUBY_VERSION, @ruby_version
+  end
+
+  it "matches when mod has the class variable, given as string" do
+    matcher = HaveClassVariableMatcher.new('@foo')
+    matcher.matches?(IVarModMock).should be_true
+  end
+
+  it "matches when mod has the class variable, given as symbol" do
+    matcher = HaveClassVariableMatcher.new(:@foo)
+    matcher.matches?(IVarModMock).should be_true
+  end
+
+  it "does not match when mod hasn't got the class variable, given as string" do
+    matcher = HaveClassVariableMatcher.new('@bar')
+    matcher.matches?(IVarModMock).should be_false
+  end
+
+  it "does not match when mod hasn't got the class variable, given as symbol" do
+    matcher = HaveClassVariableMatcher.new(:@bar)
+    matcher.matches?(IVarModMock).should be_false
+  end
+
+  it "provides a failure message for #should" do
+    matcher = HaveClassVariableMatcher.new(:@bar)
+    matcher.matches?(IVarModMock)
+    matcher.failure_message.should == [
+      "Expected IVarModMock to have class variable '@bar'",
+      "but it does not"
+    ]
+  end
+
+  it "provides a failure messoge for #should_not" do
+    matcher = HaveClassVariableMatcher.new(:@bar)
+    matcher.matches?(IVarModMock)
+    matcher.negative_failure_message.should == [
+      "Expected IVarModMock NOT to have class variable '@bar'",
+      "but it does"
+    ]
+  end
+end
+
+describe HaveClassVariableMatcher, "on RUBY_VERSION < 1.9" do
+  before :all do
+    @ruby_version = Object.const_get :RUBY_VERSION
+    Object.const_set :RUBY_VERSION, '1.8.6'
+
+    def IVarModMock.class_variables
+      ['@foo']
+    end
+  end
+
+  it_should_behave_like "have_class_variable, on all Ruby versions"
+end
+
+describe HaveClassVariableMatcher, "on RUBY_VERSION >= 1.9" do
+  before :all do
+    @ruby_version = Object.const_get :RUBY_VERSION
+    Object.const_set :RUBY_VERSION, '1.9.0'
+
+    def IVarModMock.class_variables
+      [:@foo]
+    end
+  end
+
+  it_should_behave_like "have_class_variable, on all Ruby versions"
+end

data/spec/matchers/have_instance_variable_spec.rb

@@ -0,0 +1,75 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/have_instance_variable'
+
+shared_examples_for "have_instance_variable, on all Ruby versions" do
+  after :all do
+    Object.const_set :RUBY_VERSION, @ruby_version
+  end
+
+  it "matches when object has the instance variable, given as string" do
+    matcher = HaveInstanceVariableMatcher.new('@foo')
+    matcher.matches?(@object).should be_true
+  end
+
+  it "matches when object has the instance variable, given as symbol" do
+    matcher = HaveInstanceVariableMatcher.new(:@foo)
+    matcher.matches?(@object).should be_true
+  end
+
+  it "does not match when object hasn't got the instance variable, given as string" do
+    matcher = HaveInstanceVariableMatcher.new('@bar')
+    matcher.matches?(@object).should be_false
+  end
+
+  it "does not match when object hasn't got the instance variable, given as symbol" do
+    matcher = HaveInstanceVariableMatcher.new(:@bar)
+    matcher.matches?(@object).should be_false
+  end
+
+  it "provides a failure message for #should" do
+    matcher = HaveInstanceVariableMatcher.new(:@bar)
+    matcher.matches?(@object)
+    matcher.failure_message.should == [
+      "Expected #{@object.inspect} to have instance variable '@bar'",
+      "but it does not"
+    ]
+  end
+
+  it "provides a failure messoge for #should_not" do
+    matcher = HaveInstanceVariableMatcher.new(:@bar)
+    matcher.matches?(@object)
+    matcher.negative_failure_message.should == [
+      "Expected #{@object.inspect} NOT to have instance variable '@bar'",
+      "but it does"
+    ]
+  end
+end
+
+describe HaveInstanceVariableMatcher, "on RUBY_VERSION < 1.9" do
+  before :all do
+    @ruby_version = Object.const_get :RUBY_VERSION
+    Object.const_set :RUBY_VERSION, '1.8.6'
+
+    @object = Object.new
+    def @object.instance_variables
+      ['@foo']
+    end
+  end
+
+  it_should_behave_like "have_instance_variable, on all Ruby versions"
+end
+
+describe HaveInstanceVariableMatcher, "on RUBY_VERSION >= 1.9" do
+  before :all do
+    @ruby_version = Object.const_get :RUBY_VERSION
+    Object.const_set :RUBY_VERSION, '1.9.0'
+
+    @object = Object.new
+    def @object.instance_variables
+      [:@foo]
+    end
+  end
+
+  it_should_behave_like "have_instance_variable, on all Ruby versions"
+end