opal · Oct 21, 2014 · Oct 21, 2014 · Oct 21, 2014 · Oct 21, 2014 · Oct 21, 2014
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ build/
 /cdn
 /node_modules
 /gh-pages
+/tmp
diff --git a/Rakefile b/Rakefile
@@ -18,9 +18,43 @@ MSpec::Opal::RakeTask.new(:mspec) do |config|
   config.basedir = ENV['MSPEC_BASEDIR'] if ENV['MSPEC_BASEDIR']
 end
 
-task :default => [:rspec, :mspec]
+task :default => [:rspec, :mspec, :mspec_node]
 
 
+task :mspec_node do
+  rubyspecs = File.read('spec/rubyspecs').lines.reject do |l|
+    l.strip!; l.start_with?('#') || l.empty?
+  end.flat_map do |path|
+    path = "spec/#{path}"
+    File.directory?(path) ? Dir[path+'/*.rb'] : "#{path}.rb"
+  end
+
+  filters = Dir['spec/filters/**/*.rb']
+  shared = Dir['spec/{opal,lib/parser}/**/*_spec.rb'] + ['spec/lib/lexer_spec.rb']
+
+  p [rubyspecs.size, :rubyspecs]
+  p [filters.size, :filters]
+  p [shared.size, :shared]
+
+  specs = []
+  specs += filters
+  specs += rubyspecs
+  specs += shared
+
+  requires = specs.map{|s| "require '#{s.sub(/^spec\//,'')}'"}
+
+  File.write 'tmp/mspec_node.rb', <<-RUBY
+    require 'spec_helper'
+    #{requires.join("    \n")}
+    OSpecRunner.main.did_finish
+  RUBY
+
+  stubs = " -smspec/helpers/tmp -smspec/helpers/environment -smspec/guards/block_device -smspec/guards/endian"
+
+  exec 'RUBYOPT="-rbundler/setup -rmspec/opal/special_calls" '\
+       "bin/opal -Ispec -Ilib -gmspec #{stubs} -rnodejs -Dwarning -A tmp/mspec2.rb"
+end
+
 require 'opal/version'
 desc <<-DESC
 Build *corelib* and *stdlib* to "build/"

diff --git a/lib/mspec/opal/rake_task.rb b/lib/mspec/opal/rake_task.rb
@@ -1,30 +1,6 @@
-require 'opal/nodes'
-class Opal::Nodes::CallNode
-  # Rubyspec uses this call to load in language specific features at runtime.
-  # We can't do this at runtime, so handle it during compilation
-  add_special :language_version do
-    if meth == :language_version and scope.top?
-      lang_type = arglist[2][1]
-      target = "corelib/language/versions/#{lang_type}_1.9"
-
-      if File.exist?(target)
-        compiler.requires << target
-      end
-
-      push fragment("nil")
-    end
-  end
-
-  add_special :not_supported_on do
-    unless meth == :not_supported_on and arglist[1][1] == :opal
-      compile_default!
-    end
-  end
-end
-
-
 require 'rack'
 require 'webrick'
+require 'mspec/opal/special_calls'
 
 module MSpec
   module Opal
@@ -205,16 +181,17 @@ def files_to_run(pattern=nil)
 
         if pattern
           # add custom opal specs from spec/
-          add_files paths_from_glob(pattern) & rubyspec_white_list, :rubyspec_custom_pattern
-          add_files paths_from_glob(pattern).grep(/(?!spec\/(corelib|stdlib)\/)/), :other_custom_pattern
+          add_files paths_from_glob(pattern) & rubyspec_white_list, :rubyspec_custom
+          add_files paths_from_glob(pattern).grep(/(?!spec\/(corelib|stdlib)\/)/), :other_custom
 
         else
           # add opal specific specs
