opal 0.9.4 → 0.10.0.beta1

data/README.md

@@ -121,17 +121,16 @@ Just open this page and check the JavaScript console.
 production and should only be used as a quick way to getting you hands
 on opal
 
-
 ## Running tests
 
-First, install dependencies:
+The Ruby Spec Suite related repos must be cloned as git submodules:
 
-    $ bundle install
-    $ npm install -g jshint
+    $ git submodule update --init
 
-RubySpec related repos must be cloned as git submodules:
+Then, install dependencies:
 
-    $ git submodule update --init
+    $ bundle install
+    $ npm install -g jshint
 
 The test suite can be run using (requires [phantomjs][]):
 
@@ -232,5 +231,5 @@ THE SOFTWARE.
 
 
 [phantomjs]: http://phantomjs.org
-[MSpec]: https://github.com/rubyspec/mspec#readme
+[MSpec]: https://github.com/ruby/mspec#readme
 [RSpec]: https://github.com/rspec/rspec#readme

data/bin/opal-mspec

@@ -7,4 +7,4 @@ pattern = %Q{MSPEC_PATTERN="{#{specs.join(',')}}"} if specs.any?
 command = [pattern, 'rake mspec'].compact.join(' ')
 exec command
 
-# RUBYOPT="-rbundler/setup -rmspec/opal/special_calls" bundle exec mspec run -t opal -pspec/rubyspec/spec_helper spec/rubyspec/core/true/*
+# RUBYOPT="-rbundler/setup -rmspec/opal/special_calls" bundle exec mspec run -t opal -pspec/ruby/spec_helper spec/ruby/core/true/*

data/config.ru

@@ -3,8 +3,8 @@ Bundler.require
 
 require 'mspec/opal/rake_task'
 
-::Opal::Processor.arity_check_enabled = true
-::Opal::Processor.dynamic_require_severity = :error
+::Opal::Config.arity_check_enabled = true
+::Opal::Config.dynamic_require_severity = :error
 
 use Rack::ShowExceptions
 use Rack::ShowStatus

data/docs/faq.md

@@ -6,7 +6,7 @@ To try and keep ruby relevant in a world where client-side apps are making javas
 
 ### How compatible is Opal?
 
