Updated MSpec source to �[33m4d5.

rubinius · Dec 26, 2015 · dfa4f06 · dfa4f06 · heftig · Dec 26, 2015
1 parent a2d2919
commit dfa4f06
Show file tree

Hide file tree

Showing 97 changed files with 834 additions and 865 deletions.
diff --git a/mspec/lib/mspec/commands/mspec.rb b/mspec/lib/mspec/commands/mspec.rb
@@ -37,10 +37,6 @@ def options(argv=ARGV)
 
     options.targets
 
-    options.on("-D", "--gdb", "Run under gdb") do
-      config[:use_gdb] = true
-    end
-
     options.on("-A", "--valgrind", "Run under valgrind") do
       config[:use_valgrind] = true
     end
@@ -162,12 +158,8 @@ def run
     else
       if config[:use_valgrind]
         more = ["--child-silent-after-fork=yes",
-                "--db-attach=#{config[:use_gdb] ? 'yes' : 'no'}",
                 config[:target]] + argv
         exec "valgrind", *more
-      elsif config[:use_gdb]
-        more = ["--args", config[:target]] + argv
-        exec "gdb", *more
       else
         cmd, *rest = config[:target].split(/\s+/)
         argv = rest + argv unless rest.empty?

diff --git a/mspec/lib/mspec/guards/block_device.rb b/mspec/lib/mspec/guards/block_device.rb
@@ -2,7 +2,7 @@
 
 class BlockDeviceGuard < SpecGuard
   def match?
-    platform_is_not :freebsd, :windows do
+    platform_is_not :freebsd, :windows, :opal do
       block = `find /dev /devices -type b 2> /dev/null`
       return !(block.nil? || block.empty?)
     end

diff --git a/mspec/lib/mspec/guards/platform.rb b/mspec/lib/mspec/guards/platform.rb
@@ -5,6 +5,10 @@ def self.windows?
     PlatformGuard.new(:os => :windows).match?
   end
 
+  def self.opal?
+    PlatformGuard.new(:opal)
+  end
+
   def initialize(*args)
     if args.last.is_a?(Hash)
       @options, @platforms = args.last, args[0..-2]

diff --git a/mspec/lib/mspec/helpers/environment.rb b/mspec/lib/mspec/helpers/environment.rb
@@ -2,27 +2,29 @@
 
 class Object
   def env
-    env = ""
     if PlatformGuard.windows?
-      env = Hash[*`cmd.exe /C set`.split("\n").map { |e| e.split("=", 2) }.flatten]
+      Hash[*`cmd.exe /C set`.split("\n").map { |e| e.split("=", 2) }.flatten]
+    elsif PlatformGuard.opal?
+      {}
     else
-      env = Hash[*`env`.split("\n").map { |e| e.split("=", 2) }.flatten]
+      Hash[*`env`.split("\n").map { |e| e.split("=", 2) }.flatten]
     end
-    env
   end
 
   def windows_env_echo(var)
-    `cmd.exe /C ECHO %#{var}%`.strip
+    platform_is_not :opal do
+      `cmd.exe /C ECHO %#{var}%`.strip
+    end
   end
 
   def username
-    user = ""
     if PlatformGuard.windows?
-      user = windows_env_echo('USERNAME')
+      windows_env_echo('USERNAME')
+    elsif PlatformGuard.opal?
+      ""
     else
-      user = `whoami`.strip
+      `whoami`.strip
     end
-    user
   end
 
   def home_directory
@@ -41,7 +43,10 @@ def dev_null
   def hostname
     commands = ['hostname', 'uname -n']
     commands.each do |command|
-      name = `#{command}`
+      name = ''
+      platform_is_not :opal do
+        name = `#{command}`
+      end
       return name.strip if $?.success?
     end
     raise Exception, "hostname: unable to find a working command"

diff --git a/mspec/lib/mspec/helpers/io.rb b/mspec/lib/mspec/helpers/io.rb
@@ -1,14 +1,36 @@
 require 'mspec/guards/feature'
 
-class IOStub < String
+class IOStub
+  def initialize
+    @buffer = []
+    @output = ''
+  end
+
   def write(*str)
     self << str.join
   end
 
+  def << str
+    @buffer << str
+    self
+  end
+
   def print(*str)
     write(str.join + $\.to_s)
   end
 
+  def method_missing(name, *args, &block)
+    to_s.send(name, *args, &block)
+  end
+
+  def == other
+    to_s == other
+  end
+
+  def =~ other
+    to_s =~ other
+  end
+
   def puts(*str)
     if str.empty?
       write "\n"
@@ -22,8 +44,21 @@ def printf(format, *args)
   end
 
   def flush
+    @output += @buffer.join('')
+    @buffer.clear
     self
   end
+
+  def to_s
+    flush
+    @output
+  end
+
+  alias_method :to_str, :to_s
+
+  def inspect
+    to_s.inspect
+  end
 end
 
 class Object

diff --git a/mspec/lib/mspec/helpers/mock_to_path.rb b/mspec/lib/mspec/helpers/mock_to_path.rb
@@ -1,6 +1,8 @@
+require 'mspec/mocks/proxy'
+
 class Object
   def mock_to_path(path)
-    obj = mock('path')
+    obj = MockObject.new('path')
     obj.should_receive(:to_path).and_return(path)
     obj
   end

diff --git a/mspec/lib/mspec/helpers/numeric.rb b/mspec/lib/mspec/helpers/numeric.rb
@@ -18,7 +18,7 @@ def bignum_value(plus=0)
   # values.
   guard = SpecGuard.new
 
-  if guard.standard? or guard.implementation? :topaz
+  if guard.standard? or guard.implementation? :topaz or guard.implementation? :opal
     if guard.wordsize? 32
       def fixnum_max()
         (2**30) - 1

diff --git a/mspec/lib/mspec/helpers/ruby_exe.rb b/mspec/lib/mspec/helpers/ruby_exe.rb
@@ -128,7 +128,9 @@ def ruby_exe(code, opts = {})
       end
 
       begin
-        `#{ruby_cmd(code, opts)}`
+        platform_is_not :opal do
+          `#{ruby_cmd(code, opts)}`
+        end
       ensure
         saved_env.each { |key, value| ENV[key] = value }
         env.keys.each do |key|
@@ -144,11 +146,16 @@ def ruby_cmd(code, opts = {})
 
     if code and not File.exist?(code)
       if opts[:escape]
-        code = "'#{code}'"
+        heredoc_separator = "END_OF_RUBYCODE"
+        lines = code.lines
+        until lines.none? {|line| line.start_with? heredoc_separator }
+          heredoc_separator << heredoc_separator
+        end
+
+        body = %Q!-e "$(cat <<'#{heredoc_separator}'\n#{code}\n#{heredoc_separator}\n)"!
       else
-        code = code.inspect
+        body = "-e #{code.inspect}"
       end
-      body = "-e #{code}"
     end
 
     [RUBY_EXE, ENV['RUBY_FLAGS'], opts[:options], body, opts[:args]].compact.join(' ')

diff --git a/mspec/lib/mspec/helpers/tmp.rb b/mspec/lib/mspec/helpers/tmp.rb
@@ -3,7 +3,7 @@
 # should clean up any temporary files created so that the temp
 # directory is empty when the process exits.
 
-SPEC_TEMP_DIR = "#{File.expand_path(Dir.pwd)}/rubyspec_temp"
+SPEC_TEMP_DIR = ENV["SPEC_TEMP_DIR"] || "#{File.expand_path(Dir.pwd)}/rubyspec_temp"
 
 SPEC_TEMP_UNIQUIFIER = "0"
 

diff --git a/mspec/lib/mspec/matchers.rb b/mspec/lib/mspec/matchers.rb
@@ -36,3 +36,4 @@
 require 'mspec/matchers/output_to_fd'
 require 'mspec/matchers/respond_to'
 require 'mspec/matchers/signed_zero'
+require 'mspec/matchers/block_caller'
diff --git a/mspec/lib/mspec/matchers/block_caller.rb b/mspec/lib/mspec/matchers/block_caller.rb
@@ -0,0 +1,34 @@
+class BlockingMatcher
+  def initialize(timeout = 0.1)
+    @timeout = timeout
+  end
+
+  def matches?(block)
+    blocking = true
+
+    thread = Thread.new do
+      block.call
+
+      blocking = false
+    end
+
+    thread.join(@timeout)
+    thread.kill
+
+    blocking
+  end
+
+  def failure_message
+    ['Expected the given Proc', 'to block the caller']
+  end
+
+  def negative_failure_message
+    ['Expected the given Proc', 'to not block the caller']
+  end
+end
+
+class Object
+  def block_caller(timeout = 0.1)
+    BlockingMatcher.new(timeout)
+  end
+end
diff --git a/mspec/lib/mspec/matchers/output.rb b/mspec/lib/mspec/matchers/output.rb
@@ -42,20 +42,20 @@ def failure_message
     expected_out = "\n"
     actual_out = "\n"
     unless @out.nil?
-      expected_out << "  $stdout: #{@out.inspect}\n"
-      actual_out << "  $stdout: #{@stdout.chomp.inspect}\n"
+      expected_out += "  $stdout: #{@out.inspect}\n"
+      actual_out += "  $stdout: #{@stdout.inspect}\n"
     end
     unless @err.nil?
-      expected_out << "  $stderr: #{@err.inspect}\n"
-      actual_out << "  $stderr: #{@stderr.chomp.inspect}\n"
+      expected_out += "  $stderr: #{@err.inspect}\n"
+      actual_out += "  $stderr: #{@stderr.inspect}\n"
     end
     ["Expected:#{expected_out}", "     got:#{actual_out}"]
   end
 
   def negative_failure_message
     out = ""
-    out << "  $stdout: #{@stdout.chomp.dump}\n" unless @out.nil?
-    out << "  $stderr: #{@stderr.chomp.dump}\n" unless @err.nil?
+    out += "  $stdout: #{@stdout.chomp.dump}\n" unless @out.nil?
+    out += "  $stderr: #{@stderr.chomp.dump}\n" unless @err.nil?
     ["Expected output not to be:\n", out]
   end
 end

diff --git a/mspec/lib/mspec/mocks/mock.rb b/mspec/lib/mspec/mocks/mock.rb
@@ -62,11 +62,11 @@ def self.install_method(obj, sym, type=nil)
       meta.__send__ :alias_method, key.first, sym
     end
 
-    meta.class_eval <<-END
-      def #{sym}(*args, &block)
-        Mock.verify_call self, :#{sym}, *args, &block
+    meta.class_eval {
+      define_method(sym) do |*args, &block|
+        Mock.verify_call self, sym, *args, &block
       end
-    END
+    }
 
     proxy = MockProxy.new type
 

diff --git a/mspec/lib/mspec/runner/actions.rb b/mspec/lib/mspec/runner/actions.rb
@@ -4,4 +4,3 @@
 require 'mspec/runner/actions/tag'
 require 'mspec/runner/actions/taglist'
 require 'mspec/runner/actions/tagpurge'
-require 'mspec/runner/actions/gdb'
diff --git a/mspec/lib/mspec/runner/actions/gdb.rb b/mspec/lib/mspec/runner/actions/gdb.rb
diff --git a/mspec/lib/mspec/runner/actions/timer.rb b/mspec/lib/mspec/runner/actions/timer.rb
@@ -5,11 +5,11 @@ def register
   end
 
   def start
-    @start = Time.now
+    @start = current_time
   end
 
   def finish
-    @stop = Time.now
+    @stop = current_time
   end
 
   def elapsed
@@ -19,4 +19,8 @@ def elapsed
   def format
     "Finished in %f seconds" % elapsed
   end
+
+  def current_time
+    Time.now
+  end
 end
diff --git a/mspec/lib/mspec/runner/context.rb b/mspec/lib/mspec/runner/context.rb
@@ -6,7 +6,7 @@
 #--
 # A note on naming: this is named _ContextState_ rather
 # than _DescribeState_ because +describe+ is the keyword
-# in the DSL for refering to the context in which an example
+# in the DSL for referring to the context in which an example
 # is evaluated, just as +it+ refers to the example itself.
 #++
 class ContextState

diff --git a/mspec/lib/mspec/runner/exception.rb b/mspec/lib/mspec/runner/exception.rb
@@ -6,8 +6,8 @@ def initialize(state, location, exception)
 
     @description = location ? "An exception occurred during: #{location}" : ""
     if state
-      @description << "\n" unless @description.empty?
-      @description << state.description
+      @description += "\n" unless @description.empty?
+      @description += state.description
       @describe = state.describe
       @it = state.it
     else