opal · Nov 21, 2013 · Nov 21, 2013 · Nov 21, 2013 · Nov 21, 2013 · Nov 21, 2013
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,5 @@
 .yardoc
 .bundle
 Gemfile.lock
-/mspec
-/build
+build/
 /.github_access_token
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "rubyspec"]
-	path = rubyspec
+[submodule "spec/opal/rubyspec"]
+	path = spec/opal/rubyspec
 	url = git://github.com/rubyspec/rubyspec.git
diff --git a/Rakefile b/Rakefile
@@ -2,51 +2,20 @@ require 'bundler'
 Bundler.require
 Bundler::GemHelper.install_tasks
 
-import 'tasks/mspec.rake'
-
-namespace :github do
-  desc "Upload assets to github"
-  task :upload_assets do
-    require 'octokit'
-    # https://github.com/octokit/octokit.rb#oauth-access-tokens
-    token_path = '.github_access_token'
-    File.exist?(token_path) or raise ArgumentError, "Please create a personal access token (https://github.com/settings/tokens/new) and paste it inside #{token_path.inspect}"
-    token = File.read(token_path).strip
-    client = Octokit::Client.new :access_token => token
-    tag_name = ENV['TAG'] || raise(ArgumentError, 'missing the TAG env variable (e.g. TAG=v0.4.4)')
-    release = client.releases('opal/opal').find{|r| p(r.id); p(r).tag_name == tag_name}
-    release_url = "https://api.github.com/repos/opal/opal/releases/#{release.id}"
-    %w[opal opal-parser].each do |name|
-      client.upload_asset release_url, "build/#{name}.js", :content_type => 'application/x-javascript'
-      client.upload_asset release_url, "build/#{name}.min.js", :content_type => 'application/x-javascript'
-      client.upload_asset release_url, "build/#{name}.min.js.gz", :content_type => 'application/octet-stream'
-    end
-  end
-end
+import 'tasks/github.rake'
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:mri_spec) do |t|
-  t.pattern = 'mri_spec/**/*_spec.rb'
+RSpec::Core::RakeTask.new(:rspec) do |t|
+  t.pattern = 'spec/cli/**/*_spec.rb'
 end
 
-desc "Run tests through mspec"
-task :mspec do
-  RunSpec.new
-end
+require 'mspec/opal/rake_task'
+MSpec::Opal::RakeTask.new(:mspec)
 
-task :default => [:mri_spec, :mspec] do
-end
+task :default => [:rspec, :mspec]
 
-desc "Build specs to build/specs.js and build/specs.min.js"
-task :build_specs do
-  Opal::Processor.arity_check_enabled = true
-  ENV['OPAL_SPEC'] = ["#{Dir.pwd}/spec/"].join(',')
 
-  env = SpecEnvironment.new
-  env.build
-end
-
-desc "Build opal.js and opal-parser.js to build/"
+desc 'Build opal.js and opal-parser.js to build/'
 task :dist do
   Opal::Processor.arity_check_enabled = false
   Opal::Processor.const_missing_enabled = false
@@ -62,8 +31,8 @@ task :dist do
     $stdout.flush
 
     src = env[lib].to_s
-    min = uglify src
-    gzp = gzip min
+    min = Opal::Builder::Util.uglify src
+    gzp = Opal::Builder::Util.gzip min
 
     File.open("build/#{lib}.js", 'w+')        { |f| f << src }
     File.open("build/#{lib}.min.js", 'w+')    { |f| f << min } if min
@@ -77,31 +46,12 @@ task :dist do
   end
 end
 
-desc "Rebuild grammar.rb for opal parser"
+desc 'Rebuild grammar.rb for opal parser'
 task :racc do
   %x(racc -l lib/opal/parser/grammar.y -o lib/opal/parser/grammar.rb)
 end
 
-# Used for uglifying source to minify
-def uglify(str)
-  IO.popen('uglifyjs 2> /dev/null', 'r+') do |i|
-    i.puts str
-    i.close_write
-    return i.read
-  end
-rescue Errno::ENOENT
-  $stderr.puts '"uglifyjs" command not found (install with: "npm install -g uglify-js")'
-  nil
-end
-
-# Gzip code to check file size
-def gzip(str)
-  IO.popen('gzip -f 2> /dev/null', 'r+') do |i|
-    i.puts str
-    i.close_write
-    return i.read
-  end
-rescue Errno::ENOENT
-  $stderr.puts '"gzip" command not found, it is required to produce the .gz version'
-  nil
+desc 'Remove any generated file.'
+task :clobber do
+  rm_r './build'
 end