-          add_files paths_from_glob("#{basedir}/opal/**/*_spec.rb"), 'opal/*'
-          add_files paths_from_glob("#{basedir}/lib/{lexer_spec.rb,parser/**/*_spec.rb}"), 'lib/{lexer,parser}'
+          add_files paths_from_glob("#{basedir}/opal/**/*_spec.rb"),       :shared
+          add_files paths_from_glob("#{basedir}/lib/lexer_spec.rb"),       :lexer
+          add_files paths_from_glob("#{basedir}/lib/parser/**/*_spec.rb"), :parser
 
           # add any rubyspecs we want to run (defined in spec/rubyspecs)
-          add_files rubyspec_white_list, :rubyspec_white_list
+          add_files rubyspec_white_list, :rubyspecs
         end
       end
 

diff --git a/lib/mspec/opal/runner.rb b/lib/mspec/opal/runner.rb
@@ -144,6 +144,38 @@ def after(state)
   end
 end
 
+class NodeJSFormatter < BrowserFormatter
+  def green(str)
+    `process.stdout.write("\033[32m"+#{str}+"\033[0m")`
+  end
+
+  def red(str)
+    `process.stdout.write("\033[31m"+#{str}+"\033[0m")`
+  end
+
+  def log(str)
+    puts str
+  end
+
+  def after(state)
+    super
+    unless exception?
+      green('.')
+    else
+      red(failure? ? 'F' : 'E')
+    end
+  end
+
+  def finish_with_code(code)
+    `global.OPAL_SPEC_CODE = code;`
+  end
+
+  def finish
+    super
+    puts "\n\n"
+  end
+end
+
 class PhantomDebugFormatter < PhantomFormatter
   def after(state = nil)
     (@exception && state) ? red(state.description) : green(state.description)

diff --git a/lib/mspec/opal/special_calls.rb b/lib/mspec/opal/special_calls.rb
@@ -0,0 +1,25 @@
+require 'opal/nodes'
+class Opal::Nodes::CallNode
+  # Rubyspec uses this call to load in language specific features at runtime.
+  # We can't do this at runtime, so handle it during compilation
+  add_special :language_version do
+    if meth == :language_version and scope.top?
+      lang_type = arglist[2][1]
+      target = "corelib/language/versions/#{lang_type}_1.9"
+
+      if File.exist?(target)
+        compiler.requires << target
+      end
+
+      push fragment("nil")
+    end
+  end
+
+  add_special :not_supported_on do
+    unless meth == :not_supported_on and arglist[1][1] == :opal
+      compile_default!
+    end
+  end
+end
+
+
diff --git a/lib/opal/cli.rb b/lib/opal/cli.rb
@@ -48,7 +48,7 @@ def initialize options = nil
       @filename   = options.fetch(:filename) { @file && @file.path }; options.delete(:filename)
       @skip_opal_require = options.delete(:skip_opal_require)
       @compiler_options = Hash[
-        *processor_option_names.map do |option|
+        *compiler_option_names.map do |option|
           key = option.to_sym
           next unless options.has_key? key
           value = options.delete(key)
@@ -129,10 +129,10 @@ def map
       compiler.source_map
     end
 
-    def processor_option_names
+    def compiler_option_names
       %w[
-        method_missing_enabled
-        arity_check_enabled
+        method_missing
+        arity_check
         dynamic_require_severity
         source_map_enabled
         irb_enabled

diff --git a/lib/opal/compiler.rb b/lib/opal/compiler.rb
@@ -108,7 +108,7 @@ def error(msg, line = nil)
     # method simply appends the filename and curent line number onto
     # the message and issues a warning.
     def warning(msg, line = nil)
-      warn "WARNING: #{msg} :#{file}:#{line}"
+      warn "WARNING: #{msg} -- #{file}:#{line}"
     end
 
     # Instances of `Scope` can use this to determine the current

diff --git a/lib/opal/nodes/top.rb b/lib/opal/nodes/top.rb
@@ -38,7 +38,8 @@ def compile
 
       def opening
         if compiler.requirable?
-          line "Opal.modules[#{compiler.file.inspect}] = function($opal) {"
+          path = Pathname(compiler.file).cleanpath.to_s
+          line "Opal.modules[#{path.inspect}] = function($opal) {"
         else
           line "(function($opal) {"
         end

diff --git a/opal/corelib/runtime.js b/opal/corelib/runtime.js
@@ -1072,6 +1072,7 @@
 
       for (var i = 0, ii = parts.length; i < ii; i++) {
         part = parts[i];
+        if (part == '') continue;
         (part === '..') ? new_parts.pop() : new_parts.push(part)
       }
 
@@ -1094,7 +1095,7 @@
           Opal.LoadError ? Opal.LoadError.$new(message) : function(){throw message}();
         }
         else if (severity === "warning") {
-          Opal.gvars.stderr.$puts('WARNING: LoadError: ' + message);
+          console.warn('WARNING: LoadError: ' + message);
         }
       }
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -26,11 +26,16 @@ def at_exit(&block)
   end
 end
 
