opal · Jun 18, 2014 · Jun 18, 2014 · Jun 18, 2014
Showing with 61 additions and 54 deletions.

+1 −1 lib/opal/cli_runners/nodejs.rb

+3 −42 stdlib/nodejs.rb

+16 −0 stdlib/nodejs/io.rb

+16 −0 stdlib/nodejs/process.rb

+16 −11 stdlib/nodejs/require.rb

+9 −0 stdlib/nodejs/{runtime.js → runtime.rb}
diff --git a/lib/opal/cli_runners/nodejs.rb b/lib/opal/cli_runners/nodejs.rb
@@ -30,7 +30,7 @@ def run(code, argv)
       # Let's support fake IO objects like StringIO
       def system_with_output(env, *cmd)
         io_output = IO.try_convert(output)
-        system(env,*cmd) if io_output
+        return system(env,*cmd) if io_output
 
         require 'open3'
         captured_output, status = Open3.capture2(env,*cmd)

diff --git a/stdlib/nodejs.rb b/stdlib/nodejs.rb
@@ -1,44 +1,5 @@
-require 'nodejs/runtime.js'
+require 'nodejs/runtime'
 require 'nodejs/file'
 require 'nodejs/dir'
-
-class LoadError < ScriptError; end
-
-module IO::Writable
-  def puts(*args)
-    write args.map { |arg| String(arg) }.join($/)+$/
-  end
-end
-
-STDERR = $stderr = IO.new
-STDIN  = $stdin  = IO.new
-STDOUT = $stdout = IO.new
-
-$stdout.write_proc = -> (string) {`process.stdout.write(#{string})`}
-$stderr.write_proc = -> (string) {`process.stderr.write(string)`}
-
-$stdout.extend(IO::Writable)
-$stderr.extend(IO::Writable)
-
-module Kernel
-  def exit
-    `process.exit()`
-  end
-end
-
-module NodeJS
-  def self.require name
-    `OpalNode.node_require(#{name})`
-  end
-end
-
-ARGV = `process.argv.slice(2)`
-
-ENV = Object.new
-def ENV.[]= name, value
-  `process.env[#{name.to_s}] = #{value.to_s}`
-end
-
-def ENV.[] name
-  `process.env[#{name}] || nil`
-end
+require 'nodejs/io'
+require 'nodejs/process'
diff --git a/stdlib/nodejs/io.rb b/stdlib/nodejs/io.rb
@@ -0,0 +1,16 @@
+module IO::Writable
+  def puts(*args)
+    write args.map { |arg| String(arg) }.join($/)+$/
+  end
+end
+
+STDERR = $stderr = IO.new
+STDIN  = $stdin  = IO.new
+STDOUT = $stdout = IO.new
+
+$stdout.write_proc = -> (string) {`process.stdout.write(#{string})`}
+$stderr.write_proc = -> (string) {`process.stderr.write(string)`}
+
+$stdout.extend(IO::Writable)
+$stderr.extend(IO::Writable)
+
diff --git a/stdlib/nodejs/process.rb b/stdlib/nodejs/process.rb
@@ -0,0 +1,16 @@
+module Kernel
+  def exit
+    `process.exit()`
+  end
+end
+
+ARGV = `process.argv.slice(2)`
+
+ENV = Object.new
+def ENV.[]= name, value
+  `process.env[#{name.to_s}] = #{value.to_s}`
+end
+
+def ENV.[] name
+  `process.env[#{name}] || nil`
+end
diff --git a/stdlib/nodejs/require.rb b/stdlib/nodejs/require.rb
@@ -1,27 +1,32 @@
 require 'opal-parser'
 
 module Kernel
-  def require path
+  def __prepare_require__(path)
     name = `$opal.normalize_loadable_path(#{path})`
+    full_path = name.end_with?('.rb') ? name : name+'.rb'
 
     if `!$opal.modules[#{name}]`
-      ruby = File.read(path)
-      js = Opal.compile(ruby, requirable: true, file: name)
+      ruby = File.read(full_path)
+      compiler = Opal::Compiler.new(ruby, requirable: true, file: name)
+      js = compiler.compile
+      compiler.requires.each do |sub_path|
+        __prepare_require__(sub_path)
+      end
       `eval(#{js})`
     end
 
+    name
+  rescue => e
+    raise [path, name, full_path].inspect+e.message
+  end
+
+  def require path
+    name = __prepare_require__(path)
     `$opal.require(#{name})`
   end
 
   def load path
-    name = `$opal.normalize_loadable_path(#{path})`
-
-    if `!$opal.modules[#{name}]`
-      ruby = File.read(path)
-      js = Opal.compile(ruby, requirable: true, file: name)
-      `eval(js)`
-    end
-
+    name = __prepare_require__(path)
     `$opal.load(#{name})`
   end
 end
diff --git a/stdlib/nodejs/runtime.js → stdlib/nodejs/runtime.rb b/stdlib/nodejs/runtime.js → stdlib/nodejs/runtime.rb
@@ -1,3 +1,4 @@
+%x{
 // Generated by CoffeeScript 1.6.3
 (function() {
   var OpalNode, extensions, fs, parser, parserFile, source, sourceFile, vm, __path__;
@@ -14,3 +15,11 @@
   global.OpalNode = OpalNode;
 
 }).call(this);
+}
+
+module NodeJS
+  def self.require name
+    `OpalNode.node_require(#{name})`
+  end
+end
+