opal-rspec 0.6.2 → 0.7.0.rc.1

data/lib/opal/rspec/cached_environment.rb

@@ -1,20 +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)
+      def initialize(env, locator)
         super env
-        @locator = RSpec::PostRackLocator.new(pre_run_locator)
+        @locator = locator
       end
 
       def get_opal_spec_requires
         @locator.get_opal_spec_requires.map do |file|
           asset = find_asset(file)
-          raise "Unable to find asset for file #{file} within load paths #{paths}. Check your load path/file specification." unless asset
+          unless asset
+            raise "Unable to find asset for file #{file} within load paths. Check your load path/file specification.\n"+
+                  "Searched paths:\n- #{paths.join("\n- ")}\n"
+
+          end
           logical_path = asset.logical_path
           # These will go directly into require '...' statements in Opal, so need to trim extensions
           logical_path.sub File.extname(logical_path), ''

data/lib/opal/rspec/locator.rb

@@ -0,0 +1,38 @@
+require 'pathname'
+require 'rake'
+# require the bundled RSpec's file and don't rely on the load path in case opal-rspec is included in a project's
+# Gemfile without rspec also being in the Gemfile
+require_relative '../../../rspec-core/upstream/lib/rspec/core/ruby_project'
+
+module Opal
+  module RSpec
+    class Locator
+      include ::RSpec::Core::RubyProject
+
+      DEFAULT_PATTERN = 'spec-opal/**/*_spec{.js,}.{rb,opal}'
+      DEFAULT_DEFAULT_PATH = 'spec-opal'
+
+      attr_accessor :spec_pattern, :spec_exclude_pattern, :spec_files, :default_path
+
+      def initialize(pattern: nil, exclude_pattern: nil, files: nil, default_path: nil)
+        @spec_pattern         = pattern || DEFAULT_PATTERN
+        @spec_exclude_pattern = exclude_pattern
+        @spec_files           = files
+        @default_path         = default_path || DEFAULT_DEFAULT_PATH
+      end
+
+      def determine_root
+        find_first_parent_containing(@default_path) || '.'
+      end
+
+      def get_spec_load_paths
+        [@default_path].map { |dir| File.join(root, dir) }
+      end
+
+      def get_opal_spec_requires
+        files = @spec_files || FileList[*@spec_pattern].exclude(*@spec_exclude_pattern)
+        files.uniq.map { |file| File.expand_path file }
+      end
+    end
+  end
+end

data/lib/opal/rspec/rake_task.rb

@@ -1,137 +1,19 @@
-require 'opal/rspec'
-require 'tempfile'
-require 'socket'
+require 'rake'
+require 'opal/rspec/runner'
 
 module Opal
   module RSpec
     class RakeTask