-We run opal against [rubyspec](https://github.com/rubyspec/rubyspec) as our primary testing setup. We try to make Opal as compatible as possible, whilst also taking into account restrictions of JavaScript when applicable. Opal supports the majority of ruby syntax features, as well as a very large part of the corelib implementation. We support method\_missing, modules, classes, instance\_exec, blocks, procs and lots lots more. Opal can compile and run Rspec unmodified, as well as self hosting the compiler at runtime.
+We run opal against the [ruby spec](https://github.com/ruby/spec) as our primary testing setup. We try to make Opal as compatible as possible, whilst also taking into account restrictions of JavaScript when applicable. Opal supports the majority of ruby syntax features, as well as a very large part of the corelib implementation. We support method\_missing, modules, classes, instance\_exec, blocks, procs and lots lots more. Opal can compile and run Rspec unmodified, as well as self hosting the compiler at runtime.
 
 ### What version of ruby does Opal target?
 

data/docs/source_maps.md

@@ -10,7 +10,7 @@ NOTE: Currently on `master` branch sourcemaps are work-in-progress and probably
 To enable sourcemaps in the Sprockets processor you need to turn on the relative flag:
 
 ```ruby
-Opal::Processor.source_map_enabled = true # default
+Opal::Config.source_map_enabled = true # default
 ```
 
 

data/lib/opal.rb

@@ -4,6 +4,7 @@ require 'opal/erb'
 require 'opal/sprockets'
 require 'opal/paths'
 require 'opal/version'
+require 'opal/errors'
 
 # Opal is a ruby to javascript compiler, with a runtime for running
 # in any JavaScript environment.

data/lib/opal/builder.rb

@@ -119,7 +119,7 @@ module Opal
     end
 
     def process_require(filename, options)
-      filename.gsub!(/\.(rb|js|opal)#{REGEXP_END}/, '')
+      filename = filename.gsub(/\.(rb|js|opal)#{REGEXP_END}/, '')
       return if prerequired.include?(filename)
       return if already_processed.include?(filename)
       already_processed << filename

data/lib/opal/cli.rb

@@ -7,7 +7,7 @@ module Opal
   class CLI
     attr_reader :options, :file, :compiler_options, :evals, :load_paths, :argv,
                 :output, :requires, :gems, :stubs, :verbose, :port, :preload,
-                :filename, :debug, :no_exit
+                :filename, :debug, :no_exit, :lib_only
 
     def compile?
       @compile
@@ -32,22 +32,23 @@ module Opal
       @runner_type = options.delete(:runner)    || :nodejs
       @port       = options.delete(:port)       || 3000
 
-      @options    = options
-      @compile    = !!options.delete(:compile)
-      @sexp       = options.delete(:sexp)
-      @file       = options.delete(:file)
-      @no_exit    = options.delete(:no_exit)
-      @argv       = options.delete(:argv)       || []
-      @evals      = options.delete(:evals)      || []
-      @requires   = options.delete(:requires)   || []
-      @load_paths = options.delete(:load_paths) || []
-      @gems       = options.delete(:gems)       || []
-      @stubs      = options.delete(:stubs)      || []
-      @preload    = options.delete(:preload)    || []
-      @output     = options.delete(:output)     || self.class.stdout || $stdout
-      @verbose    = options.fetch(:verbose, false); options.delete(:verbose)
-      @debug      = options.fetch(:debug, false);   options.delete(:debug)
-      @filename   = options.fetch(:filename) { @file && @file.path }; options.delete(:filename)
+      @options     = options
+      @compile     = !!options.delete(:compile)
+      @sexp        = options.delete(:sexp)
+      @file        = options.delete(:file)
+      @no_exit     = options.delete(:no_exit)
+      @lib_only    = options.delete(:lib_only)
+      @argv        = options.delete(:argv)       || []
+      @evals       = options.delete(:evals)      || []
+      @requires    = options.delete(:requires)   || []
+      @load_paths  = options.delete(:load_paths) || []
+      @gems        = options.delete(:gems)       || []
+      @stubs       = options.delete(:stubs)      || []
+      @preload     = options.delete(:preload)    || []
+      @output      = options.delete(:output)     || self.class.stdout || $stdout
+      @verbose     = options.fetch(:verbose, false); options.delete(:verbose)
+      @debug       = options.fetch(:debug, false);   options.delete(:debug)
+      @filename    = options.fetch(:filename) { @file && @file.path }; options.delete(:filename)
       @skip_opal_require = options.delete(:skip_opal_require)
       @compiler_options = Hash[
         *compiler_option_names.map do |option|
@@ -58,7 +59,8 @@ module Opal
         end.compact.flatten
       ]
 
-      raise ArgumentError, "no runnable code provided (evals or file)" if @evals.empty? and @file.nil?
+      raise ArgumentError, "no runnable code provided (evals or file)" if @evals.empty? and @file.nil? and not(@lib_only)
+      raise ArgumentError, "can't accept evals or file in `library only` mode" if (@evals.any? or @file) and @lib_only
       raise ArgumentError, "unknown options: #{options.inspect}" unless @options.empty?
     end
 
@@ -71,14 +73,12 @@ module Opal
     end
 
     def runner
-      @runner ||= case @runner_type
-                  when :server;      CliRunners::Server.new(output, port)
-                  when :nodejs;      CliRunners::Nodejs.new(output)
-                  when :phantomjs;   CliRunners::Phantomjs.new(output)
-                  when :applescript; CliRunners::AppleScript.new(output)
-                  when :nashorn;     CliRunners::Nashorn.new(output)
-                  else raise ArgumentError, @runner_type.inspect
-                  end
+      @runner ||= begin
+        const_name = @runner_type.to_s.capitalize
+        CliRunners.const_defined?(const_name) or
+          raise ArgumentError, "unknown runner: #{@runner_type.inspect}"
+        CliRunners.const_get(const_name).new(output: output, port: port)
+      end
     end
 
     def run_code
@@ -106,8 +106,10 @@ module Opal
         builder.build(local_require)
       end
 
-      evals_or_file do |contents, filename|
-        builder.build_str(contents, filename)
+      unless lib_only
+        evals_or_file do |contents, filename|
+          builder.build_str(contents, filename)
+        end
       end
 
       builder.build_str 'Kernel.exit', '(exit)' unless no_exit

data/lib/opal/cli_options.rb

@@ -97,6 +97,9 @@ module Opal
         options[:no_exit] = true
       end
 
+      on('-L', '--library', 'Generate only the code of the library. Omit [programfile] and [-e]') do |no_exit|
+        options[:lib_only] = true
+      end
 
       section 'Compilation Options:'
 

data/lib/opal/cli_runners.rb

@@ -1,11 +1,24 @@
 module Opal
+  # `Opal::CliRunners` is the namespace in which JavaScript runners can be
+  # defined for use by `Opal::CLI`. The API for classes defined under
+  # `CliRunners` is the following.
+  #
+  # - The #initialize method takes an `Hash` containing an `output:` object.
+  #   Additional keys can be safely ignored and can be specific to a particular
+  #   runner, e.g. the `CliRunners::Server` runner will accepts a `port:`
+  #   option.
+  # - The runner instance will then be called via `#run(compiled_source, argv)`:
+  #   - `compiled_source` is a string of JavaScript code
+  #   - `argv` is the arguments vector coming from the CLI that is being
+  #     forwarded to the program
+  #
   module CliRunners
     class RunnerError < StandardError
     end
   end
 end
 
-require 'opal/cli_runners/apple_script'
+require 'opal/cli_runners/applescript'
 require 'opal/cli_runners/phantomjs'
 require 'opal/cli_runners/nodejs'
 require 'opal/cli_runners/server'

data/lib/opal/cli_runners/{apple_script.rb → applescript.rb}

@@ -2,13 +2,13 @@ require 'opal/cli_runners'
 
 module Opal
   module CliRunners
-    class AppleScript
-      def initialize(output)
+    class Applescript
+      def initialize(options)
         unless system('which osalang > /dev/null')
           raise MissingJavaScriptSupport, 'JavaScript Automation is only supported by OS X Yosemite and above.'
         end
 
-        @output ||= output
+        @output = options.fetch(:output, $stdout)
       end
       attr_reader :output, :exit_status
 

data/lib/opal/cli_runners/nashorn.rb

@@ -4,8 +4,8 @@ require 'opal/paths'
 module Opal
   module CliRunners
     class Nashorn
-      def initialize(output)
-        @output ||= output
+      def initialize(options)
+        @output = options.fetch(:output, $stdout)
       end
       attr_reader :output, :exit_status
 

data/lib/opal/cli_runners/nodejs.rb

@@ -4,8 +4,8 @@ require 'opal/paths'
 module Opal
   module CliRunners
     class Nodejs
-      def initialize(output)
-        @output ||= output
+      def initialize(options)
+        @output = options.fetch(:output, $stdout)
       end
       attr_reader :output, :exit_status
 

data/lib/opal/cli_runners/phantom.js

@@ -28,11 +28,35 @@ page.onCallback = function(data) {
   case 'stderr':
     system.stderr.write(data[1] || '');
     break;
+  case 'env':
+    return JSON.stringify(system.env);
+  case 'argv':
+    return JSON.stringify(system.args.slice(1));
   default:
     console.error('Unknown callback data: ', data);
   }
 };
 
+page.onError = function(msg, trace) {
+  trace = (trace && trace.length) ? trace : [];
+
+  var format_trace = function(trace) {
+    var file = trace.file || trace.sourceURL,
+        line = trace.line,
+        method = trace['function'];
+    method = method ? "`"+method+"'" : '~unknown~';
+    return file+': '+line+':in '+method;
+  };
+
+  var msgStack = [format_trace(trace[0])+': '+msg];
+
+  trace.slice(1).forEach(function(t) {
+    msgStack.push("	from "+format_trace(t));
+  });
+
+  system.stderr.write(msgStack.join('\n')+'\n');
+  phantom_exit(1);
+};
 
 page.onInitialized = function() {
   page.evaluate('function(code) {window.eval(code)}', opal_code)

data/lib/opal/cli_runners/phantomjs.rb

@@ -3,25 +3,25 @@ require 'shellwords'
 module Opal
   module CliRunners
     class Phantomjs
-      def initialize(output = $stdout)
-        @output = output
+      SCRIPT_PATH = File.expand_path('../phantom.js', __FILE__)
+
+      def initialize(options)
+        @output = options.fetch(:output, $stdout)
       end
       attr_reader :output, :exit_status
 
       def run(code, argv)
-        unless argv.empty?
-          raise ArgumentError, 'Program arguments are not supported on the PhantomJS runner'
-        end
+        command = [
+          'phantomjs',
+          SCRIPT_PATH.shellescape,
+          *argv.map(&:shellescape)
+        ].join(' ')
 
         phantomjs = IO.popen(command, 'w', out: output) do |io|
           io.write(code)
         end
-        @exit_status = $?.exitstatus
-      end
 
-      def command
-        script_path = File.expand_path('../phantom.js', __FILE__)
-        "phantomjs #{script_path.shellescape}"
+        @exit_status = $?.exitstatus
       end
     end
   end

data/lib/opal/cli_runners/server.rb

@@ -3,9 +3,9 @@ require 'opal/cli_runners'
 module Opal
   module CliRunners
     class Server
-      def initialize(output, port)
-        @output ||= output || $stdout
-        @port = port
+      def initialize(options)
+        @output = options.fetch(:output, $stdout)
+        @port = options.fetch(:port, 3000).to_int
       end
       attr_reader :output, :port, :server
 

data/lib/opal/compiler.rb

@@ -84,6 +84,7 @@ module Opal
     # @return [Boolean]
     compiler_option :arity_check, false, :as => :arity_check?
 
+    # @deprecated
     # @!method freezing?
     #
     # stubs out #freeze and #frozen?
@@ -91,6 +92,7 @@ module Opal
     # @return [Boolean]
     compiler_option :freezing, true, :as => :freezing?
 
+    # @deprecated
     # @!method tainting?
     #
     # stubs out #taint, #untaint and #tainted?
@@ -264,6 +266,43 @@ module Opal
       result
     end
 
+    def in_ensure
+      return unless block_given?
+      @in_ensure = true
+      result = yield
+      @in_ensure = false
+
+      result
+    end
+
+    def in_ensure?
+      @in_ensure
+    end
+
+    # With a block will detect a break in the sexp processed from within
+    # the block (see BreakNode).
+    #
+    # Without a block (but inside a `#has_break?(&block)` call) returns the
+    # current result.
+    #
+    # Works in conjunction with #has_break!
+    #
+    # @return [Boolean] whether a block has been detected
+    def has_break?
+      return @break_detected unless block_given?
+      @break_detected = false
+      result = yield
+      detected = @break_detected
+      @break_detected = nil
+      detected
+    end
+
+    # Marks the current block has having detected a break, but only from inside
+    # a `#has_break?(&block)` block.
+    def has_break!
+      @break_detected = true if @break_detected == false
+    end
+
     def in_case
       return unless block_given?
       old = @case_stmt
@@ -321,7 +360,7 @@ module Opal
 
       case sexp.type
       # Undefs go from 1 ruby undef a,b,c to multiple JS Opal.udef() calls, so need to treat them as individual statements
-      # and put the return on the last one 
+      # and put the return on the last one
       when :undef
         last = sexp.pop
         sexp << returns(last)
@@ -380,9 +419,9 @@ module Opal
         sexp[3] = returns(sexp[3] || s(:nil))
         sexp
       else
-        s(:js_return, sexp).tap { |s|
-          s.source = sexp.source
-        }
+        return_sexp = s(:js_return, sexp)
+        return_sexp.source = sexp.source
+        return_sexp
       end
     end
 

data/lib/opal/config.rb

@@ -9,10 +9,11 @@ module Opal
         freezing_stubs_enabled:    true,
         tainting_stubs_enabled:    true,
         const_missing_enabled:     true,
-        dynamic_require_severity:  :error, # :error, :warning or :ignore
+        dynamic_require_severity:  :warning, # :error, :warning or :ignore
         irb_enabled:               false,
         inline_operators_enabled:  true,
         source_map_enabled:        true,
+        stubbed_files:             Set.new,
       }
     end
 
@@ -25,6 +26,7 @@ module Opal
     end
 
     COMPILER_KEYS = {
+      # Compiler option name:   # Config option name
       method_missing:           :method_missing_enabled,
       arity_check:              :arity_check_enabled,
       freezing:                 :freezing_stubs_enabled,