opal · Feb 9, 2015 · Feb 13, 2015 · Feb 13, 2015 · Feb 13, 2015 · Feb 13, 2015
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,14 @@
-## edge (upcoming 0.7)
+## edge (upcoming 0.7.1)
+
+*    CLI options `-d` and `-v` now set respectively `$DEBUG` and `$VERBOSE`
+
+*   Fixed a bug that would make the `-v` CLI option wait for STDIN input
+
+*   Add the `-E` / `--no-exit` CLI option to skip implicit `Kernel#exit` call
+
+*   Now the CLI implicitly calls `Kernel#exit` at the end of the script, thus making `at_exit` blocks be respected.
+
+## 0.7.0 2015-02-01
 
 *   Stop keyword-arg variable names leaking to global javascript scope
 

diff --git a/lib/opal/cli_options.rb b/lib/opal/cli_options.rb
@@ -93,7 +93,7 @@ def initialize
         options[:port] = port.to_i
       end
 
-      on('-E', '--no-exit', 'Do not append a Kernel#exit at the end of file') do |no_exit|
+      on('--no-exit', 'Do not append a Kernel#exit at the end of file') do |no_exit|
         options[:no_exit] = true
       end
 

diff --git a/lib/opal/cli_runners/nodejs.rb b/lib/opal/cli_runners/nodejs.rb
@@ -1,4 +1,5 @@
 require 'opal/cli_runners'
+require 'opal/paths'
 
 module Opal
   module CliRunners
@@ -13,7 +14,7 @@ def puts(*args)
       end
 
       def node_modules
-        File.expand_path("../../../../node_modules", __FILE__)
+        File.expand_path('../stdlib/nodejs/node_modules', ::Opal.gem_dir)
       end
 
       def run(code, argv)
@@ -29,7 +30,7 @@ def run(code, argv)
 
       # Let's support fake IO objects like StringIO
       def system_with_output(env, *cmd)
-        if (io_output = IO.try_convert(output))
+        if IO.try_convert(output)
           system(env,*cmd)
           @exit_status = $?.exitstatus
           return

diff --git a/lib/opal/version.rb b/lib/opal/version.rb
@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end
diff --git a/stdlib/nodejs.rb b/stdlib/nodejs.rb
@@ -1,8 +1,7 @@
 module NodeJS
 end
 
-require 'nodejs/runtime'
+require 'nodejs/kernel'
 require 'nodejs/file'
 require 'nodejs/dir'
 require 'nodejs/io'
-require 'nodejs/process'
diff --git a/stdlib/nodejs/process.rb → stdlib/nodejs/kernel.rb b/stdlib/nodejs/process.rb → stdlib/nodejs/kernel.rb
@@ -1,6 +1,8 @@
 `Opal.exit = process.exit`
 
 module Kernel
+  NODE_REQUIRE = `require`
+
   def caller
     %x{
       var stack;
@@ -13,6 +15,10 @@ def caller
       return stack.$split("\n").slice(3);
     }
   end
+
+  def node_require(path)
+    `#{NODE_REQUIRE}(#{path.to_str})`
+  end
 end
 
 ARGV = `process.argv.slice(2)`

