Merge pull request #617 from opal/require-tree

elia · elia · commit b73e9051079d · 2014-10-11T17:44:30.000+02:00
Require tree
diff --git a/bin/opal-mspec b/bin/opal-mspec
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 specs = ARGV.map do |s|
-  s.end_with?('.rb') ? s : "#{s}/**/**/*_spec.rb"
+  s.end_with?('.rb') ? s : "#{s}/**/*_spec.rb"
 end
 pattern = %Q{MSPEC_PATTERN="{#{specs.join(',')}}"} if specs.any?
 command = [pattern, 'rake mspec'].compact.join(' ')
diff --git a/lib/mspec/opal/rake_task.rb b/lib/mspec/opal/rake_task.rb
@@ -205,7 +205,8 @@ def files_to_run(pattern=nil)
 
         if pattern
           # add custom opal specs from spec/
-          add_files paths_from_glob(pattern) & rubyspec_white_list, :custom_pattern
+          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
 
         else
           # add opal specific specs
diff --git a/lib/mspec/opal/runner.rb b/lib/mspec/opal/runner.rb
@@ -133,6 +133,15 @@ def red(str)
   def log(str)
     `console.log(str)`
   end
+
+  def after(state)
+    super
+    unless exception?
+      print '.'
+    else
+      print failure? ? 'F' : 'E'
+    end
+  end
 end
 
 class PhantomDebugFormatter < PhantomFormatter
diff --git a/lib/mspec/opal/sprockets.js b/lib/mspec/opal/sprockets.js
@@ -14,6 +14,23 @@ page.onInitialized = function() {
   });
 };
 
