mspec 1.5.17 → 1.5.18

data/lib/mspec/mocks/object.rb

@@ -18,6 +18,10 @@ class Object
     MockObject.new name, options
   end
 
+  def mock_int(val)
+    MockIntObject.new(val)
+  end
+
   def mock_numeric(name, options={})
     NumericMockObject.new name, options
   end

data/lib/mspec/mocks/proxy.rb

@@ -7,6 +7,7 @@ class MockObject
   def method_missing(sym, *args, &block)
     @null ? self : super
   end
+  private :method_missing
 end
 
 class NumericMockObject < Numeric
@@ -23,6 +24,29 @@ class NumericMockObject < Numeric
   end
 end
 
+class MockIntObject
+  def initialize(val)
+    @value = val
+    @calls = 0
+
+    key = [self, :to_int]
+
+    Mock.objects[key] = self
+    Mock.mocks[key] << self
+  end
+
+  attr_reader :calls
+
+  def to_int
+    @calls += 1
+    @value
+  end
+
+  def count
+    [:at_least, 1]
+  end
+end
+
 class MockProxy
   attr_reader :raising, :yielding
 
@@ -105,7 +129,8 @@ class MockProxy
   def with(*args)
     raise ArgumentError, "you must specify the expected arguments" if args.empty?
     @arguments = *args
-    if (behaves_like_ruby_1_9 = *[])
+    behaves_like_ruby_1_9 = *[]
+    if (behaves_like_ruby_1_9)
       @arguments = @arguments.first if @arguments.length <= 1
     end
     self

data/lib/mspec/runner/actions.rb

@@ -4,5 +4,4 @@ require 'mspec/runner/actions/filter'
 require 'mspec/runner/actions/tag'
 require 'mspec/runner/actions/taglist'
 require 'mspec/runner/actions/tagpurge'
-require 'mspec/runner/actions/debug'
 require 'mspec/runner/actions/gdb'

data/lib/mspec/runner/context.rb

@@ -197,24 +197,26 @@ class ContextState
 
       if protect "before :all", pre(:all)
         @examples.each do |state|
-          @state  = state
-          example = state.example
-          MSpec.actions :before, state
-
-          if protect "before :each", pre(:each)
-            MSpec.clear_expectations
-            if example
-              passed = protect nil, example
-              MSpec.actions :example, state, example
-              protect nil, @expectation_missing unless MSpec.expectation? or not passed
+          MSpec.repeat do
+            @state  = state
+            example = state.example
+            MSpec.actions :before, state
+
+            if protect "before :each", pre(:each)
+              MSpec.clear_expectations
+              if example
+                passed = protect nil, example
+                MSpec.actions :example, state, example
+                protect nil, @expectation_missing unless MSpec.expectation? or not passed
+              end
+              protect "after :each", post(:each)
+              protect "Mock.verify_count", @mock_verify
             end
-            protect "after :each", post(:each)
-            protect "Mock.verify_count", @mock_verify
-          end
 
-          protect "Mock.cleanup", @mock_cleanup
-          MSpec.actions :after, state
-          @state = nil
+            protect "Mock.cleanup", @mock_cleanup
+            MSpec.actions :after, state
+            @state = nil
+          end
         end
         protect "after :all", post(:all)
       else

data/lib/mspec/runner/formatters.rb

@@ -8,3 +8,5 @@ require 'mspec/runner/formatters/unit'
 require 'mspec/runner/formatters/spinner'
 require 'mspec/runner/formatters/method'
 require 'mspec/runner/formatters/yaml'
+require 'mspec/runner/formatters/profile'
+require 'mspec/runner/formatters/junit'

data/lib/mspec/runner/formatters/dotted.rb

@@ -14,6 +14,8 @@ class DottedFormatter
     else
       @out = File.open out, "w"
     end
+
+    @current_state = nil
   end
 
   # Creates the +TimerAction+ and +TallyAction+ instances and
@@ -28,6 +30,13 @@ class DottedFormatter
     MSpec.register :before,    self
     MSpec.register :after,     self
     MSpec.register :finish,    self
+    MSpec.register :abort,     self
+  end
+
+  def abort
+    if @current_state
+      puts " aborting example: #{@current_state.description}"
+    end
   end
 
   # Returns true if any exception is raised while running
@@ -47,7 +56,8 @@ class DottedFormatter
 
   # Callback for the MSpec :before event. Resets the
   # +#exception?+ and +#failure+ flags.
-  def before(state = nil)
+  def before(state=nil)
+    @current_state = state
     @failure = @exception = false
   end
 
@@ -68,6 +78,8 @@ class DottedFormatter
   #   F = An SpecExpectationNotMetError was raised
   #   E = Any exception other than SpecExpectationNotMetError
   def after(state = nil)