diff --git a/bin/opal-build b/bin/opal-build
@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'opal'
+
+if ARGV.first == '--gem'
+  gem_name = ARGV[1]
+
+  require 'rubygems'
+  Opal.use_gem gem_name
+end
+
+require_file = ARGV[1..-1].last || gem_name.dup.untaint.gsub('-','/')
+puts Opal::Builder.build require_file
+
diff --git a/config.ru b/config.ru
@@ -0,0 +1,14 @@
+require 'bundler'
+Bundler.require
+
+require 'mspec/opal/rake_task'
+
+::Opal::Processor.arity_check_enabled = true
+::Opal::Processor.dynamic_require_severity = :raise
+
+use Rack::ShowExceptions
+use Rack::ShowStatus
+use MSpec::Opal::Index
+run MSpec::Opal::Environment.new
+
+
diff --git a/spec/ospec/main.rb.erb → lib/mspec/opal/main.rb.erb b/spec/ospec/main.rb.erb → lib/mspec/opal/main.rb.erb
diff --git a/spec/ospec/mspec_fixes.rb → lib/mspec/opal/mspec_fixes.rb b/spec/ospec/mspec_fixes.rb → lib/mspec/opal/mspec_fixes.rb
diff --git a/lib/mspec/opal/rake_task.rb b/lib/mspec/opal/rake_task.rb
@@ -0,0 +1,233 @@
+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 = "rubyspec/language/versions/#{lang_type}_1.9"
+
+      if File.exist?(target)
+        compiler.requires << target
+      end
+
+      return fragment("nil")
+    end
+
+    nil
+  end
+end
+
+
+require 'rack'
+require 'webrick'
+require 'opal-sprockets'
+module MSpec
+  module Opal
+    DEFAULT_PATTERN = 'spec/opal/{parser,core,compiler,stdlib}/**/*_spec.rb'
+    DEFAULT_BASEDIR = 'spec/opal'
+
+    require 'rake'
+    require 'rake/tasklib'
+    class RakeTask < ::Rake::TaskLib
+      include ::Rake::DSL if defined?(::Rake::DSL)
+
+      def initialize(name, &task_block)
+        namespace name do
+          desc 'Run MSpec::Opal code examples' unless ::Rake.application.last_comment
+          task :default do
+            puts 'Starting MSpec Runner...'
+            runner = Runner.new(&task_block)
+            runner.run
+          end
+
+          desc 'Build specs to build/specs.js and build/specs.min.js'
+          task :build do
+            path = './build/specs.js'
+            min_path = './build/specs.min.js'
+            Environment.new.build_specs(path)
+            min = ::Opal::Builder::Util.uglify File.read(path)
+            File.open(min_path, 'w') { |f| f << min_path }
+          end
+        end
+
+        task name => "#{name}:default"
+      end
+    end
+
+    class Runner
+      def initialize &block
+        @app = RackApp.new(&block).to_app
+        @port = 9999
+      end
+
+      attr_reader :app, :server_pid
+      attr_accessor :port
+
+      def passed?
+        @passed
+      end
+
+      def run
+        start_server
+        start_phantomjs
+
+        exit 1 unless passed?
+      rescue => e
+        puts e.message
+      ensure
+        stop_server if server_pid
+      end
+
+      def stop_server
+        Process.kill(:SIGINT, server_pid)
+        Process.wait
+      end
+
+      def start_phantomjs
+        require 'shellwords'
+        runner  = File.expand_path('../sprockets.js', __FILE__).shellescape
+        url     = "http://localhost:#{port}/".shellescape
+        command = %Q{phantomjs #{runner} #{url}}
+
+        @passed = system command
+      end
+
+      def start_server
+        @server_pid = fork do
+          Rack::Server.start(:app => app, :Port => port, :AccessLog => [],
+            :Logger => WEBrick::Log.new("/dev/null"))
+        end
+      end
+    end
+
+    class Environment < ::Opal::Environment
+      attr_reader :basedir, :pattern
+
+      def initialize(basedir = nil, pattern = nil)
+        ::Opal::Processor.arity_check_enabled = true
+        ::Opal::Processor.dynamic_require_severity = :ignore
+        super()
+        @pattern = pattern || DEFAULT_PATTERN
+        @basedir = basedir = File.expand_path(basedir || DEFAULT_BASEDIR)
+        append_path basedir
+        append_path "#{basedir}/rubyspec"
+        use_gem 'mspec'
+
+        stubs.each do |asset|
+          ::Opal::Processor.stub_file asset
+        end
+
+        ENV['OPAL_SPEC'] = files_to_run(pattern).join(',')
+      end
+
+      def stubs
+        # missing stdlib
+        stubs = %w[fileutils iconv yaml]
+
+        # use x-strings which generate bad javascript
+        stubs << "mspec/helpers/tmp"
+        stubs << "mspec/helpers/environment"
+        stubs << "mspec/guards/block_device"
+        stubs << "mspec/guards/endian"
+
+        stubs
+      end
+
+      def specs
+        @specs ||= self['mspec/opal/main'] || raise("Cannot find mspec/opal/main inside #{paths.inspect}")
+      end
+
+      def build_min file = "#{basedir}/build/specs.min.js"
+        build ::Opal::Builder::Util.uglify(specs.to_s), file
+      end
+
+      def files
+        @files ||= []
+      end
+
+      def add_files specs
+        files.concat specs.flatten
+      end
+
+      def paths_from_glob pattern
+        Dir.glob(File.expand_path(pattern)).map do |s|
+          s.sub(/^#{basedir}\//, '').sub(/\.rb$/, '')
+        end
+      end
+
+      def rubyspec_paths
+        File.read("#{basedir}/rubyspecs").split("\n").reject do |line|
+          line.empty? || line.start_with?('#')
+        end
+      end
+
+      def files_to_run(pattern=nil)
+        # add any filters in spec/filters of specs we dont want to run
+        add_files paths_from_glob("#{basedir}/filters/**/*.rb")
+
+        # add custom opal specs from spec/
+        add_files paths_from_glob(pattern) if pattern
+
+        # add any rubyspecs we want to run (defined in spec/rubyspecs)
+        add_files rubyspec_paths
+      end
+
+      def build_specs file = "#{basedir}/build/specs.js"
+        code = specs.to_s
+        FileUtils.mkdir_p File.dirname(file)
+        puts "Building #{file}..."
+        File.open(file, 'w+') { |o| o << code }
+      end
+    end
+
+    class RackApp < Rack::Builder
+      attr_accessor :pattern, :basedir
+
+      def initialize
+        self.pattern = DEFAULT_PATTERN
+        self.basedir = DEFAULT_BASEDIR
+
+        yield(self) if block_given?
+        super()
+
+        use Rack::ShowExceptions
+        use Rack::ShowStatus
+        use Index
+        run environment
+      end
+
+      def environment
+        @environment ||= Environment.new(basedir, pattern)
+      end
+    end
+
+    class Index
+      HTML = <<-HTML
+      <!DOCTYPE html>
+      <html>
+        <head>
+          <title>Opal Specs</title>
+        </head>
+        <body>
+          <script src="/mspec/opal/main.js"></script>
+        </body>
+      </html>
+      HTML
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        if %w[/ /index.html].include? env['PATH_INFO']
+          [200, { 'Content-Type' => 'text/html' }, [HTML]]
+        else
+          @app.call env
+        end
+      end
+    end
+
+  end
+end
+
diff --git a/spec/ospec/runner.rb → lib/mspec/opal/runner.rb b/spec/ospec/runner.rb → lib/mspec/opal/runner.rb
diff --git a/spec/ospec/sprockets.js → lib/mspec/opal/sprockets.js b/spec/ospec/sprockets.js → lib/mspec/opal/sprockets.js
-Original file line number
+Diff line change
@@ @@ -3,6 +3,5 @@ @@
     .yardoc
     .bundle
     Gemfile.lock
-    /mspec
-    /build
+    build/
     /.github_access_token