opal 0.10.6 → 0.11.0.rc1

data/stdlib/nodejs/kernel.rb

@@ -3,7 +3,7 @@
 module Kernel
   NODE_REQUIRE = `require`
 
-  def caller
+  def caller(*args)
     %x{
       var stack;
       try {
@@ -24,6 +24,7 @@ end
 ARGV = `process.argv.slice(2)`
 
 ENV = Object.new
+
 def ENV.[]= name, value
   `process.env[#{name.to_s}] = #{value.to_s}`
 end
@@ -31,3 +32,4 @@ end
 def ENV.[] name
   `process.env[#{name}] || nil`
 end
+

data/stdlib/nodejs/package.json

@@ -1,6 +1,5 @@
 {
   "dependencies": {
     "glob": "latest",
-    "js-yaml": "latest"
   }
 }

data/stdlib/nodejs/stacktrace.rb

@@ -0,0 +1,163 @@
+# SOURCE: https://raw.githubusercontent.com/RReverser/stack-displayname/13732cedc506200ee8465edcbfce00a9e914853c/displayName.js
+
+# Copyright 2014 Ingvar Stepanyan
+#
+# Copyright 2006-2011, the V8 project authors. All rights reserved.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+#       copyright notice, this list of conditions and the following
+#       disclaimer in the documentation and/or other materials provided
+#       with the distribution.
+#     * Neither the name of Google Inc. nor the names of its
+#       contributors may be used to endorse or promote products derived
+#       from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+%x{
+  (function () {
+
+  if (!Error.captureStackTrace) {
+  	return;
+  }
+
+  var ObjectToString = Object.prototype.toString;
+
+  var NODE = ObjectToString.call(this.process) === "[object process]";
+
+  // https://github.com/v8/v8/blob/cab94bbe3d532d85705950ed049a294050fcb4c9/src/messages.js#L1112-L1124 [converted to JS]
+  function GetTypeName(receiver, requireConstructor) {
+  	var constructor = receiver.constructor;
+  	if (!constructor) {
+  		return requireConstructor ? null : ObjectToString.call(receiver);
+  	}
+  	var constructorName = constructor.name;
+  	if (!constructorName) {
+  		return requireConstructor ? null : ObjectToString.call(receiver);
+  	}
+  	return constructorName;
+  }
+
+  // https://github.com/v8/v8/blob/cab94bbe3d532d85705950ed049a294050fcb4c9/src/messages.js#L917-L981 [converted & modified]
+  function CallSiteToString() {
+  	var fileName;
+  	var fileLocation = "";
+  	if (this.isNative()) {
+  		fileLocation = "native";
+  	} else {
+  		fileName = this.getScriptNameOrSourceURL();
+  		if (!fileName && this.isEval()) {
+  			fileLocation = this.getEvalOrigin();
+  			fileLocation += ", "; // Expecting source position to follow.
+  		}
+
+  		if (fileName) {
+  			fileLocation += fileName;
+  		} else {
+  			// Source code does not originate from a file and is not native, but we
+  			// can still get the source position inside the source string, e.g. in
+  			// an eval string.
+  			fileLocation += "<anonymous>";
+  		}
+  		var lineNumber = this.getLineNumber();
+  		if (lineNumber !== null) {
+  			fileLocation += ":" + lineNumber;
+  			var columnNumber = this.getColumnNumber();
+  			if (columnNumber) {
+  				fileLocation += ":" + columnNumber;
+  			}
+  		}
+  	}
+
+  	var line = "";
+  	var func = this.getFunction();
+  	var customName = func.displayName;
+  	if (NODE && customName) {
+  		customName = "\x1B[32m" + customName + "\x1B[39m";
+  	}
+  	var functionName = customName || this.getFunctionName();
+  	var addSuffix = true;
+  	var isConstructor = this.isConstructor();
+  	var isMethodCall = !(this.isToplevel() || isConstructor);
+  	if (isMethodCall) {
+  		var typeName = GetTypeName(this.receiver, true);
+  		var methodName = this.getMethodName();
+  		if (functionName) {
+  			if (!customName && typeName && functionName.indexOf(typeName) !== 0) {
+  				line += typeName + ".";
+  			}
+  			line += functionName;
+  			if (methodName && functionName.indexOf("." + methodName) !== functionName.length - methodName.length - 1) {
+  				line += " [as " + methodName + "]";
+  			}
+  		} else {
+  			line += typeName + "." + (methodName || "<anonymous>");
+  		}
+  	} else if (isConstructor) {
+  		line += "new " + (functionName || "<anonymous>");
+  	} else if (functionName) {
+  		line += functionName;
+  	} else {
+  		line += fileLocation;
+  		addSuffix = false;
+  	}
+  	if (addSuffix) {
+  		line += " (" + fileLocation + ")";
+  	}
+  	return line;
+  }
+
+  var ErrorToString = Error.prototype.toString;
+
+  // https://github.com/v8/v8/blob/cab94bbe3d532d85705950ed049a294050fcb4c9/src/messages.js#L1042-L1052 [converted]
+  function FormatErrorString(error) {
+  	try {
+  		return ErrorToString.call(error);
+  	} catch (e) {
+  		try {
+  			return "<error: " + e + ">";
+  		} catch (ee) {
+  			return "<error>";
+  		}
+  	}
+  }
+
+  // https://github.com/v8/v8/blob/cab94bbe3d532d85705950ed049a294050fcb4c9/src/messages.js#L1091-L1108 [logic duplicated]
+  Error.prepareStackTrace = function (error, frames) {
+  	var lines = [];
+  	lines.push(FormatErrorString(error));
+  	for (var i = 0; i < frames.length; i++) {
+  		var frame = frames[i];
+  		var line;
+  		try {
+  			line = CallSiteToString.call(frame);
+  		} catch (e) {
+  			try {
+  				line = "<error: " + e + ">";
+  			} catch (ee) {
+  				// Any code that reaches this point is seriously nasty!
+  				line = "<error>";
+  			}
+  		}
+  		lines.push("    at " + line);
+  	}
+  	return lines.join("\n");
+  };
+
+  })();
+}

data/stdlib/nodejs/yaml.rb

@@ -1,7 +1,8 @@
 require 'native'
+require_relative './js-yaml-3-6-1'
 
 module YAML
-  @__yaml__ = node_require 'js-yaml'
+  @__yaml__ = `jsyaml`
   `var __yaml__ = #{@__yaml__}`
 
   def self.load_path path

data/stdlib/opal-platform.rb

@@ -0,0 +1,15 @@
+phantomjs = `typeof(callPhantom) !== "undefined"`
+browser   = `typeof(document) !== "undefined"`
+node      = `typeof(process) !== "undefined" && process.versions && process.versions.node`
+nashorn   = `typeof(Java) !== "undefined" && Java.type`
+
+case
+when nashorn
+  OPAL_PLATFORM = 'nashorn'
+when phantomjs
+  OPAL_PLATFORM = 'phantomjs'
+when node
+  OPAL_PLATFORM = 'nodejs'
+else # possibly browser, which is the primary target
+  OPAL_PLATFORM = nil
+end

data/stdlib/opal/platform.rb

@@ -1,19 +1,11 @@
-phantomjs = `typeof(callPhantom) !== "undefined"`
-browser   = `typeof(document) !== "undefined"`
-node      = `typeof(process) !== "undefined" && process.versions && process.versions.node`
-nashorn   = `typeof(Java) !== "undefined" && Java.type`
+require 'opal-platform'
 
-case
-when nashorn
-  OPAL_PLATFORM = 'nashorn'
+case OPAL_PLATFORM
+when 'nashorn'
   require 'nashorn'
-when phantomjs
-  OPAL_PLATFORM = 'phantomjs'
+when 'phantomjs'
   require 'phantomjs'
-when node
-  OPAL_PLATFORM = 'nodejs'
+when 'nodejs'
   require 'nodejs/kernel'
   require 'nodejs/io'
-else # browser, which is the primary target
-  # noop
 end

data/stdlib/pathname.rb

@@ -110,7 +110,7 @@ class Pathname
       basename_list2.shift
     end
     r1 = chop_basename(prefix1)
-    if !r1 && /#{SEPARATOR_PAT}/o =~ File.basename(prefix1)
+    if !r1 && /#{SEPARATOR_PAT}/ =~ File.basename(prefix1)
       while !basename_list2.empty? && basename_list2.first == '..'
         index_list2.shift
         basename_list2.shift

data/stdlib/strscan.rb

@@ -244,6 +244,16 @@ class StringScanner
     @working = `#{@string}.slice(pos)`
   end
 
+  def matched_size
+    %x{
+      if (#@matched === nil) {
+        return nil;
+      }
+
+      return #@matched.length
+    }
+  end
+
   def post_match
     %x{
       if (#@matched === nil) {
@@ -297,6 +307,10 @@ class StringScanner
 
 private
   def anchor(pattern)
-    `new RegExp('^(?:' + pattern.toString().substr(1, pattern.toString().length - 2) + ')')`
+    %x{
+      var flags = pattern.toString().match(/\/([^\/]+)$/);
+      flags = flags ? flags[1] : undefined;
+      return new RegExp('^(?:' + pattern.source + ')', flags);
+    }
   end
 end

data/stdlib/yaml.rb

@@ -1 +1 @@
-require 'nodejs/yaml' if defined? NodeJS
+warn "REMOVED: use `require 'nodejs/yaml'` instead"

data/tasks/benchmarking.rake

@@ -85,4 +85,13 @@ namespace :bench do
       printf fmt, *row
     end
   end
+
+  task :ips do
+    files = Dir[ENV['FILE'] || "#{__dir__}/benchmark-ips/bm_*.rb"]
+    raise ArgumentError, "no files provided" if files.empty?
+    puts "=== Files: #{files.join ', '}"
+    files.each do |bm_path|
+      sh "bundle exec opal -ropal/platform -gbenchmark-ips -rbenchmark/ips -A #{bm_path}"
+    end
+  end
 end

data/tasks/building.rake

@@ -12,42 +12,46 @@ Example: rake dist DIR=cdn/opal/master
 DESC
 task :dist do
   require 'opal/util'
-  require 'opal/sprockets/environment'
+  require 'opal/config'
 
   Opal::Config.arity_check_enabled = false
   Opal::Config.const_missing_enabled = false
   Opal::Config.dynamic_require_severity = :warning
-  env = Opal::Environment.new
 
   # Hike gem is required to build opal-builder
-  # Without this linen the build throws an exception: "Sprockets::FileNotFound: couldn't find file 'hike' with type 'application/javascript'"
-  env.use_gem 'hike'
+  Opal.use_gem 'hike'
 
   build_dir = ENV['DIR'] || 'build'
   files     = ENV['FILES'] ? ENV['FILES'].split(',') :
               Dir['{opal,stdlib}/*.rb'].map { |lib| File.basename(lib, '.rb') }
 
-  Dir.mkdir build_dir unless File.directory? build_dir
+  mkdir_p build_dir unless File.directory? build_dir
   width = files.map(&:size).max
 
-  files.each do |lib|
-    print "* building #{lib}...".ljust(width+'* building ... '.size)
-    $stdout.flush
+  files.map do |lib|
+    Thread.new {
+      log = ''
+      log << "* building #{lib}...".ljust(width+'* building ... '.size)
+      $stdout.flush
 
-    src = env[lib].to_s
-    min = Opal::Util.uglify src
-    gzp = Opal::Util.gzip min
+      # Set requirable to true to be consistent with previous builds, generated
+      # with sprockets.
+      src = Opal::Builder.build(lib, requirable: true).to_s
+      min = Opal::Util.uglify src
+      gzp = Opal::Util.gzip min
 
-    File.open("#{build_dir}/#{lib}.js", 'w+')        { |f| f << src }
-    File.open("#{build_dir}/#{lib}.min.js", 'w+')    { |f| f << min } if min
-    File.open("#{build_dir}/#{lib}.min.js.gz", 'w+') { |f| f << gzp } if gzp
+      File.open("#{build_dir}/#{lib}.js", 'w+')        { |f| f << src }
+      File.open("#{build_dir}/#{lib}.min.js", 'w+')    { |f| f << min } if min
+      File.open("#{build_dir}/#{lib}.min.js.gz", 'w+') { |f| f << gzp } if gzp
 
-    print "done. ("
-    print "development: #{('%.2f' % (src.size/1000.0)).rjust(6)}KB"
-    print  ", minified: #{('%.2f' % (min.size/1000.0)).rjust(6)}KB" if min
-    print   ", gzipped: #{('%.2f' % (gzp.size/1000.0)).rjust(6)}KB" if gzp
-    puts  ")."
-  end
+      log << "done. ("
+      log << "development: #{('%.2f' % (src.size/1000.0)).rjust(7)}KB"
+      log <<  ", minified: #{('%.2f' % (min.size/1000.0)).rjust(7)}KB" if min
+      log <<   ", gzipped: #{('%.2f' % (gzp.size/1000.0)).rjust(7)}KB" if gzp
+      log << ")."
+      log
+    }
+  end.map(&:value).map(&method(:puts))
 end
 
 desc 'Rebuild grammar.rb for opal parser'

data/tasks/linting.rake

@@ -1,18 +1,29 @@
-directory 'tmp/lint'
-
 desc "Build *corelib* and *stdlib* and lint the result"
-task :lint => 'tmp/lint' do
-  require 'opal/sprockets/environment'
-
-  env = Opal::Environment.new
+task :jshint do
+  dir = 'tmp/lint'
+  puts
+  puts "= Checking distributed files..."
+  unless ENV['SKIP_BUILD']
+    rm_rf dir if File.exist? dir
+    sh "bundle exec rake dist DIR=#{dir}"
+  end
 
-  files = Dir['{opal,stdlib}/*.rb'].map { |lib| File.basename(lib, '.rb') }
+  Dir["#{dir}/*.js"].each {|path|
+    # opal-builder and opal-parser take so long travis stalls
+    next if path =~ /.min.js\z|opal-builder|opal-parser/
 
-  files.each do |lib|
-    next if lib == 'minitest'
-    File.binwrite("tmp/lint/#{lib}.js", env[lib].to_s)
+    sh "jshint --verbose #{path}"
+  }
+  puts
+  puts "= Checking corelib files separately..."
+  js_paths = []
+  Dir['opal/{opal,corelib}/*.rb'].each do |path|
+    js_path = "#{dir}/#{path.tr('/', '-')}.js"
+    sh "bundle exec opal -Dignore -cEO #{path} > #{js_path}"
+    js_paths << js_path
   end
-
-  sh "jshint --verbose tmp/lint/*.js"
+  js_paths.each do |js_path|
+    sh "jshint --verbose #{js_path}"
+  end
+  sh "jshint --verbose opal/corelib/runtime.js"
 end
-

data/tasks/testing.rake

@@ -1,112 +1,234 @@
-# Remove when we drop support for 1.9.3
-__dir__ = defined?(Kernel.__dir__) ? Kernel.__dir__ : File.dirname(File.realpath(__FILE__))
-
-require "#{__dir__}/testing/mspec_special_calls"
-
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:rspec) do |t|
   t.pattern = 'spec/lib/**/*_spec.rb'
 end
 
-module MSpecSuite
+module Testing
   extend self
 
-  def stubs
-    %w[
-      mspec/helpers/tmp
-      mspec/helpers/environment
-      mspec/guards/block_device
-      mspec/guards/endian
-      a_file
-      lib/spec_helper
-    ]
+  def get_random_seed(env)
+    random_seed = env['RANDOM_SEED'] ? env['RANDOM_SEED'] : rand(100_000)
+    puts "export RANDOM_SEED=#{random_seed} # to re-use the same randomization"
+    random_seed
   end
 
-  def specs(env = ENV)
-    suite = env['SUITE']
-    pattern = env['PATTERN']
-    whitelist_pattern = !!env['RUBYSPECS']
-
-    excepting = []
-    rubyspecs = File.read('spec/ruby_specs').lines.reject do |l|
-      l.strip!
-      l.start_with?('#') || l.empty? || (l.start_with?('!') && excepting.push(l.sub('!', 'spec/') + '.rb'))
-    end.flat_map do |path|
-      path = "spec/#{path}"
-      File.directory?(path) ? Dir[path+'/*.rb'] : "#{path}.rb"
-    end - excepting
-
-    opalspecs = Dir['spec/{opal,lib/parser}/**/*_spec.rb'] + ['spec/lib/lexer_spec.rb', 'spec/lib/compiler_spec.rb']
-    userspecs = Dir[pattern] if pattern
-    userspecs &= rubyspecs if whitelist_pattern
-
-    opalspec_filters = Dir['spec/filters/**/*_opal.rb']
-
-    if ENV['INVERT_RUNNING_MODE']
-      # When we run an inverted test suite we should run only 'bugs'.
-      # Unsupported features are not supported anyway
-      rubyspec_filters = Dir['spec/filters/bugs/*.rb'] - opalspec_filters
-    else
-      rubyspec_filters = Dir['spec/filters/**/*.rb'] - opalspec_filters
+  module MSpec
+    extend self
+
+    def stubs
+      %w[
+        mspec/helpers/tmp
+        mspec/helpers/environment
+        mspec/guards/block_device
+        mspec/guards/endian
+        a_file
+        lib/spec_helper
+        mspec/commands/mspec-run
+      ]
     end
 
-    specs = []
-    add_specs = ->(name, new_specs) do
-      puts "Adding #{new_specs.size.to_s.rjust(3)} files (#{name})"
-      specs += new_specs
+    def specs(env = ENV)
+      suite = env['SUITE']
+      pattern = env['PATTERN']
+      whitelist_pattern = !!env['RUBYSPECS']
+
+      excepting = []
+      rubyspecs = File.read('spec/ruby_specs').lines.reject do |l|
+        l.strip!
+        l.start_with?('#') || l.empty? || (l.start_with?('!') && excepting.push(l.sub('!', 'spec/') + '.rb'))
+      end.flat_map do |path|
+        path = "spec/#{path}"
+        File.directory?(path) ? Dir[path+'/*.rb'] : "#{path}.rb"
+      end - excepting
+
+      opalspecs = Dir['spec/{opal,lib/parser}/**/*_spec.rb']
+      userspecs = Dir[pattern] if pattern
+      userspecs &= rubyspecs if whitelist_pattern
+
+      specs = []
+      add_specs = ->(name, new_specs) do
+        puts "Adding #{new_specs.size.to_s.rjust(3)} files (#{name})"
+        specs += new_specs
+      end
+
+      if pattern
+        add_specs["PATTERN=#{pattern}", userspecs.sort]
+      elsif suite == 'opal'
+        add_specs['spec/opal', opalspecs.sort]
+      elsif suite == 'ruby'
+        add_specs['spec/ruby', rubyspecs.sort]
+      else
+        warn 'Please provide at lease one of the following environment variables:'
+        warn 'PATTERN # e.g. PATTERN=spec/ruby/core/numeric/**_spec.rb'
+        warn 'SUITE   # can be either SUITE=opal or SUITE=ruby'
+        exit 1
+      end
+
+      specs
     end
 
-    # Filters must be added first
-    suite_filters = suite == 'opal' ? opalspec_filters : rubyspec_filters
-    add_specs["#{suite} filters", suite_filters]
-
-    if pattern
-      add_specs["PATTERN=#{pattern}", userspecs]
-    elsif suite == 'opal'
-      add_specs['spec/opal', opalspecs]
-    elsif suite == 'ruby'
-      add_specs['spec/ruby', rubyspecs]
-    else
-      warn 'Please provide at lease one of the following environment variables:'
-      warn 'PATTERN # e.g. PATTERN=spec/ruby/core/numeric/**_spec.rb'
-      warn 'SUITE   # can be either SUITE=opal or SUITE=ruby'
-      exit 1
+    def filters(suite)
+      opalspec_filters = Dir['spec/filters/**/*_opal.rb']
+
+      if ENV['INVERT_RUNNING_MODE']
+        # When we run an inverted test suite we should run only 'bugs'.
+        # Unsupported features are not supported anyway
+        rubyspec_filters = Dir['spec/filters/bugs/*.rb'] - opalspec_filters
+      else
+        rubyspec_filters = Dir['spec/filters/**/*.rb'] - opalspec_filters
+      end
+
+      suite == 'opal' ? opalspec_filters : rubyspec_filters
     end
 
-    specs
-  end
+    def write_file(filename, filters, specs, env)
+      bm_filepath = env['BM_FILEPATH']
+
+      [filters, specs].each do |files|
+        files.map! { |s| "'#{s.sub(/^spec\//,'')}'" }
+      end
+
+      filter_requires = filters.map { |s| "require #{s}" }.join("\n")
+      spec_requires = specs.map { |s| "requirable_spec_file #{s}" }.join("\n")
+      spec_registration = specs.join(",\n  ")
+
+      if bm_filepath
+        enter_benchmarking_mode = "OpalBM.main.register(#{Integer(env['BM'])}, '#{bm_filepath}')"
+      end
+
+      random_seed = Testing.get_random_seed(env)
 
-  def write_file(filename, specs, bm_filepath = nil)
-    requires = specs.map{|s| "require '#{s.sub(/^spec\//,'')}'"}
+      env_data = env.map{ |k,v| "ENV[#{k.inspect}] = #{v.to_s.inspect}" unless v.nil? }.join("\n")
 
-    if bm_filepath
-      enter_benchmarking_mode = "OSpecRunner.main.bm!(#{Integer(ENV['BM'])}, '#{bm_filepath}')"
+      File.write filename, <<-RUBY
+        require 'opal/platform' # in node ENV is replaced
+        #{env_data}
+
+        require 'spec_helper'
+        require 'opal/full'
+        #{enter_benchmarking_mode}
+
+        #{filter_requires}
+
+        #{spec_requires}
+
+        MSpec.register_files [
+          #{spec_registration}
+        ]
+
+        srand(#{random_seed})
+        MSpec.randomize(true)
+
+        MSpec.process
+        OSpecFilter.main.unused_filters_message(list: #{!!ENV['LIST_UNUSED_FILTERS']})
+        exit MSpec.exit_code
+      RUBY
+    end
+
+    def bm_filepath
+      mkdir_p 'tmp/bench'
+      index = 0
+      begin
+        index += 1
+        filepath = "tmp/bench/Spec#{index}"
+      end while File.exist?(filepath)
+      filepath
     end
+  end
+
+  module Minitest
+    extend self
+
+    def write_file(filename, files = [], env = {})
+      env_data = env.map{ |k,v| "ENV[#{k.inspect}] = #{v.to_s.inspect}" unless v.nil? }.join("\n")
+      requires = files.map{|f| "require '#{f}'"}
+      mkdir_p File.dirname(filename)
 
-    File.write filename, <<-RUBY
-      require 'spec_helper'
-      require 'opal/platform'
-      require 'opal/full'
-      OSpecRunner.main.will_start
-      #{enter_benchmarking_mode}
-      #{requires.join("\n    ")}
-      OSpecFilter.main.unused_filters_message(list: #{!!ENV['LIST_UNUSED_FILTERS']})
-      OSpecRunner.main.did_finish
-      exit MSpec.exit_code
-    RUBY
+      random_seed = Testing.get_random_seed(env)
+
+      File.write filename, <<-RUBY
+        require 'opal/platform' # in node ENV is replaced
+        require 'opal-parser'
+        #{env_data}
+        srand(#{random_seed})
+
+        #{requires.join("\n")}
+      RUBY
+    end
   end
 
-  def bm_filepath
-    mkdir_p 'tmp/bench'
-    index = 0
-    begin
-      index += 1
-      filepath = "tmp/bench/Spec#{index}"
-    end while File.exist?(filepath)
-    filepath
+  class SauceLabs
+    include FileUtils
+
+    def initialize(options = {})
+      @host = options.fetch(:host, '127.0.0.1')
+      @port = options.fetch(:port, '3000')
+      @username = options.fetch(:username)
+      @access_key = options.fetch(:access_key)
+      @tunnel = options.fetch(:tunnel, nil)
+    end
+    attr_reader :host, :port, :username, :access_key, :tunnel
+
+    def with_server
+      cd 'examples/rack'
+      system 'bundle install' or raise 'bundle install failed'
+      begin
+        server = Process.spawn "bundle exec rackup --host #{host} --port #{port}"
+        puts 'Waiting for server…'
+        sleep 0.1 until system "curl -s 'http://#{host}:#{port}/' > /dev/null"
+        puts 'Server ready.'
+        yield self
+      ensure
+        Process.kill(:TERM, server)
+        Process.wait(server)
+      end
+    end
+
+    def on_platform(options = {})
+      browser = options.fetch(:browser)
+      version = options.fetch(:version)
+      platform = options.fetch(:platform, nil)
+      device = options.fetch(:device, nil)
+
+      puts "=============== Testing on browser: #{browser} v#{version} #{"(#{platform})" if platform}"
+      require "selenium/webdriver"
+
+      caps = {}
+      caps[:platform]           = platform if platform
+      caps[:browserName]        = browser if browser
+      caps[:version]            = version if version
+      caps[:device]             = device if device
+      caps['tunnel-identifier'] = tunnel if tunnel
+
+      driver = Selenium::WebDriver.for(
+        :remote,
+        url: "http://#{username}:#{access_key}@localhost:4445/wd/hub",
+        desired_capabilities: caps
+      )
+
+      driver.get("http://#{host}:#{port}/")
+      yield driver
+      driver.quit
+    end
+
+    def test_title(driver)
+      if (title = driver.title) == 'Bob is authenticated'
+        puts "SUCCESS! title of webpage is: #{title}"
+      else
+        raise "FAILED! title of webpage is: #{title}"
+      end
+    end
+
+    def run(**options)
+      on_platform(**options) do |driver|
+        test_title(driver)
+      end
+    end
   end
+
 end
 
+
 pattern_usage = <<-DESC
 Use PATTERN environment variable to manually set the glob for specs:
 
@@ -116,54 +238,29 @@ Use PATTERN environment variable to manually set the glob for specs:
   bundle exec rake mspec_node PATTERN=spec/ruby/core/numeric/**_spec.rb
 DESC
 
-%w[ruby opal].each do |suite|
-  desc "Run the MSpec/#{suite} test suite on Opal::Sprockets/phantomjs" + pattern_usage
-  task :"mspec_#{suite}_sprockets_phantomjs" do
-    filename = File.expand_path('tmp/mspec_sprockets_phantomjs.rb')
-    runner   = "#{__dir__}/testing/sprockets-phantomjs.js"
-    port     = 9999
-    url      = "http://localhost:#{port}/"
-
-    mkdir_p File.dirname(filename)
-    MSpecSuite.write_file filename, MSpecSuite.specs(ENV.to_hash.merge 'SUITE' => suite)
-
-    MSpecSuite.stubs.each {|s| ::Opal::Config.stubbed_files << s }
-
-    Opal::Config.arity_check_enabled = true
-    Opal::Config.freezing_stubs_enabled = true
-    Opal::Config.tainting_stubs_enabled = false
-    Opal::Config.dynamic_require_severity = :warning
-
-    Opal.use_gem 'mspec'
-    Opal.append_path 'spec'
-    Opal.append_path 'lib'
-    Opal.append_path File.dirname(filename)
-
-    app = Opal::Server.new { |s| s.main = File.basename(filename) }
-    server = Thread.new { Rack::Server.start(app: app, Port: port) }
-    sleep 1
-
-    begin
-      sh 'phantomjs', runner, url
-    ensure
-      server.kill if server.alive?
-    end
-  end
+platforms = %w[nodejs phantomjs server]
+mspec_suites = %w[ruby opal]
+minitest_suites = %w[cruby]
 
-  %w[nodejs phantomjs].each do |platform|
+platforms.each do |platform|
+  mspec_suites.each do |suite|
     desc "Run the MSpec test suite on Opal::Builder/#{platform}" + pattern_usage
     task :"mspec_#{suite}_#{platform}" do
-      include_paths = '-Ispec -Ilib'
-
       filename = "tmp/mspec_#{platform}.rb"
       mkdir_p File.dirname(filename)
-      bm_filepath = MSpecSuite.bm_filepath if ENV['BM']
-      MSpecSuite.write_file filename, MSpecSuite.specs(ENV.to_hash.merge 'SUITE' => suite), bm_filepath
+      bm_filepath = Testing::MSpec.bm_filepath if ENV['BM']
+      specs_env = {
+        'SUITE' => suite,
+        'FORMATTER' => platform, # Use the current platform as the default formatter
+        'BM_FILEPATH' => bm_filepath,
+      }.merge(ENV.to_hash)
+
+      Testing::MSpec.write_file filename, Testing::MSpec.filters(suite), Testing::MSpec.specs(specs_env), specs_env
 
-      stubs = MSpecSuite.stubs.map{|s| "-s#{s}"}.join(' ')
+      stubs = Testing::MSpec.stubs.map{|s| "-s#{s}"}.join(' ')
 
       sh "ruby -rbundler/setup -r#{__dir__}/testing/mspec_special_calls "\
-         "bin/opal -gmspec #{include_paths} #{stubs} -R#{platform} -Dwarning -A #{filename}"
+         "bin/opal -gmspec -Ispec -Ilib #{stubs} -R#{platform} -Dwarning -A --enable-source-location #{filename}"
 
       if bm_filepath
         puts "Benchmark results have been written to #{bm_filepath}"
@@ -171,100 +268,120 @@ DESC
       end
     end
   end
-end
 
-task :mspec_phantomjs           => [:mspec_opal_phantomjs,           :mspec_ruby_phantomjs]
-task :mspec_nodejs              => [:mspec_opal_nodejs,              :mspec_ruby_nodejs]
-task :mspec_sprockets_phantomjs => [:mspec_opal_sprockets_phantomjs, :mspec_ruby_sprockets_phantomjs]
+  minitest_suites.each do |suite|
+    task :"minitest_#{suite}_#{platform}" do
+      if ENV.key? 'FILES'
+        files = Dir[ENV['FILES']]
+        includes = "-Itmp"
+      else
+        includes = "-Itest/cruby/test"
+        files = %w[
+          benchmark/test_benchmark.rb
+          ruby/test_call.rb
+          opal/test_keyword.rb
+          base64/test_base64.rb
+          opal/unsupported_and_bugs.rb
+        ]
+      end
 
-task :jshint do
-  js_filename = 'tmp/jshint.js'
-  mkdir_p 'tmp'
+      filename = "tmp/minitest_#{suite}_#{platform}.rb"
+      Testing::Minitest.write_file(filename, files, ENV)
 
-  if ENV['SUITE'] == 'core'
-    sh "ruby -rbundler/setup bin/opal -ce '23' > #{js_filename}"
-    sh "jshint --verbose #{js_filename}"
-  elsif ENV['SUITE'] == 'stdlib'
-    sh "rake dist"
+      stubs = "-soptparse -sio/console -stimeout -smutex_m -srubygems -stempfile -smonitor"
+      includes = "-Itest -Ilib -Ivendored-minitest #{includes}"
 
-    Dir["build/*.js"].each {|path|
-      unless path =~ /(opal.*js)|.min.js/
-        sh "jshint --verbose #{path}"
-      end
-    }
-  else
-    warn 'Please provide at lease one of the following ENV vars:'
-    warn 'SUITE   # can be either SUITE=core or SUITE=stdlib'
-    exit 1
+      sh "ruby -rbundler/setup "\
+         "bin/opal -ghike #{includes} #{stubs} -R#{platform} -Dwarning -A --enable-source-location #{filename}"
+    end
   end
 end
 
+# The name ends with the platform, which is of course mandated in this case
+task :minitest_node_nodejs do
+  Opal.use_gem 'hike'
+
+  platform = 'nodejs'
+  suite = 'node'
+  files = %w[
+    nodejs
+    opal-parser
+    nodejs/test_file.rb
+    nodejs/test_dir.rb
+    nodejs/test_io.rb
+    nodejs/test_opal_builder.rb
+  ]
+
+  filename = "tmp/minitest_node_nodejs.rb"
+  Testing::Minitest.write_file(filename, files, ENV)
+
+  stubs = "-soptparse -sio/console -stimeout -smutex_m -srubygems -stempfile -smonitor"
+  includes = "-Itest -Ilib -Ivendored-minitest"
+
+  sh "ruby -rbundler/setup "\
+     "bin/opal -ghike #{includes} #{stubs} -R#{platform} -Dwarning -A --enable-source-location #{filename}"
+end
 
-module MinitestSuite
-  extend self
-
-  def build_js_command(files, options = {})
-    includes = options.fetch(:includes, [])
-    js_filename = options.fetch(:js_filename, [])
-
-    includes << 'vendored-minitest'
-    include_paths = includes.map {|i| " -I#{i}"}.join
-
-    requires = files.map{|f| "require '#{f}'"}
-    rb_filename = js_filename.sub(/\.js$/, '.rb')
-    mkdir_p File.dirname(rb_filename)
-    File.write rb_filename, requires.join("\n")
-
-    stubs = "-soptparse -sio/console -stimeout -smutex_m -srubygems -stempfile -smonitor"
-
-    "ruby -rbundler/setup bin/opal #{include_paths} #{stubs} -Dwarning -A #{rb_filename} -c > #{js_filename}"
+desc 'Runs opal-rspec tests to augment unit testing/rubyspecs'
+task :smoke_test do
+  opal_rspec_dir = 'tmp/smoke_test_opal_rspec'
+  # Travis caching might be creating this, manage the state idempotently
+  unless File.exist?(File.join(opal_rspec_dir, '.git'))
+    rm_rf opal_rspec_dir
+    sh "git clone https://github.com/opal/opal-rspec.git #{opal_rspec_dir}"
+  end
+  # Don't want conflicts with opal-rspec's Gemfile
+  gemfile_name = 'opal_rspec_smoketest.Gemfile'
+  cp File.join('tasks/testing', gemfile_name), opal_rspec_dir
+  Dir.chdir opal_rspec_dir do
+    sh 'git checkout releases/0-6-stable'
+    sh 'git pull'
+    # RSpec source itself
+    sh 'git submodule update --init'
+    Bundler.with_clean_env do
+      # Force new dependencies each time
+      rm_rf "#{gemfile_name}.lock"
+      with_gemfile = lambda {|command| sh "BUNDLE_GEMFILE=#{gemfile_name} RUNNER=node bundle #{command}"}
+      with_gemfile['install']
+      with_gemfile['exec rake rake_only']
+    end
   end
 end
 
-task :cruby_tests do
-  if ENV.key? 'FILES'
-    files = Dir[ENV['FILES']]
-    includes = %w[test . tmp lib]
-  else
-    includes = %w[test test/cruby/test]
-    files = %w[
-      benchmark/test_benchmark.rb
-      ruby/test_call.rb
-      opal/test_keyword.rb
-      base64/test_base64.rb
-      opal/unsupported_and_bugs.rb
-    ]
+task :browser_test do
+  credentials = {
+    username: ENV['SAUCE_USERNAME'] || warn('missing SAUCE_USERNAME env var'),
+    access_key: ENV['SAUCE_ACCESS_KEY'] || warn('missing SAUCE_ACCESS_KEY env var'),
+    tunnel: ENV['TRAVIS_JOB_NUMBER'],
+  }
+
+  # Exit if we're missing credentials.
+  exit unless credentials[:username] && credentials[:access_key]
+
+  Testing::SauceLabs.new(credentials).with_server do |session|
+    session.run(browser: 'Internet Explorer', version: '9')
+    session.run(browser: 'Internet Explorer', version: '10')
+    session.run(browser: 'Internet Explorer', version: '11')
+    # session.run(browser: 'Edge', version: '13') # something goes wrong
+    session.run(browser: 'Firefox', version: '47')
+    session.run(browser: 'Firefox', version: '48')
+    # session.run(browser: 'Chrome', version: '52') # chrome webdriver is broken
+    # session.run(browser: 'Chrome', version: '53') # chrome webdriver is broken
+    session.run(browser: 'Safari', version: '8')
+    session.run(browser: 'Safari', version: '9')
+    session.run(browser: 'Safari', version: '10')
   end
-
-  js_filename = 'tmp/cruby_tests.js'
-  build_js_command = MinitestSuite.build_js_command(
-    %w[
-      opal/platform
-      opal-parser
-    ] + files,
-    includes: includes,
-    js_filename: js_filename,
-  )
-  sh build_js_command
-  sh "NODE_PATH=stdlib/nodejs/node_modules node #{js_filename}"
 end
 
-task :test_nodejs do
-  js_filename = 'tmp/test_nodejs.js'
-  build_js_command = MinitestSuite.build_js_command(
-    %w[
-      opal-parser.rb
-      test_file.rb
-      test_dir.rb
-    ],
-    includes: %w[test/nodejs],
-    js_filename: js_filename,
-  )
-  sh build_js_command
-  sh "NODE_PATH=stdlib/nodejs/node_modules node #{js_filename}"
-end
+platforms.each { |platform| task(:"mspec_#{platform}"    => mspec_suites.map    { |suite| :"mspec_#{suite}_#{platform}"    }) }
+platforms.each { |platform| task(:"minitest_#{platform}" => minitest_suites.map { |suite| :"minitest_#{suite}_#{platform}" }) }
 
-task :mspec    => [:mspec_phantomjs, :mspec_nodejs, :mspec_sprockets_phantomjs]
-task :minitest => [:cruby_tests, :test_nodejs]
+task :mspec    => [:mspec_phantomjs, :mspec_nodejs]
+task :minitest => [:minitest_phantomjs, :minitest_nodejs, :minitest_node_nodejs]
 task :test_all => [:rspec, :mspec, :minitest]
 
+# deprecated, can be removed after 0.11
+task(:cruby_tests) { warn "The task 'cruby_tests' has been renamed to 'minitest_cruby_nodejs'."; exit 1 }
+task(:test_cruby)  { warn "The task 'test_cruby' has been renamed to 'minitest_cruby_nodejs'."; exit 1 }
+task(:test_nodejs) { warn "The task 'test_nodejs' has been renamed to 'minitest_node_nodejs'."; exit 1 }
+