+    @current_state = nil
+
     unless exception?
       print "."
     else

data/lib/mspec/runner/formatters/junit.rb

@@ -0,0 +1,96 @@
+require 'mspec/expectations/expectations'
+require 'mspec/utils/ruby_name'
+require 'mspec/runner/formatters/yaml'
+
+class JUnitFormatter < YamlFormatter
+  def initialize(out=nil)
+    super
+    @tests = []
+  end
+
+  def after(state = nil)
+    super
+    @tests << {:test => state, :exception => false} unless exception?
+  end
+
+  def exception(exception)
+    super
+    @tests << {:test => exception, :exception => true}
+  end
+
+  def finish
+    switch
+
+    time = @timer.elapsed
+    tests = @tally.counter.examples
+    errors = @tally.counter.errors
+    failures = @tally.counter.failures
+
+    printf <<-XML
+
+<?xml version="1.0" encoding="UTF-8" ?>
+    <testsuites
+        testCount="#{tests}"
+        errorCount="#{errors}"
+        failureCount="#{failures}"
+        timeCount="#{time}" time="#{time}">
+      <testsuite
+          tests="#{tests}"
+          errors="#{errors}"
+          failures="#{failures}"
+          time="#{time}"
+          name="Spec Output For #{::RUBY_NAME} (#{::RUBY_VERSION})">
+    XML
+    @tests.each do |h|
+      description = encode_for_xml h[:test].description
+
+      printf <<-XML, "Spec", description, 0.0
+        <testcase classname="%s" name="%s" time="%f">
+      XML
+      if h[:exception]
+        outcome = h[:test].failure? ? "failure" : "error"
+        message = encode_for_xml h[:test].message
+        backtrace = encode_for_xml h[:test].backtrace
+        print <<-XML
+          <#{outcome} message="error in #{description}" type="#{outcome}">
+            #{message}
+            #{backtrace}
+          </#{outcome}>
+        XML
+      end
+      print <<-XML
+        </testcase>
+      XML
+    end
+
+    print <<-XML
+      </testsuite>
+    </testsuites>
+    XML
+  end
+
+  private
+  LT = "&lt;"
+  GT = "&gt;"
+  QU = "&quot;"
+  AP = "&apos;"
+  AM = "&amp;"
+  TARGET_ENCODING = "ISO-8859-1"
+
+  def encode_for_xml(str)
+    encode_as_latin1(str).gsub("<", LT).gsub(">", GT).
+      gsub('"', QU).gsub("'", AP).gsub("&", AM).
+      gsub(/[#{Regexp.escape("\0\1\2\3\4\5\6\7\8")}]/, "?")
+  end
+
+  if defined? Encoding
+    def encode_as_latin1(str)
+      str.encode(TARGET_ENCODING, :undef => :replace, :invalid => :replace)
+    end
+  else
+    require 'iconv'
+    def encode_as_latin1(str)
+      Iconv.conv("#{TARGET_ENCODING}//TRANSLIT//IGNORE", "UTF-8", str)
+    end
+  end
+end

data/lib/mspec/runner/formatters/profile.rb

@@ -0,0 +1,70 @@
+require 'mspec/expectations/expectations'
+require 'mspec/runner/formatters/dotted'
+
+class ProfileFormatter < DottedFormatter
+  def initialize(out=nil)
+    super
+
+    @describe_name = nil
+    @describe_time = nil
+    @describes = []
+    @its = []
+  end
+
+  def register
+    super
+    MSpec.register :enter, self
+  end
+
+  # Callback for the MSpec :enter event. Prints the
+  # +describe+ block string.
+  def enter(describe)
+    if @describe_time
+      @describes << [@describe_name, Time.now.to_f - @describe_time]
+    end
+
+    @describe_name = describe
+    @describe_time = Time.now.to_f
+  end
+
+  # Callback for the MSpec :before event. Prints the
+  # +it+ block string.
+  def before(state)
+    super
+
+    @it_name = state.it
+    @it_time = Time.now.to_f
+  end
+
+  # Callback for the MSpec :after event. Prints a
+  # newline to finish the description string output.
+  def after(state)
+    @its << [@describe_name, @it_name, Time.now.to_f - @it_time]
+    super
+  end
+
+  def finish
+    puts "\nProfiling info:"
+
+    desc = @describes.sort { |a,b| b.last <=> a.last }
+    desc.delete_if { |a| a.last <= 0.001 }
+    show = desc[0, 100]
+
+    puts "Top #{show.size} describes:"
+
+    show.each do |des, time|
+      printf "%3.3f - %s\n", time, des
+    end
+
+    its = @its.sort { |a,b| b.last <=> a.last }
+    its.delete_if { |a| a.last <= 0.001 }
+    show = its[0, 100]
+
+    puts "\nTop #{show.size} its:"
+    show.each do |des, it, time|
+      printf "%3.3f - %s %s\n", time, des, it
+    end
+
+    super
+  end
+end

data/lib/mspec/runner/mspec.rb

@@ -24,6 +24,7 @@ module MSpec
   @features     = {}
   @exception    = nil
   @randomize    = nil
+  @repeat       = nil
   @expectation  = nil
   @expectations = false
 
@@ -229,6 +230,16 @@ module MSpec
     @randomize == true
   end
 
+  def self.repeat=(times)
+    @repeat = times
+  end
+
+  def self.repeat
+    (@repeat || 1).times do
+      yield
+    end
+  end
+
   def self.shuffle(ary)
     return if ary.empty?
 

data/lib/mspec/runner/shared.rb

@@ -4,7 +4,7 @@ class Object
   def it_behaves_like(desc, meth, obj=nil)
     send :before, :all do
       @method = meth
-      @object = obj if obj
+      @object = obj
     end
 
     send :it_should_behave_like, desc.to_s

data/lib/mspec/utils/options.rb

@@ -215,6 +215,12 @@ class MSpecOptions
         config[:target] = 'ruby1.9'
       when 'x', 'rubinius'
         config[:target] = './bin/rbx'
+      when 'x18', 'rubinius18'
+        config[:target] = './bin/rbx -X18'
+      when 'x19', 'rubinius19'
+        config[:target] = './bin/rbx -X19'
+      when 'x20', 'rubinius20'
+        config[:target] = './bin/rbx -X20'
       when 'X', 'rbx'
         config[:target] = 'rbx'
       when 'j', 'jruby'
@@ -223,20 +229,26 @@ class MSpecOptions
         config[:target] = 'ir'
       when 'm','maglev'
         config[:target] = 'maglev-ruby'
+      when 't','topaz'
+        config[:target] = 'topaz'
       else
         config[:target] = t
       end
     end
 
     doc ""
-    doc "     r or ruby              invokes ruby in PATH"
-    doc "     r19, ruby19 or ruby1.9 invokes ruby1.9 in PATH"
-    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"
-    doc "     m or maglev            invokes maglev-ruby in PATH"
-    doc "     full path to EXE       invokes EXE directly\n"
+    doc "     r or ruby         invokes ruby in PATH"
+    doc "     r19, ruby19       invokes ruby1.9 in PATH"
+    doc "     x or rubinius     invokes ./bin/rbx"
+    doc "     x18 or rubinius18 invokes ./bin/rbx -X18"
+    doc "     x19 or rubinius19 invokes ./bin/rbx -X19"
+    doc "     x20 or rubinius20 invokes ./bin/rbx -X20"
+    doc "     X or rbx          invokes rbx in PATH"
+    doc "     j or jruby        invokes jruby in PATH"
+    doc "     i or ironruby     invokes ir in PATH"
+    doc "     m or maglev       invokes maglev-ruby in PATH"
+    doc "     t or topaz       invokes topaz 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|
@@ -276,6 +288,10 @@ class MSpecOptions
         config[:formatter] = MethodFormatter
       when 'y', 'yaml'
         config[:formatter] = YamlFormatter
+      when 'p', 'profile'
+        config[:formatter] = ProfileFormatter
+      when 'j', 'junit'
+        config[:formatter] = JUnitFormatter
       else
         puts "Unknown format: #{o}"
         puts @parser
@@ -292,7 +308,8 @@ class MSpecOptions
     doc "       m, summary               SummaryFormatter"
     doc "       a, *, spin               SpinnerFormatter"
     doc "       t, method                MethodFormatter"
-    doc "       y, yaml                  YamlFormatter\n"
+    doc "       y, yaml                  YamlFormatter"
+    doc "       j, junit                 JUnitFormatter\n"
 
     on("-o", "--output", "FILE",
        "Write formatter output to FILE") do |f|
@@ -378,6 +395,13 @@ class MSpecOptions
     end
   end
 
+  def repeat
+    on("-R", "--repeat", "NUMBER",
+       "Repeatedly run an example NUMBER times") do |o|
+      MSpec.repeat = o.to_i
+    end
+  end
+
   def verbose
     on("-V", "--verbose", "Output the name of each file processed") do
       obj = Object.new

data/lib/mspec/utils/ruby_name.rb

@@ -3,6 +3,6 @@ unless Object.const_defined?(:RUBY_NAME) and RUBY_NAME
     RUBY_NAME = RUBY_ENGINE
   else
     require 'rbconfig'
-    RUBY_NAME = Config::CONFIG["RUBY_INSTALL_NAME"] || Config::CONFIG["ruby_install_name"]
+    RUBY_NAME = RbConfig::CONFIG["RUBY_INSTALL_NAME"] || RbConfig::CONFIG["ruby_install_name"]
   end
 end