-      include Rake::DSL if defined? Rake::DSL
-
-      RUNNER = File.expand_path('../../../../vendor/spec_runner.js', __FILE__)
-      PORT = 9999
-      URL = "http://localhost:#{PORT}/"
-
-      attr_accessor :pattern, :exclude_pattern, :files, :default_path, :runner, :timeout, :arity_checking
-
-      def arity_checking?
-        setting = @arity_checking || :enabled
-        setting == :enabled
-      end
-
-      def launch_phantom(sprockets_env, main, &config_block)
-        app = Opal::Server.new(sprockets: sprockets_env) { |server|
-          server.main = main
-          server.debug = false
-          config_block.call(server)
-        }
-
-        server = Thread.new do
-          require 'rack'
-          require 'webrick'
-          Thread.current.abort_on_exception = true
-          Rack::Server.start(
-            :app => app,
-            :Port => PORT,
-            :AccessLog => [],
-            :Logger => WEBrick::Log.new("/dev/null"),
-          )
-        end
-
-        wait_for_server
-
-        version_output = begin
-          `phantomjs -v`.strip
-        rescue
-          warn 'Could not find phantomjs command on path!'
-          exit 1
-        end
-
-        if version_output.to_f < 2
-          warn "PhantomJS >= 2.0 is required but version #{version_output} is installed!"
-          exit 1
-        end
-
-        begin
-          command_line = %Q{phantomjs #{RUNNER} "#{URL}"#{@timeout ? " #{@timeout}" : ''}}
-          puts "Running #{command_line}"
-          system command_line
-          success = $?.success?
-
-          exit 1 unless success
-        ensure
-          server.kill
-        end
-      end
-
-      def runner
-        ((via_env = ENV['RUNNER']) && via_env.to_sym) || @runner || :phantom
-      end
-
-      def launch_node(sprockets, main, &config_block)
-        Opal.paths.each { |p| sprockets.append_path(p) } # Opal::Server does this
-
-        config_block.call sprockets
-
-        asset = sprockets[main]
-        raise "Cannot find asset: #{main} in #{sprockets.inspect}" if asset.nil?
-
-        Tempfile.create [main.to_s.gsub(/\W/, '.'), '.opal_rspec.js'] do |file|
-          File.write file.path, asset.to_s + Opal::Sprockets.load_asset(main)
-
-          command = "node #{file.path} 2>&1"
-          puts "~~> Running #{command}"
-          system command
-          exit 1 unless $?.success?
-        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/node'
-        task name do
-          sprockets_env = Opal::RSpec::SprocketsEnvironment.new
-          main = 'opal/rspec/sprockets_runner'
-          current_task = self
-
-          config_block = -> *args {
-            args.insert(1, current_task)
-            block.call *args if block
-
-            sprockets_env.spec_pattern = current_task.pattern if current_task.pattern
-            sprockets_env.spec_exclude_pattern = current_task.exclude_pattern
-            sprockets_env.spec_files = current_task.files
-            sprockets_env.default_path = current_task.default_path if current_task.default_path
-            raise 'Cannot supply both a pattern and files!' if current_task.files and current_task.pattern
-            sprockets_env.add_spec_paths_to_sprockets
-            Opal::Config.arity_check_enabled = arity_checking?
-          }
-
-          case runner
-          when :node then launch_node(sprockets_env, main, &config_block)
-          when :phantom then launch_phantom(sprockets_env, main, &config_block)
-          else raise "unknown runner type: #{runner.inspect}"
-          end
+      include Rake::DSL
+      DEFAULT_NAME = 'spec:opal'
+      attr_reader :rake_task
+
+      def initialize(name = DEFAULT_NAME, &block)
+        runner = ::Opal::RSpec::Runner.new(&block)
+        desc 'Run Opal specs'
+        @rake_task = task name do
+          # sh runner.command
+          runner.run
         end
       end
     end

data/lib/opal/rspec/runner.rb

@@ -0,0 +1,136 @@
+require 'shellwords'
+require 'opal/rspec'
+require 'tempfile'
+require 'socket'
+require 'opal/cli_options'
+require 'opal/cli'
+
+module Opal
+  module RSpec
+    class Runner
+      attr_accessor :pattern, :requires, :exclude_pattern, :files, :default_path, :runner, :arity_checking, :spec_opts, :cli_options
+
+      def timeout= _
+        warn "deprecated: setting timeout has no effect"
+      end
+
+      def arity_checking?
+        setting = @arity_checking || :enabled
+        setting == :enabled
+      end
+
+      def runner
+        (@runner ||= ENV['RUNNER']).to_s
+      end
+
+      def requires
+        @requires ||= []
+      end
+
+      def spec_opts
+        @spec_opts ||= ENV['SPEC_OPTS']
+      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::Sprockets.load_asset name, sprockets
+        ''
+      end
+
+      class LegacyServerProxy
+        require 'set'
+        def initialize
+          @paths ||= Set.new
+        end
+
+        def append_path(path)
+          @paths << path
+        end
+
+        def index_path=path
+          @index_path = path
+        end
+        attr_reader :index_path
+
+        # noop options
+        attr_accessor :debug
+
+        def to_cli_options
+          options = []
+          @paths.map do |path|
+            options << "-I#{path.shellescape}"
+          end
+          options
+        end
+      end
+
+      def initialize(&block)
+        @legacy_server_proxy = LegacyServerProxy.new
+        block.call(@legacy_server_proxy, self) if block_given? # for compatibility
+
+        raise 'Cannot supply both a pattern and files!' if self.files and self.pattern
+
+        locator = ::Opal::RSpec::Locator.new pattern: self.pattern, exclude_pattern: self.exclude_pattern, files: self.files, default_path: self.default_path
+
+        options = []
+        options << '--arity-check' if arity_checking?
+        options += ['--runner', runner] unless runner.empty?
+        options << '-ropal/platform'
+        options << '-ropal-rspec'
+        options << '--missing-require=ignore'
+        options += @legacy_server_proxy.to_cli_options
+
+        Opal.paths.each                     { |p| options << "-I#{p}" }
+        locator.get_spec_load_paths.each    { |p| options << "-I#{p}" }
+        requires.each                       { |p| options << "-r#{p}" }
+        locator.get_opal_spec_requires.each { |p| options << "-r#{p}" }
+        ::Opal::Config.stubbed_files.each   { |p| options << "-s#{p}" }
+
+        options += @cli_options if @cli_options
+        bootstrap_code = [
+          ::Opal::RSpec.spec_opts_code(spec_opts),
+          '::RSpec::Core::Runner.autorun',
+        ].join(';')
+
+        @args = "#{options.map(&:shellescape).join ' '} -e #{bootstrap_code.shellescape}"
+      end
+
+      def options
+        {
+          pattern: pattern,
+          exclude_pattern: exclude_pattern,
+          files: files,
+          default_path: default_path,
+          runner: runner,
+          arity_checking: arity_checking,
+          spec_opts: spec_opts,
+        }
+      end
+
+      def command
+        @command ||= "opal #{@args}"
+      end
+
+      def cli_options
+        @cli_options ||= begin
+          option_parser = Opal::CLIOptions.new
+          option_parser.parse!(@args.shellsplit)
+          option_parser.options
+        end
+      end
+
+      def cli
+        @cli ||= ::Opal::CLI.new(cli_options)
+      end
+
+      def run
+        ENV['OPAL_CLI_RUNNERS_SERVER_STATIC_FOLDER'] = default_path
+        cli.run
+      end
+    end
+  end
+end
+

data/lib/opal/rspec/sprockets_environment.rb

@@ -1,7 +1,7 @@
 require 'sprockets'
 require 'pathname'
 require 'opal/rspec/cached_environment'
-require 'opal/rspec/pre_rack_locator'
+require 'opal/rspec/locator'
 require 'forwardable'
 
 module Opal
@@ -21,12 +21,14 @@ module Opal
                      :default_path
 
       def initialize(spec_pattern=nil, spec_exclude_pattern=nil, spec_files=nil, default_path=nil)
-        @locator = RSpec::PreRackLocator.new spec_pattern, spec_exclude_pattern, spec_files, default_path
+        @locator = Opal::RSpec::Locator.new(pattern: spec_pattern, exclude_pattern: spec_exclude_pattern, files: spec_files, default_path: default_path)
         super()
       end
 
+      attr_reader :locator
+
       def add_spec_paths_to_sprockets
-        @locator.get_spec_load_paths.each { |p| append_path p }
+        locator.get_spec_load_paths.each { |p| append_path p }
       end
 
       def cached

data/lib/opal/rspec/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module RSpec
-    VERSION = '0.6.2'
+    VERSION = '0.7.0.rc.1'
   end
 end

data/opal-rspec.gemspec

@@ -1,25 +1,37 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/opal/rspec/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "opal/rspec/version"
 
-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 = 'https://github.com/opal-rspec'
-  s.summary = 'RSpec for Opal'
-  s.description = 'Opal compatible rspec library'
+Gem::Specification.new do |spec|
+  spec.name          = "opal-rspec"
+  spec.version       = Opal::RSpec::VERSION
+  spec.authors       = ['Adam Beynon', 'Brady Wied', 'Elia Schito']
+  spec.email         = ['elia@schito.me']
 
-  s.files = `git ls-files`.split("\n") + Dir.glob('rspec*/**/*.rb')
+  spec.summary       = %q{RSpec for Opal}
+  spec.description   = %q{Opal compatible RSpec library}
+  spec.homepage      = 'https://github.com/opal/opal-rspec'
+  spec.license       = "MIT"
 
-  s.require_paths = ['lib']
+  spec.files         = Dir.chdir(__dir__){`git ls-files -z`}.split("\x0").reject do |f|
+  # spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  s.add_dependency 'opal', ['>= 0.10.0', '< 0.12']
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'puma'
-  s.add_development_dependency 'poltergeist'
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'launchy'
-  s.add_development_dependency 'appraisal'
+  spec.add_dependency 'opal', ['>= 0.11', '< 0.12']
+  spec.add_dependency 'opal-sprockets'
+
+  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'chromedriver-helper'
+  spec.add_development_dependency 'selenium-webdriver'
+  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'launchy'
+  spec.add_development_dependency 'appraisal'
 end
+

data/rspec-core/spec/files_to_exclude.txt

@@ -0,0 +1,12 @@
+#**/core/configuration_spec.rb
+**/shared_example_group_spec.rb
+**/rspec/core/configuration_options_spec.rb
+**/html_formatter_spec.rb
+**/snippet_extractor_spec.rb
+**/rake_task_spec.rb
+**/option_parser_spec.rb
+**/runner_spec.rb
+**/backtrace_formatter_spec.rb
+**/ordering_spec.rb
+**/random_spec.rb
+**/project_initializer_spec.rb