opal 0.7.0.beta1 → 0.7.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d851c3be15f64dbfc7a60b48889722334c757c0
-  data.tar.gz: e4e5a13810d7e30f2291aea3b5138e32e72ed15e
+  metadata.gz: a9bd47fb47cabeb742adca4e6b377de113225b60
+  data.tar.gz: 0dfa5e47116f8d56b3d1a2ff0b9473fa9b563b87
 SHA512:
-  metadata.gz: 6673321f15d3acdd817b9eeeefffc87a5cd2e9d9c0a8564ab272fb6096a295415a0243f8e079f10227d4c593ebd022b2b681c17abce715de50b19ebca5c77b08
-  data.tar.gz: 3ac4adb02d69f45cfa9396cab5814ae4b527dfbdb60b68d42a93c50dcb887d0b1d83c70d78800092e040eeb9f85235100db5b28a316bf1ba7f27c1e62c5631f9
+  metadata.gz: 3965105a918d9cfded13bf9526cdda32b73caa31c4ae7e3760f36c205f5cdb1e359604e9d6e4a519d0687ea0b0eced908140b54ddf952b4c7036ef0d0736a2b9
+  data.tar.gz: 5764370dc015b931115ab0bdb7e61b1a6699b067179545fdea0d5dd86366929e58b391726ef4257e752d5ebd33d9e9bdb316fd4f09309ec0c3ce24d28225f1b3

data/.gitignore

@@ -8,3 +8,4 @@ build/
 /cdn
 /node_modules
 /gh-pages
+/tmp

data/.gitmodules

@@ -1,6 +1,6 @@
 [submodule "spec/corelib"]
 	path = spec/corelib
-	url = https://github.com/rubyspec/rubyspec
+	url = https://github.com/opal/rubyspec
 [submodule "spec/stdlib/rubysl-singleton"]
 	path = spec/stdlib/rubysl-singleton
 	url = https://github.com/rubysl/rubysl-singleton

data/.inch.yml

@@ -0,0 +1,19 @@
+# files:
+#   # define files included in the analysis (defaults to ["{app,lib}/**/*.rb"])
+#   included:
+#     - plugins/**/*.rb
+#   # define files excluded from the analysis (defaults to [])
+#   excluded:
+#     # you can use file paths
+#     - plugins/vendor/sparkr/sparkr.rb
+#     # or globs
+#     - plugins/vendor/**/*.rb
+#     # or regular expressions
+#     - !ruby/regexp /vendor/
+
+
+files:
+  included:
+    - lib/**/*.rb
+  excluded:
+    - lib/opal/parser/grammar.rb

data/.travis.yml

@@ -1,19 +1,23 @@
 language: ruby
 
-cache: bundler
+cache:
+  bundler: true
+  directories:
+  - node_modules
 
 matrix:
   fast_finish: true
 
   include:
-    - rvm: 2.1.1
-      env: RUN=default
+    - rvm: 2.1
+      env: RUN=default TZ="/usr/share/zoneinfo/Pacific/Fiji"
+      before_install: test -d node_modules || npm install
 
     - rvm: 1.9.3
       env: RUN=rspec
 
     - rvm: 2.0.0
-      env: RUN=rspec
+      env: RUN="rspec mspec"
 
     - rvm: rbx
       env: RUN=rspec
@@ -28,11 +32,10 @@ matrix:
     - rvm: rbx
     - rvm: jruby
 
-# Setting TimeZone. We'll need to do this in order to
-# have the TZ related failures surface on Travis CI.
-# http://stackoverflow.com/a/23374438/601782
+
 before_install:
   - git submodule update --init
+  - npm install
 
 script:
   - "bundle exec rake $RUN"

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## edge (upcoming 0.7)
 
+*   Add `Set` methods `#classify`, `#collect!`, `#map!`, `#subtract` `#replace`,
+    `#difference` and `#eql?`
+
+*   Support `module_function` without args to toggle module functions.
+
+*   Fix bug where command calls with no space and sym arg were incorrectly parsed.
+
+*   Add some `StringScanner` methods.
+
+*   Add `Date#<<` and `Date#>>` implementations.
+
+*   Support nested directories using `require_tree` directive.
+
+*   Fix bug where Exception subclasses could not have methods defined on them.
+
+*   Fix symbols with interpolations `:"#{foo}"`
+
+*   Implement $1..N matchers and rewrite support for $~, $', $& and $\`.
+
+*   Implement `Regexp.last_match`.
+
 *   Fixed `-@` unary op. precedence with a numeric and followed by a method call (e.g. `-1.foo` was parsed as `-(1.foo)`)
 
 *   `require_relative` (with strings) is now preprocessed, expanded and added to `Compiler#requires`
