opal-rspec 0.5.0.beta2 → 0.5.0.beta3

data/config.ru

@@ -1,10 +1,12 @@
-require 'bundler'
-Bundler.require
+require 'opal/rspec'
 
 Opal::Processor.source_map_enabled = false
 
-run Opal::Server.new { |s|
-  s.main = 'opal/rspec/sprockets_runner'
-  s.append_path 'spec'
-  s.debug = false
+sprockets_env = Opal::RSpec::SprocketsEnvironment.new(spec_pattern='spec/opal/**/*_spec.{rb,opal}')
+run Opal::Server.new(sprockets: sprockets_env) { |s|
+  s.main = 'sprockets_runner_js_errors'
+  # sprockets_runner_js_errors will not be in the opal load path by default
+  s.append_path 'spec/mri/integration/rack'
+  sprockets_env.add_spec_paths_to_sprockets
+  s.debug = ENV['OPAL_DEBUG']
 }

data/gemfiles/opal_master.gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+gemspec path: '../'
+
+unless Dir['rspec{,-{core,expectations,mocks,support}}'].any?
+  warn 'Run: "git submodule update --init" to get RSpec sources'
+end
+
+gem 'opal', git: 'https://github.com/opal/opal.git'
+gem 'capybara-webkit', require: false
+gem 'selenium-webdriver', require: false
+
+# These need to come from our local path in order for create_requires.rb to work properly
+gem 'rspec',              path: '../rspec'
+gem 'rspec-support',      path: '../rspec-support'
+gem 'rspec-core',         path: '../rspec-core'
+gem 'rspec-mocks',        path: '../rspec-mocks'
+gem 'rspec-expectations', path: '../rspec-expectations'
+

data/lib/opal/rspec.rb

@@ -1,6 +1,6 @@
 require 'opal'
 require 'opal/rspec/version'
-require 'opal/minitest'
+require 'opal/rspec/sprockets_environment'
 
 # Just register our opal code path with opal build tools
 Opal.append_path File.expand_path('../../../opal', __FILE__)
@@ -10,7 +10,8 @@ Opal.append_path File.expand_path('../../../opal', __FILE__)
   Opal.append_path File.expand_path("../../../#{gem}/lib", __FILE__)
 end
 
-Opal::Processor.dynamic_require_severity = :warning
+# Since we have better specs than before (and a script to deal with this), ignoring
+Opal::Processor.dynamic_require_severity = :ignore
 
 stubs = [
   'mutex_m', # Used with some threading operations but seems to run OK without this
@@ -23,21 +24,16 @@ stubs = [
   'diff/lcs/hunk',
   'diff/lcs/internals',
   'test/unit/assertions',
-
   # Opal doesn't have optparse, yet
   'optparse',
-
   'shellwords',
   'socket',
   'uri',
   'drb/drb',
-
-  # Minitest used to be in stdlib, now is in opal-minitest GEM,
-  # but this file does not exist
-  # (referenced from minitest_assertions_adapter.rb in RSpec)
-  'minitest/unit',
-
   'cgi/util',
+  'minitest', # RSpec uses require to see if minitest is there, opal/sprockets won't like that, so stub it
+  'minitest/unit',
+  'minitest/assertions'
 ]
 
 stubs.each {|mod| Opal::Processor.stub_file mod }

data/lib/opal/rspec/cached_environment.rb

@@ -0,0 +1,23 @@
+require 'sprockets'
+require 'opal/rspec/post_rack_locator'
+
+module Opal
+  module RSpec
+    class CachedEnvironment < ::Sprockets::CachedEnvironment
+      # this class is accessible from the ERB/runner file
+
+      def initialize(env, pre_run_locator)
+        super env
+        @locator = RSpec::PostRackLocator.new(pre_run_locator)
+      end
+
+      def get_opal_spec_requires
+        @locator.get_opal_spec_requires.map do |file|
+          logical_path = find_asset(file).logical_path
+          # These will go directly into require '...' statements in Opal, so need to trim extensions
+          logical_path.sub File.extname(logical_path), ''
+        end
+      end
+    end
+  end
+end

data/lib/opal/rspec/post_rack_locator.rb

@@ -0,0 +1,20 @@
+require 'rake'
+
+module Opal
+  module RSpec
+    class PostRackLocator
+      def initialize(pre_run_locator)
+        @spec_pattern = pre_run_locator.spec_pattern
+        @spec_exclude_pattern = pre_run_locator.spec_exclude_pattern
+        @spec_files = pre_run_locator.spec_files
+      end
+
+      def get_opal_spec_requires
+        files = @spec_files || FileList[*@spec_pattern].exclude(*@spec_exclude_pattern)
+        files.map do |file|
+          File.expand_path file
+        end
+      end
+    end
+  end
+end

data/lib/opal/rspec/pre_rack_locator.rb

@@ -0,0 +1,68 @@
+require 'pathname'
+
+module Opal
+  module RSpec
+    class PreRackLocator
+      DEFAULT_PATTERN = 'spec/**/*_spec.{rb,opal}'
+
+      attr_accessor :spec_pattern, :spec_exclude_pattern, :spec_files
+
+      def initialize(spec_pattern=nil, spec_exclude_pattern=nil, spec_files=nil)
+        @spec_pattern = spec_pattern || DEFAULT_PATTERN
+        @spec_exclude_pattern = spec_exclude_pattern
+        @spec_files = spec_files
+      end
+
+      def get_spec_load_paths
+        base_paths = spec_files ? get_files_directories : strip_globs_from_patterns
+        # Want to get the smallest # of load paths that's common between our patterns
+        array_or_single = base_paths.inject do |path1, path2|
+          with_common_paths_replaced path1, path2
+        end
+        [*array_or_single]
+      end
+
+      private
+
+      def strip_globs_from_patterns
+        # only using spec_pattern here since we only need paths for inclusion
+        [*spec_pattern].map do |each_pattern|
+          glob_portion = /[\*\?\[\{].*/.match each_pattern
+          path = glob_portion ? each_pattern.sub(glob_portion.to_s, '') : each_pattern
+          raise "Unable to identify a single root directory/file in the pattern #{each_pattern}. Please adjust glob" unless File.exist?(path)
+          path = Pathname.new path
+          # in case a filename was used as a pattern
+          path.directory? ? path : path.dirname
+        end
+      end
+
+      def get_files_directories
+        spec_files.map do |file|
+          Pathname.new(file).dirname
+        end.uniq
+      end
+
+      def with_common_paths_replaced(existing_paths, new_path)
+        new_path_covered = false
+        replaced = [*existing_paths].map do |path|
+          match = nil
+          path.ascend do |each_level|
+            new_path.ascend do |each_other_level|
+              match = each_level if each_level.expand_path == each_other_level.expand_path
+              break if match
+            end
+            break if match
+          end
+          if match
+            new_path_covered = true
+            match
+          else
+            path
+          end
+        end
+        replaced << new_path unless new_path_covered
+        replaced.uniq
+      end
+    end
+  end
+end

data/lib/opal/rspec/rake_task.rb

@@ -1,4 +1,6 @@
 require 'opal/rspec'
+require 'tempfile'
+require 'socket'
 
 module Opal
   module RSpec
@@ -7,48 +9,123 @@ module Opal
 
       RUNNER = File.expand_path('../../../../vendor/spec_runner.js', __FILE__)
       PORT = 9999
-      URL = "http://localhost:9999/"
+      URL = "http://localhost:#{PORT}/"
+
+      attr_accessor :pattern, :exclude_pattern, :files, :runner, :timeout
+
+      def launch_phantom(timeout_value)
+        command_line = %Q{phantomjs #{RUNNER} "#{URL}"#{timeout_value ? " #{timeout_value}" : ''}}
+        puts "Running #{command_line}"
+        system command_line
+        success = $?.success?
+
+        exit 1 unless success
+      end
+
+      def runner
+        ((via_env = ENV['RUNNER']) && via_env.to_sym) || @runner || :phantom
+      end
+
+      def get_load_asset_code(server)
+        sprockets = server.sprockets
+        name = server.main
+        asset = sprockets[name]
+        raise "Cannot find asset: #{name}" if asset.nil?
+        Opal::Processor.load_asset_code(sprockets, name)
+      end
+
+      # TODO: Avoid the Rack server and compile directly
+      def launch_node(server)
+        compiled = Tempfile.new 'opal_rspec.js'
+        begin
+          uri = URI(URL)
+          Net::HTTP.start uri.hostname, uri.port do |http|
+            resp = http.get File.join('/assets', server.main)
+            compiled.write resp.body
+            load_asset_code = get_load_asset_code server
+            compiled.write load_asset_code
+            compiled.close
+          end
+          command_line = "node #{compiled.path} 2>&1"
+          puts "Running #{command_line}"
+          system command_line
+          exit 1 unless $?.success?
+        ensure
+          compiled.close unless compiled.closed?
+          compiled.unlink
+        end
+      end
+
+      def wait_for_server
+        # avoid retryable dependency
+        tries = 0
+        up = false
+        uri = URI(URL)
+        while tries < 4 && !up
+          tries += 1
+          sleep 0.1
+          begin
+            # Using TCPSocket, not net/http open because executing the HTTP GET / will incur a decent delay just to check if the server is up
+            # in order to better communicate to the user what is going on, save the actual HTTP request for the phantom/node run
+            # the only objective here is to see if the Rack server has started
+            socket = TCPSocket.new uri.hostname, uri.port
+            up = true
+            socket.close
+          rescue Errno::ECONNREFUSED
+            # server not up yet
+          end
+        end
+        raise 'Tried 4 times to contact Rack server and not up!' unless up
+      end
 
       def initialize(name = 'opal:rspec', &block)
-        desc "Run opal specs in phantomjs"
+        desc 'Run opal specs in phantomjs/node'
         task name do
           require 'rack'
           require 'webrick'
 
-          app = Opal::Server.new { |s|
+          sprockets_env = Opal::RSpec::SprocketsEnvironment.new
+          app = Opal::Server.new(sprockets: sprockets_env) { |s|
             s.main = 'opal/rspec/sprockets_runner'
-            s.append_path 'spec'
             s.debug = false
 
-            block.call s if block
+            block.call s, self if block
+            sprockets_env.spec_pattern = self.pattern if self.pattern
+            sprockets_env.spec_exclude_pattern = self.exclude_pattern
+            sprockets_env.spec_files = self.files
+            raise 'Cannot supply both a pattern and files!' if self.files and self.pattern
+            sprockets_env.add_spec_paths_to_sprockets
           }
 
+          # TODO: Once Opal 0.9 compatibility is established, if we're running node, add in the node stdlib requires in so RSpec can use them, also add NODE_PATH to the runner command above
+
           server = Thread.new do
             Thread.current.abort_on_exception = true
             Rack::Server.start(
-              :app => app,
-              :Port => PORT,
-              :AccessLog => [],
-              :Logger => WEBrick::Log.new("/dev/null"),
+                :app => app,
+                :Port => PORT,
+                :AccessLog => [],
+                :Logger => WEBrick::Log.new("/dev/null"),
             )
           end
 
-          if `phantomjs -v`.strip.to_i >= 2
-            warn <<-WARN.gsub(/^              /,'')
-              Only PhantomJS v1 is currently supported,
-              if you're using homebrew on OSX you can switch version with:
+          wait_for_server
+          is_phantom = runner == :phantom
+          if is_phantom
+            if `phantomjs -v`.strip.to_i >= 2
+              warn <<-WARN.gsub(/^              /, '')
+                Only PhantomJS v1 is currently supported,
+                if you're using homebrew on OSX you can switch version with:
 
-                brew switch phantomjs 1.9.8
+                  brew switch phantomjs 1.9.8
 
-            WARN
-            exit 1
+              WARN
+              exit 1
+            end
           end
 
           begin
-            system %Q{phantomjs #{RUNNER} "#{URL}"}
-            success = $?.success?
-
-            exit 1 unless success
+            is_phantom ? launch_phantom(timeout) : launch_node(app)
           ensure
             server.kill
           end

data/lib/opal/rspec/sprockets_environment.rb

@@ -0,0 +1,35 @@
+require 'sprockets'
+require 'pathname'
+require 'opal/rspec/cached_environment'
+require 'opal/rspec/pre_rack_locator'
+require 'forwardable'
+
+module Opal
+  module RSpec
+    class SprocketsEnvironment < ::Sprockets::Environment
+      extend Forwardable
+      # this class accessible from config.ru and the rask task initializer
+
+      def_delegators :@locator,
+                     :spec_pattern=,
+                     :spec_pattern,
+                     :spec_exclude_pattern=,
+                     :spec_exclude_pattern,
+                     :spec_files=,
+                     :spec_files
+
+      def initialize(spec_pattern=nil, spec_exclude_pattern=nil, spec_files=nil)
+        @locator = RSpec::PreRackLocator.new spec_pattern, spec_exclude_pattern, spec_files
+        super()
+      end
+
+      def add_spec_paths_to_sprockets
+        @locator.get_spec_load_paths.each { |p| append_path p }
+      end
+
+      def cached
+        CachedEnvironment.new(self, @locator)
+      end
+    end
+  end
+end

data/lib/opal/rspec/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module RSpec
-    VERSION = '0.5.0.beta2'
+    VERSION = '0.5.0.beta3'
   end
 end

data/opal-rspec.gemspec

@@ -3,22 +3,19 @@ require 'rake'
 require File.expand_path('../lib/opal/rspec/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name         = 'opal-rspec'
-  s.version      = Opal::RSpec::VERSION
-  s.author       = 'Adam Beynon'
-  s.email        = 'adam.beynon@gmail.com'
-  s.homepage     = 'http://opalrb.org'
-  s.summary      = 'RSpec for Opal'
-  s.description  = 'Opal compatible rspec library'
+  s.name = 'opal-rspec'
+  s.version = Opal::RSpec::VERSION
+  s.author = 'Adam Beynon'
+  s.email = 'adam.beynon@gmail.com'
+  s.homepage = 'http://opalrb.org'
+  s.summary = 'RSpec for Opal'
+  s.description = 'Opal compatible rspec library'
 
   s.files = `git ls-files`.split("\n") + FileList['rspec*/**/*.rb']
 
-  s.require_paths  = ['lib']
+  s.require_paths = ['lib']
 
-  s.add_dependency 'opal', ['>= 0.8.0.rc1', '< 0.9']
-  # Opal now does not include minitest but we need it for Sprockets/test execution
-  s.add_dependency 'opal-minitest', '~> 0.0'
+  s.add_dependency 'opal', ['>= 0.8.0', '< 0.10']
   s.add_development_dependency 'rake'
   s.add_development_dependency 'yard'
 end
-

data/opal/opal/rspec.rb

@@ -1,20 +1,23 @@
 require 'opal/rspec/pre_require_fixes'
 require 'opal/rspec/requires'
 require 'opal/rspec/fixes'
-require 'opal/rspec/text_formatter'
-require 'opal/rspec/browser_formatter'
+require 'opal/rspec/formatter/browser_formatter'
 require 'opal/rspec/runner'
 require 'opal/rspec/async'
 
 RSpec.configure do |config|
-  # For now, always use our custom formatter for results
-  config.default_formatter = Opal::RSpec::Runner.default_formatter
-  
-  # Legacy helpers
-  config.include Opal::RSpec::AsyncHelpers
+  config.default_formatter = ::RSpec::Core::Runner.non_browser? ? ::RSpec::Core::Formatters::ProgressFormatter : ::Opal::RSpec::BrowserFormatter
+
+  # Have to do this in 2 places. This will ensure the default formatter gets the right IO, but need to do this here for custom formatters
+  # that will be constructed BEFORE Runner.autorun runs (see runner.rb)
+  _, stdout = ::RSpec::Core::Runner.get_opal_closed_tty_io
+  config.output_stream = stdout
 
-  # Always support expect() and .should syntax (we should not do this really..)
+  # This shouldn't be in here, but RSPec uses undef to change this configuration and that doesn't work well enough yet
   config.expect_with :rspec do |c|
     c.syntax = [:should, :expect]
   end
+
+  # Legacy helpers
+  config.include Opal::RSpec::AsyncHelpers
 end