diff --git a/stdlib/nodejs/node_modules/.bin/js-yaml b/stdlib/nodejs/node_modules/.bin/js-yaml
diff --git a/stdlib/nodejs/node_modules/glob/LICENSE b/stdlib/nodejs/node_modules/glob/LICENSE
diff --git a/stdlib/nodejs/node_modules/glob/README.md b/stdlib/nodejs/node_modules/glob/README.md
diff --git a/stdlib/nodejs/node_modules/glob/common.js b/stdlib/nodejs/node_modules/glob/common.js
diff --git a/stdlib/nodejs/node_modules/glob/glob.js b/stdlib/nodejs/node_modules/glob/glob.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inflight/.eslintrc b/stdlib/nodejs/node_modules/glob/node_modules/inflight/.eslintrc
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inflight/LICENSE b/stdlib/nodejs/node_modules/glob/node_modules/inflight/LICENSE
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inflight/README.md b/stdlib/nodejs/node_modules/glob/node_modules/inflight/README.md
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inflight/inflight.js b/stdlib/nodejs/node_modules/glob/node_modules/inflight/inflight.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inflight/node_modules/wrappy/LICENSE b/stdlib/nodejs/node_modules/glob/node_modules/inflight/node_modules/wrappy/LICENSE
diff --git a/...ib/nodejs/node_modules/glob/node_modules/inflight/node_modules/wrappy/README.md b/...ib/nodejs/node_modules/glob/node_modules/inflight/node_modules/wrappy/README.md
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json b/stdlib/nodejs/node_modules/glob/node_modules/inflight/node_modules/wrappy/package.json
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inflight/node_modules/wrappy/test/basic.js b/stdlib/nodejs/node_modules/glob/node_modules/inflight/node_modules/wrappy/test/basic.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inflight/node_modules/wrappy/wrappy.js b/stdlib/nodejs/node_modules/glob/node_modules/inflight/node_modules/wrappy/wrappy.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inflight/package.json b/stdlib/nodejs/node_modules/glob/node_modules/inflight/package.json
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inflight/test.js b/stdlib/nodejs/node_modules/glob/node_modules/inflight/test.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inherits/LICENSE b/stdlib/nodejs/node_modules/glob/node_modules/inherits/LICENSE
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inherits/README.md b/stdlib/nodejs/node_modules/glob/node_modules/inherits/README.md
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inherits/inherits.js b/stdlib/nodejs/node_modules/glob/node_modules/inherits/inherits.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inherits/inherits_browser.js b/stdlib/nodejs/node_modules/glob/node_modules/inherits/inherits_browser.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inherits/package.json b/stdlib/nodejs/node_modules/glob/node_modules/inherits/package.json
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/inherits/test.js b/stdlib/nodejs/node_modules/glob/node_modules/inherits/test.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/minimatch/.npmignore b/stdlib/nodejs/node_modules/glob/node_modules/minimatch/.npmignore
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/minimatch/.travis.yml b/stdlib/nodejs/node_modules/glob/node_modules/minimatch/.travis.yml
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/minimatch/LICENSE b/stdlib/nodejs/node_modules/glob/node_modules/minimatch/LICENSE
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/minimatch/README.md b/stdlib/nodejs/node_modules/glob/node_modules/minimatch/README.md
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/minimatch/benchmark.js b/stdlib/nodejs/node_modules/glob/node_modules/minimatch/benchmark.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/minimatch/browser.js b/stdlib/nodejs/node_modules/glob/node_modules/minimatch/browser.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/minimatch/minimatch.js b/stdlib/nodejs/node_modules/glob/node_modules/minimatch/minimatch.js
diff --git a/...b/nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore b/...b/nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.npmignore
diff --git a/.../nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.travis.yml b/.../nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/.travis.yml
diff --git a/...node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md b/...node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
diff --git a/...b/nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js b/...b/nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/example.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js b/stdlib/nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/index.js
diff --git a/...ode_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore b/...ode_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.npmignore
diff --git a/...de_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml b/...de_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/.travis.yml
diff --git a/.../node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile b/.../node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/Makefile
diff --git a/...es/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md b/...es/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
diff --git a/...ode_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js b/...ode_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/example.js
diff --git a/.../node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js b/.../node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
diff --git a/...e_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json b/...e_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
diff --git a/...dules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js b/...dules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/test/balanced.js
diff --git a/...b/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml b/...b/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/.travis.yml
diff --git a/.../glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE b/.../glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/LICENSE
diff --git a/.../minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown b/.../minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
diff --git a/...ode_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js b/...ode_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/example/map.js
diff --git a/...glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js b/...glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
diff --git a/.../node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json b/.../node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
diff --git a/...b/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js b/...b/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
diff --git a/...nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json b/...nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
diff --git a/..._modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js b/..._modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-comparison.js
diff --git a/...de_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt b/...de_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/bash-results.txt
diff --git a/...dejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt b/...dejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/cases.txt
diff --git a/...dejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js b/...dejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/dollar.js
diff --git a/...ode_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js b/...ode_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/empty-option.js
diff --git a/...js/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh b/...js/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/generate.sh
diff --git a/...dules/glob/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js b/...dules/glob/node_modules/minimatch/node_modules/brace-expansion/test/negative-increment.js
diff --git a/...dejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/nested.js b/...dejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/nested.js
diff --git a/...odejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/order.js b/...odejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/order.js
diff --git a/.../nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/pad.js b/.../nodejs/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/pad.js
diff --git a/...s/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js b/...s/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/same-type.js
diff --git a/...js/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js b/...js/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/test/sequence.js
diff --git a/stdlib/nodejs/node_modules/glob/node_modules/minimatch/package.json b/stdlib/nodejs/node_modules/glob/node_modules/minimatch/package.json