@@ -21,6 +42,8 @@
 
 *   Add initial support for Module#autoload.
 
+*   Fix `Enumerator#with_index`, `Numeric#round`.
+
 ## 0.6.2 2014-04-25
 
 *   Added Range#size

data/README.md

@@ -11,9 +11,9 @@ Opal is [hosted on github](http://github.com/opal/opal), and there
 is a Freenode IRC channel at [#opal](http://webchat.freenode.net/?channels=opal),
 ask questions on [stackoverflow (tag #opalrb)](http://stackoverflow.com/questions/ask?tags=opalrb).
 
-[![Stack Overflow](http://img.shields.io/badge/stackoverflow-%23opalrb-orange.svg?style=flat)](http://stackoverflow.com/questions/ask?tags=opalrb)
-[![API doc](http://img.shields.io/badge/doc-api-blue.svg?style=flat)](http://opalrb.org/docs/api)
+[![Inline docs](http://inch-ci.org/github/opal/opal.svg?branch=master&style=flat)](http://opalrb.org/docs/api)
 [![Gitter chat](http://img.shields.io/badge/gitter-opal%2Fopal-009966.svg?style=flat)](https://gitter.im/opal/opal)
+[![Stack Overflow](http://img.shields.io/badge/stackoverflow-%23opalrb-orange.svg?style=flat)](http://stackoverflow.com/questions/ask?tags=opalrb)
 
 
 

data/Rakefile

@@ -18,9 +18,51 @@ 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_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']
+
+  specs = []
+  add_specs = ->(name, new_specs) { p [new_specs.size, name]; specs + new_specs}
+
+  specs = add_specs.(:filters, filters)
+  pattern = ENV['PATTERN']
+  whitelist_pattern = !!ENV['RUBYSPECS']
+
+  if pattern
+    custom = Dir[pattern]
+    custom &= rubyspecs if whitelist_pattern
+    specs = add_specs.(:custom, custom)
+  else
+    specs = add_specs.(:shared, shared)
+    specs = add_specs.(:rubyspecs, rubyspecs)
+  end
+
+  requires = specs.map{|s| "require '#{s.sub(/^spec\//,'')}'"}
+  filename = 'tmp/mspec_node.rb'
+  mkdir_p File.dirname(filename)
+  File.write filename, <<-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"
+
+  sh 'RUBYOPT="-rbundler/setup -rmspec/opal/special_calls" '\
+     "bin/opal -Ispec -Ilib -gmspec #{stubs} -rnodejs -Dwarning -A #{filename}"
+end
+
 require 'opal/version'
 desc <<-DESC
 Build *corelib* and *stdlib* to "build/"

data/bin/opal

@@ -12,10 +12,15 @@ rescue OptionParser::InvalidOption => e
 end
 
 require 'opal/cli'
-cli = Opal::CLI.new options.options.merge(:file => ARGF.file, :argv => ARGV.dup)
+cli = Opal::CLI.new options.options.merge(
+  file:     ARGF.file,
+  filename: ARGF.filename,
+  argv:     ARGV.dup
+)
 
 begin
   cli.run
+  exit cli.exit_status || 0
 rescue Opal::CliRunners::RunnerError => e
   $stderr.puts e.message
   exit 72

data/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
@@ -117,7 +93,7 @@ module MSpec
       end
     end
 
-    class Environment < ::Opal::Environment
+    class Environment < ::Sprockets::Environment
       attr_reader :basedir, :pattern
 
       def initialize(basedir = nil, pattern = nil)
@@ -137,6 +113,8 @@ module MSpec
         ENV['OPAL_SPEC'] ||= files_to_run(pattern).join(',')
 
         super()
+
+        ::Opal.paths.each { |p| append_path p }
       end
 
       def stubs
@@ -205,16 +183,17 @@ module MSpec
 
         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
 

data/lib/mspec/opal/runner.rb

@@ -107,6 +107,7 @@ class BrowserFormatter
       @exceptions.each_with_index do |exception, idx|
         log "\n  #{idx + 1}. #{exception.description}"
         red "\n    #{exception.message}"
+        log "\n    #{`#{exception.exception}.stack`}\n"
       end
 
       log "\nFinished"
@@ -144,13 +145,55 @@ class PhantomFormatter < BrowserFormatter
   end
 end
 
-class PhantomDebugFormatter < PhantomFormatter
+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
+    print_example(state)
+  end
+
+  def print_example(state)
+    unless exception?
+      green('.')
+    else
+      red(failure? ? 'F' : 'E')
+    end
+  end
+
+  def finish_with_code(code)
+    `global.OPAL_SPEC_CODE = code;`
+  end
+
+  def finish_with_code(code)
+    puts "\n\n"
+    exit(code)
+  end
+end
+
+class PhantomDocFormatter < PhantomFormatter
   def after(state = nil)
     (@exception && state) ? red(state.description) : green(state.description)
     super
   end
 end
 
+class NodeJSDocFormatter < NodeJSFormatter
+  def print_example(state)
+    (@exception && state) ? red(state.description+"\n") : green(state.description+"\n")
+  end
+end
+
 module MSpec
   def self.opal_runner
     @env = Object.new

data/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
+
+

data/lib/opal/builder.rb

@@ -76,7 +76,7 @@ module Opal
         base = paths.find { |p| expanded.start_with?(p) }
         next [] if base.nil?
 
-        globs = extensions.map { |ext| File.join base, tree, "*.#{ext}" }
+        globs = extensions.map { |ext| File.join base, tree, '**', "*.#{ext}" }
 
         Dir[*globs].map do |file|
           Pathname(file).relative_path_from(Pathname(base)).to_s.gsub(/(\.js)?(\.(?:#{extensions.join '|'}))$/, '')

data/lib/opal/builder_processors.rb

@@ -110,7 +110,7 @@ module Opal
       end
     end
 
-    class ERBProcessor < RubyProcessor
+    class OpalERBProcessor < RubyProcessor
       handles :opalerb
 
       def initialize(*args)
@@ -134,31 +134,12 @@ module Opal
       end
     end
 
-    class HamlProcessor < RubyProcessor
-      handles :haml
-
-      def initialize(*args)
-        super
-        @source = prepare(@source, @filename)
-      end
-
-      def requires
-        ['opal-haml'] + super
-      end
-
-      def prepare(source, path)
-        haml = ::Haml::Engine.new(source, :ugly => true).precompiled
-        haml = haml.gsub('_hamlout.buffer', '_hamlout')
-
-        ::Opal::Haml.wrap haml, path
-      end
-    end
-
-    class ERB_Processor < Processor
+    class ERBProcessor < Processor
       handles :erb
 
       def source
-        "Opal.modules[#{@filename.inspect}] = function() {#{::ERB.new(@source.to_s).result}};"
+        result = ::ERB.new(@source.to_s).result
+        "Opal.modules[#{@filename.inspect}] = function() {#{result}};"
       end
     end
   end

data/lib/opal/cli.rb

@@ -6,7 +6,8 @@ require 'opal/cli_runners'
 module Opal
   class CLI
     attr_reader :options, :file, :compiler_options, :evals, :load_paths, :argv,
-                :output, :requires, :gems, :stubs, :verbose, :port, :preload
+                :output, :requires, :gems, :stubs, :verbose, :port, :preload,
+                :filename
 
     def compile?
       @compile
@@ -44,9 +45,10 @@ module Opal
       @preload    = options.delete(:preload)    || []
       @output     = options.delete(:output)     || self.class.stdout || $stdout
       @verbose    = options.fetch(:verbose, false); options.delete(:verbose)
+      @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)
@@ -68,17 +70,21 @@ module Opal
 
     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 :server;      CliRunners::Server.new(output, port)
+                  when :nodejs;      CliRunners::Nodejs.new(output)
+                  when :phantomjs;   CliRunners::Phantomjs.new(output)
+                  when :applescript; CliRunners::AppleScript.new(output)
                   else raise ArgumentError, @runner_type.inspect
                   end
     end
 
     def run_code
       runner.run(compiled_source, argv)
+      @exit_status = runner.exit_status
     end
 
+    attr_reader :exit_status
+
     def compiled_source
       Opal.paths.concat load_paths
       gems.each { |gem_name| Opal.use_gem gem_name }
@@ -91,14 +97,14 @@ module Opal
 
       # REQUIRES: -r
       requires.each do |local_require|
-        builder.build_str("require #{local_require.inspect}", 'require')
+        builder.build(local_require)
       end
 
       if evals.any?
         builder.build_str(evals.join("\n"), '-e')
       else
-        if file and (file.path != '-' or evals.empty?)
-          builder.build_str(file.read, file.path)
+        if file and (filename != '-' or evals.empty?)
+          builder.build_str(file.read, filename)
         end
       end
 
@@ -126,10 +132,10 @@ module Opal
       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