+var system = require('system');
+page.onCallback = function(data) {
+  switch (data[0]) {
+  case 'exit':
+    var status = data[1] || 0;
+    phantom.exit(status);
+  case 'stdout':
+    system.stdout.write(data[1] || '');
+    break;
+  case 'stderr':
+    system.stderr.write(data[1] || '');
+    break;
+  default:
+    console.error('Unknown callback data: ', data);
+  }
+};
+
 page.open(args[0], function(status) {
   if (status !== 'success') {
     console.error("Cannot load: " + args[0]);
diff --git a/lib/opal/builder.rb b/lib/opal/builder.rb
@@ -27,7 +27,7 @@ def self.build(*args, &block)
     end
 
     def build(path, options = {})
-      source = path_reader.read(path)
+      source = read(path)
       build_str(source, path, options)
     end
 
@@ -63,11 +63,25 @@ def source_map
     private
 
     def tree_requires(asset, path)
+      if path.nil? or path.empty?
+        dirname = Dir.pwd
+      else
+        dirname = File.dirname(File.expand_path(path))
+      end
+
+      paths = path_reader.paths.map{|p| File.expand_path(p)}
+
       asset.required_trees.flat_map do |tree|
-        base = File.expand_path(File.dirname(path))
-        expanded = File.expand_path File.join(base, tree, '*.rb')
-        Dir[expanded].map do |file|
-          file.gsub(/(\.js)?(\.(?:rb|opal))/, '')[(base.size+1)..-1]
+        expanded = File.expand_path(tree, dirname)
+        base = paths.find { |p| expanded.start_with?(p) }
+        next [] if base.nil?
+
+        globs = []
+        globs << File.join(base, tree, '*.rb')
+        globs << File.join(base, tree, '*.opal')
+        globs << File.join(base, tree, '*.js')
+        Dir[*globs].map do |file|
+          Pathname(file).relative_path_from(Pathname(base)).to_s.gsub(/(\.js)?(\.(?:rb|opal))/, '')
         end
       end
     end
@@ -78,25 +92,34 @@ def processor_for(source, filename, path, options)
       return processor.new(source, filename, compiler_options.merge(options))
     end
 
+    def read(path)
+      path_reader.read(path) or
+        raise ArgumentError, "can't find file: #{path.inspect} in #{path_reader.paths.inspect}"
+    end
+
     def process_require(filename, options)
       return if prerequired.include?(filename)
       return if already_processed.include?(filename)
       already_processed << filename
 
-      source = stub?(filename) ? '' : path_reader.read(filename)
+      source = stub?(filename) ? '' : read(filename)
 
-      if source.nil? && @compiler_options[:dynamic_require_severity] != :error
-        raise LoadError, "can't find file: #{filename.inspect}"
+      if source.nil?
+        message = "can't find file: #{filename.inspect}"
+        case @compiler_options[:dynamic_require_severity]
+        when :error then raise LoadError, message
+        when :warning then warn "can't find file: #{filename.inspect}"
+        end
       end
 
       path = path_reader.expand(filename).to_s unless stub?(filename)
       asset = processor_for(source, filename, path, options.merge(requirable: true))
-      process_requires(asset, options)
+      process_requires(asset.requires+tree_requires(asset, path), options)
       processed << asset
     end
 
-    def process_requires(asset, options)
-      asset.requires.map { |r| process_require(r, options) }
+    def process_requires(requires, options)
+      requires.map { |r| process_require(r, options) }
     end
 
     def already_processed
diff --git a/lib/opal/cli_runners/phantom.js b/lib/opal/cli_runners/phantom.js
@@ -13,6 +13,11 @@ page.onCallback = function(data) {
   case 'exit':
     var status = data[1] || 0;
     phantom.exit(status);
+  case 'stdout':
+    system.stdout.write(data[1] || '');
+    break;
+  case 'stderr':
+    system.stderr.write(data[1] || '');
     break;
   default:
     console.error('Unknown callback data: ', data);
diff --git a/lib/opal/nodes/call.rb b/lib/opal/nodes/call.rb
@@ -187,12 +187,15 @@ def compile_default?
       end
 
       add_special :require_tree do
-        compile_default!
         arg = arglist[1]
         if arg[0] == :str
           dir = File.dirname(compiler.file)
-          compiler.required_trees << arg[1]
+          relative_path = arg[1]
+          full_path = Pathname(dir).join(relative_path).cleanpath.to_s
+          compiler.required_trees << full_path
+          arg[1] = full_path
         end
+        compile_default!
         push fragment('')
       end
 
diff --git a/lib/opal/path_reader.rb b/lib/opal/path_reader.rb
@@ -16,6 +16,10 @@ def expand(path)
       file_finder.find(path)
     end
 
+    def paths
+      file_finder.paths
+    end
+
 
     private
 
diff --git a/lib/opal/sprockets/path_reader.rb b/lib/opal/sprockets/path_reader.rb
@@ -23,6 +23,10 @@ def expand path
         env.resolve(path)
       end
 
+      def paths
+        env.paths
+      end
+
       attr_reader :env, :context
     end
 
diff --git a/opal/corelib/file.rb b/opal/corelib/file.rb
@@ -0,0 +1,56 @@
+class File < IO
+  Separator = SEPARATOR = '/'
+
+  class << self
+    def expand_path(path, basedir = nil)
+      path = [basedir, path].compact.join(SEPARATOR)
+      parts = path.split(SEPARATOR)
+      new_parts = []
+      parts[0] = Dir.home if parts.first == '~'
+
+      parts.each do |part|
+        if part == '..'
+          new_parts.pop
+        else
+          new_parts << part
+        end
+      end
+      new_parts.join(SEPARATOR)
+    end
+
+    def dirname(path)
+      split(path)[0..-2]
+    end
+
+    def basename(path)
+      split(path)[-1]
+    end
+
+    def exist? path
+      `Opal.modules[#{path}] != null`
+    end
+    alias exists? exist?
+
+    def directory?(path)
+      files = []
+      %x{
+        for (var key in Opal.modules) {
+          #{files}.push(key)
+        }
+      }
+      path = path.gsub(%r{(^.#{SEPARATOR}+|#{SEPARATOR}+$)})
+      file = files.find do |file|
+        file =~ /^#{path}/
+      end
+      file
+    end
+
+    def join(*paths)
+      paths.join(SEPARATOR).gsub(%r{#{SEPARATOR}+}, SEPARATOR)
+    end
+
+    def split(path)
+      path.split(SEPARATOR)
+    end
+  end
+end
diff --git a/opal/corelib/kernel.rb b/opal/corelib/kernel.rb
@@ -553,6 +553,22 @@ def require_relative file
     `$opal.require( $opal.normalize_loadable_path(#{file}) )`
   end
 
+  # `path` should be the ful path to be found in registered modules (`Opal.modules`)
+  def require_tree path
+    path = File.expand_path(path)
+    %x{
+      var file_name, file_names = Object.keys($opal.modules);
+      path = path.replace(/\/?$/, '/');
+      for (var i = 0; i < file_names.length; i++) {
+        file_name = file_names[i];
+        if (file_name['$start_with?'](path)) {
+          $opal.require(file_name);
+        }
+      }
+    }
+    nil
+  end
+
   def load file
     `$opal.load( $opal.normalize_loadable_path(#{file}) )`
   end
diff --git a/opal/opal.rb b/opal/opal.rb
@@ -29,3 +29,4 @@
 require 'corelib/main'
 require 'corelib/variables'
 require 'corelib/dir'
+require 'corelib/file'
diff --git a/spec/lib/builder_processors_spec.rb b/spec/lib/builder_processors_spec.rb
@@ -21,7 +21,7 @@
 
   it 'fills required_trees' do
     processor = described_class.new('require_tree "./pippo"', '-e')
-    expect(processor.required_trees).to eq(['./pippo'])
+    expect(processor.required_trees).to eq(['pippo'])
   end
 end
 
diff --git a/spec/lib/builder_spec.rb b/spec/lib/builder_spec.rb
@@ -12,8 +12,8 @@
 
   it 'respect #require_tree calls' do
     begin
-      Opal.append_path(File.expand_path('../fixtures/', __FILE__))
-      expect(builder.build('require_tree_test').to_s).to match('required_file1')
+      Opal.append_path(File.expand_path('..', __FILE__))
+      expect(builder.build('fixtures/require_tree_test').to_s).to include('Opal.modules["fixtures/required_tree_test/required_file1"]')
     ensure
       Opal.instance_variable_set('@paths', nil)
     end
diff --git a/spec/lib/compiler_spec.rb b/spec/lib/compiler_spec.rb
@@ -182,7 +182,7 @@
 
       it 'parses and resolve #require argument' do
         compiler = compiler_for(file.read)
-        expect(compiler.required_trees).to eq(['./required_tree_test'])
+        expect(compiler.required_trees).to eq(['../fixtures/required_tree_test'])
       end
     end
   end
diff --git a/spec/lib/fixtures/require_tree_test.rb b/spec/lib/fixtures/require_tree_test.rb
@@ -1,3 +1,3 @@
-require_tree './required_tree_test'
+require_tree '../fixtures/required_tree_test'
 
 puts 5
diff --git a/spec/lib/path_reader_spec.rb b/spec/lib/path_reader_spec.rb
@@ -14,6 +14,7 @@
   before do
     path_finder.stub(:find) {|path| nil}
     path_finder.stub(:find).with(path).and_return(full_path)
+    path_finder.stub(:paths).and_return(Opal.paths)
   end
 
   include_examples :path_finder
diff --git a/spec/lib/shared/path_reader_shared.rb b/spec/lib/shared/path_reader_shared.rb
@@ -1,17 +1,31 @@
 require 'lib/spec_helper'
 
+# Below the helpers expected from a spec that
+# includes these shared examples:
+#
+# @object [PathReader] path_reader the object under test
+# @method [String]     path        the path we want to read
+# @method [String]     contents    the contents we expect to be read
+#
 shared_examples :path_reader do
-  # @param path
-  # the path we want to read
-  #
-  # @param contents
-  # the contents we expect to be read
-  #
-  it 'responds to #path' do
-    expect(path_reader.read(path)).to eq(contents)
+  describe '#paths' do
+    it 'is an Enumberable' do
+      expect(path_reader.paths).to be_an(Enumerable)
+    end
+
+    it 'includes Opal.paths' do
+      paths = path_reader.paths.to_a
+      Opal.paths.each { |path| expect(paths).to include(path) }
+    end
   end
 
-  it 'returns nil if the file is missing' do
-    expect(path_reader.read('unexpected-path!')).to be_nil
+  describe '#read' do
+    it 'responds to #path' do
+      expect(path_reader.read(path)).to eq(contents)
+    end
+
+    it 'returns nil if the file is missing' do
+      expect(path_reader.read('unexpected-path!')).to be_nil
+    end
   end
 end
diff --git a/spec/opal/core/fixtures/require_tree_files/file 1.rb b/spec/opal/core/fixtures/require_tree_files/file 1.rb
@@ -0,0 +1 @@
+$ScratchPad << File.basename(__FILE__)
diff --git a/spec/opal/core/fixtures/require_tree_files/file 2.rb b/spec/opal/core/fixtures/require_tree_files/file 2.rb
@@ -0,0 +1 @@
+$ScratchPad << File.basename(__FILE__)
diff --git a/spec/opal/core/fixtures/require_tree_files/file 3.rb b/spec/opal/core/fixtures/require_tree_files/file 3.rb
@@ -0,0 +1 @@
+$ScratchPad << File.basename(__FILE__)
diff --git a/spec/opal/core/fixtures/require_tree_files/file 4.rb b/spec/opal/core/fixtures/require_tree_files/file 4.rb
@@ -0,0 +1 @@
+$ScratchPad << File.basename(__FILE__)
diff --git a/spec/opal/core/fixtures/require_tree_files/file 5.rb b/spec/opal/core/fixtures/require_tree_files/file 5.rb
@@ -0,0 +1 @@
+$ScratchPad << File.basename(__FILE__)
diff --git a/spec/opal/core/kernel/require_tree_spec.rb b/spec/opal/core/kernel/require_tree_spec.rb
@@ -0,0 +1,7 @@
+describe 'Kernel.require_tree' do
+  it 'loads all the files in a directory' do
+    $ScratchPad = []
+    require_tree '../fixtures/require_tree_files'
+    $ScratchPad.sort.should == ['file 1', 'file 2', 'file 3', 'file 4', 'file 5']
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -27,7 +27,12 @@ def at_exit(&block)
   end
 end
 
-formatter_class = `!!window.OPAL_SPEC_PHANTOM` ? PhantomFormatter : BrowserFormatter
+if `!!window.OPAL_SPEC_PHANTOM`
+  require 'phantomjs'
+  formatter_class = PhantomFormatter
+else
+  formatter_class = BrowserFormatter
+end
 
 # Uncomment the following to see example titles when they're executed.
 # (useful to relate debug output to the example that generated it)
diff --git a/stdlib/file.rb b/stdlib/file.rb
diff --git a/stdlib/phantomjs.rb b/stdlib/phantomjs.rb

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-require_tree './required_tree_test'`
	`1`	`+require_tree '../fixtures/required_tree_test'`
`2`	`2`
`3`	`3`	`puts 5`
-Original file line number
+Diff line change
 module Kernel
   def exit status = 0
 -    `callPhantom(["exit", #{status}]);`
 +    `callPhantom(['exit', status]);`
   end
 end
++
 +STDOUT.write_proc = `function(str){callPhantom(['stdout', str])}`
 +STDERR.write_proc = `function(str){callPhantom(['stderr', str])}`