-if `!!window.OPAL_SPEC_PHANTOM`
-  require 'phantomjs'
-  formatter_class = PhantomFormatter
-else
-  formatter_class = BrowserFormatter
+case
+when defined?(NodeJS)
+  formatter_class = NodeJSFormatter
+when `(typeof(window) !== 'undefined')`
+  if `!!window.OPAL_SPEC_PHANTOM`
+    require 'phantomjs'
+    formatter_class = PhantomFormatter
+  else
+    formatter_class = BrowserFormatter
+  end
 end
 
 # Uncomment the following to see example titles when they're executed.

diff --git a/stdlib/fileutils.rb b/stdlib/fileutils.rb
diff --git a/stdlib/iconv.rb b/stdlib/iconv.rb
diff --git a/stdlib/nodejs.rb b/stdlib/nodejs.rb
@@ -1,3 +1,6 @@
+module NodeJS
+end
+
 require 'nodejs/runtime'
 require 'nodejs/file'
 require 'nodejs/dir'

diff --git a/stdlib/nodejs/dir.rb b/stdlib/nodejs/dir.rb
@@ -1,5 +1,5 @@
 class Dir
-  @__glob__ = NodeJS.require :glob
+  @__glob__ = node_require :glob
   `var __glob__ = #{@__glob__}`
 
   def self.[] glob

diff --git a/stdlib/nodejs/file.rb b/stdlib/nodejs/file.rb
@@ -2,8 +2,8 @@ class File < IO
   include ::IO::Writable
   include ::IO::Readable
 
-  @__fs__ = NodeJS.require :fs
-  @__path__ = NodeJS.require :path
+  @__fs__ = node_require :fs
+  @__path__ = node_require :path
   `var __fs__ = #{@__fs__}`
   `var __path__ = #{@__path__}`
 

diff --git a/stdlib/nodejs/io.rb b/stdlib/nodejs/io.rb
@@ -1,2 +1,2 @@
-$stdout.write_proc = -> (string) {`process.stdout.write(#{string})`}
+$stdout.write_proc = -> (string) {`process.stdout.write(string)`}
 $stderr.write_proc = -> (string) {`process.stderr.write(string)`}
diff --git a/stdlib/nodejs/runtime.rb b/stdlib/nodejs/runtime.rb
@@ -17,8 +17,9 @@
 }).call(this);
 }
 
-module NodeJS
-  def self.require name
+
+module Kernel
+  def node_require name
     `OpalNode.node_require(#{name})`
   end
 end

diff --git a/stdlib/yaml.rb b/stdlib/yaml.rb
@@ -0,0 +1 @@
+require 'nodejs/yaml' if defined? NodeJS
-Original file line number
+Diff line change
@@ @@ -8,3 +8,4 @@ build/ @@
     /cdn
     /node_modules
     /gh-pages
+    /tmp