Get ready for opal-0.7.0

adambeynon · adambeynon · commit 0756d835bf05 · 2014-06-17T17:40:00.000+01:00
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'opal'
+# gem 'opal', :github => 'opal/opal'
+gem 'opal', :path => '../opal'
 
 gem 'rake'
 
diff --git a/Rakefile b/Rakefile
@@ -40,6 +40,34 @@ end
 
 def build_rspec
   Opal::Processor.dynamic_require_severity = :warning
+
+  code = []
+  gems = %w(rspec rspec-core rspec-support rspec-expectations rspec-mocks)
+
+  gems.each do |gem_name|
+    spec = Gem::Specification.find_by_name gem_name
+    gem_dir = File.join spec.gem_dir, 'lib'
+    prefix = gem_dir + '/'
+
+    Dir.glob(File.join(gem_dir, '**/*.rb')).each do |source|
+      requirable = source.sub(prefix, '').sub(/\.rb$/, '')
+
+      compiler = Opal::Compiler.new File.read(source),
+        requirable: true, file: requirable, dynamic_require_severity: :warning
+
+      code << compiler.compile
+    end
+  end
+
+  stubs = %w(shellwords fileutils optparse)
+
+  stubs.each do |stub|
+    compiler = Opal::Compiler.new '', requirable: true, file: stub
+    code << compiler.compile
+  end
+
+  return code.join "\n"
+
   Opal.append_path 'app'
 
   Opal.use_gem 'rspec'
diff --git a/opal/opal/rspec.rb b/opal/opal/rspec.rb
@@ -1,10 +1,32 @@
+class MiniTest
+  class Unit; end
+end
+
+Test = MiniTest
+
 require 'file'
-require 'dir'
+require 'corelib/dir'
 require 'thread'
 
+require 'set'
+require 'time'
+require 'rbconfig'
+require 'pathname'
+
 # vendor a pre-built rspec
 require 'opal/rspec/rspec'
 
+# we "fix" these files, so require them now so they are loaded before our
+# fixes file. We can't use Kernel#require() directly as the compiler will
+# complain it can't find these files at compile time, but they are available
+# from rspec.js from the gem.
+%w[rspec
+  rspec/core/formatters/base_text_formatter
+  rspec/core/formatters/html_printer
+  rspec/matchers/pretty
+  rspec/matchers/built_in/base_matcher
+  rspec/matchers/built_in/be].each { |r| `self.$require(r)` }
+
 require 'opal/rspec/fixes'
 require 'opal/rspec/text_formatter'
 require 'opal/rspec/browser_formatter'
diff --git a/opal/opal/rspec/fixes.rb b/opal/opal/rspec/fixes.rb
@@ -27,14 +27,18 @@ def self.fail_with(message, expected = nil, actual = nil)
 end
 
 # Opal does not support mutable strings
-module RSpec::Matchers::Pretty
-  def underscore(camel_cased_word)
-    word = camel_cased_word.to_s.dup
-    word = word.gsub(/([A-Z]+)([A-Z][a-z])/,'$1_$2')
-    word = word.gsub(/([a-z\d])([A-Z])/,'$1_$2')
-    word = word.tr("-", "_")
-    word = word.downcase
-    word
+module RSpec
+  module Matchers
+    module Pretty
+      def underscore(camel_cased_word)
+        word = camel_cased_word.to_s.dup
+        word = word.gsub(/([A-Z]+)([A-Z][a-z])/,'$1_$2')
+        word = word.gsub(/([a-z\d])([A-Z])/,'$1_$2')
+        word = word.tr("-", "_")
+        word = word.downcase
+        word
+      end
+    end
   end
 end
 
diff --git a/opal/opal/rspec/sprockets_runner.rb.erb b/opal/opal/rspec/sprockets_runner.rb.erb
@@ -1,11 +1,11 @@
 # This file is used by Opal::Server to basically load all spec files that
 # can be found in the spec/ directory.
 
-<% require_asset 'opal' %>
-<% require_asset 'opal-rspec' %>
+require 'opal'
+require 'opal-rspec'
 
 <% Dir.glob('spec/**/*_spec.{rb,opal}').each do |s| %>
-<% require_asset s.sub(/^spec\//, '').sub(/\.(rb|opal)$/, '') %>
+require <%= s.sub(/^spec\//, '').sub(/\.(rb|opal)$/, '').inspect %>
 <% end %>
 
 Opal::RSpec::Runner.autorun
