opal-rspec 1.1.0.alpha1 → 1.1.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95ab0afeb6b8db964c718d2716cd7b4f91cf022dc38eb33b7271219a7f277e8d
-  data.tar.gz: c256b94c07aae78d0fab3407aad4cadc5f23f2d60662551056e1c65ad70d4a20
+  metadata.gz: 0ade995b0c6d3f286e1fab0a744a29747a9404af45a8379dacbd30a42a04521d
+  data.tar.gz: c2e8c3252227413b183f0c0aaad68de756cb933b182aa250d92d565ffe4d8a71
 SHA512:
-  metadata.gz: 0567fb3f9293fbcafa0c6990dcdfb36bf2e40936ff75b6f8879a798628c3a9384842e95da555851a9ff9abb876409d148434e066e8071bd62a525670760ed914
-  data.tar.gz: 0ee3ad1ace7524f5daf1025a7671309d23905bd9f6f87c280a297b8817c4292943a6a773cbe7c4dd208cf70836b5f197e2cec95924912880b13119136bc64419
+  metadata.gz: c785be231521c658867c6fbe412066199feaab7ebb1f5fd28966f96f828bc5f783950f9ea1e8b27f2a973b46897809def87904e1f71105485881f8c03c436f33
+  data.tar.gz: 9ef0711790bcd41452f75f5d7a721f7db2194f30f88e17abbcc25a931d9a1424a88d65d70d4803a274778cfd295824ac8bc44531029103bf906e9a5bc2b45398

data/.github/workflows/build.yml

@@ -13,10 +13,11 @@ on:
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' ]
-        ruby: [ ruby-head, 3.1, "3.0", 2.7 ]
-        opal: [ master, 1.6, 1.7 ]
+        ruby: [ ruby-head, 3.2, 3.1, "3.0", 2.7 ]
+        opal: [ master, 1.7, 1.8 ]
 
     runs-on: ${{ matrix.os }}
 
@@ -24,7 +25,9 @@ jobs:
       OPAL_VERSION: ${{ matrix.opal }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Opal-RSpec Changelog
 
+## 1.1.0.alpha3 - 2023-09-26
+
+- Refactor glob_to_re into a robust implementation
+
+- Add `--opal-opt` CLI option
+
+- Add `--rbrequire` CLI option
+
+
+## 1.1.0.alpha2 - 2023-09-20
+
+- Drop advertised support for Opal v1.6
+
+- Fix support for Ruby 2.7+
+
+- Drop requirement of Opal-Sprockets
+
+
 ## 1.1.0.alpha1 - 2023-09-16
 
 - Support Opal headless browser runners

data/Gemfile

@@ -18,7 +18,7 @@ case ENV['OPAL_VERSION']
 when 'local'
   gem 'opal', path: '../opal'
 when /^[0-9]/
-  gem 'opal', ENV['OPAL_VERSION']
+  gem 'opal', "~> #{ENV['OPAL_VERSION']}.0a"
 when String
   gem 'opal', git: 'https://github.com/opal/opal.git', branch: ENV['OPAL_VERSION']
 end

data/lib/opal/rspec/configuration_parser.rb

@@ -1,10 +1,11 @@
+require 'opal/rspec/util'
 require 'optparse'
 
 module Opal; module RSpec; module Core; end; end; end
 # Load necessary files under Opal's namespace, so as not to conflict with RSpec if it's being loaded too.
 # Later, we will monkey-patch those methods.
-load __dir__ + "/../../../rspec-core/upstream/lib/rspec/core/invocations.rb", ::Opal
-load __dir__ + "/../../../rspec-core/upstream/lib/rspec/core/option_parser.rb", ::Opal
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-core/upstream/lib/rspec/core/invocations.rb", ::Opal
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-core/upstream/lib/rspec/core/option_parser.rb", ::Opal
 
 class Opal::RSpec::Core::Parser
   alias parser_before_opal parser
@@ -21,6 +22,16 @@ class Opal::RSpec::Core::Parser
         options[:runner] = name
       end
 
+      parser.on('-q', '--rbrequire FILE', 'Require a file in MRI context before running Opal') do |name|
+        options[:opal_rbrequires] ||= []
+        options[:opal_rbrequires] << name
+      end
+
+      parser.on('-O', '--opal-opt FLAG', 'Run Opal with additional options (separate by `,` or specify multiple times)') do |name|
+        options[:opal_options] ||= []
+        options[:opal_options] += name.split(",")
+      end
+
       parser.separator ''
       parser.separator '  **** Help ****'
       parser.separator ''

data/lib/opal/rspec/locator.rb

@@ -1,8 +1,9 @@
+require 'opal/rspec/util'
 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
-load __dir__+'/../../../rspec-core/upstream/lib/rspec/core/ruby_project.rb', ::Opal
+::Opal::RSpec.load_namespaced __dir__+'/../../../rspec-core/upstream/lib/rspec/core/ruby_project.rb', ::Opal
 
 module Opal
   module RSpec

data/lib/opal/rspec/runner.rb

@@ -117,6 +117,10 @@ module Opal
         options << '--missing-require=ignore'
         options += @legacy_server_proxy.to_cli_options
 
+        spec_opts.delete(:opal_rbrequires) { [] }.each do |r|
+          require r
+        end
+
         load_paths = [Opal.paths, locator.get_spec_load_paths, self.libs].compact.sum([]).uniq
 
         load_paths.each                     { |p| options << "-I#{p}" }
@@ -125,6 +129,7 @@ module Opal
         ::Opal::Config.stubbed_files.each   { |p| options << "-s#{p}" }
 
         options += @cli_options if @cli_options
+        options += spec_opts.delete(:opal_options) { [] }
 
         bootstrap_code = ::Opal::RSpec.spec_opts_code(spec_opts)
 

data/lib/opal/rspec/util.rb

@@ -0,0 +1,15 @@
+module ::Opal
+  module RSpec
+    def self.load_namespaced(file, mod)
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1")
+        load file, mod
+      else
+        str = ""
+        str += "module ::#{mod.name};"
+        str += File.read(file)
+        str += ";end"
+        eval(str)
+      end
+    end
+  end
+end

data/lib/opal/rspec/version.rb

@@ -1,10 +1,12 @@
+require 'opal/rspec/util'
+
 module Opal
   module RSpec
-    VERSION = '1.1.0.alpha1'
+    VERSION = '1.1.0.alpha3'
   end
 end
 
-load __dir__ + "/../../../rspec-core/upstream/lib/rspec/core/version.rb", ::Opal
-load __dir__ + "/../../../rspec-expectations/upstream/lib/rspec/expectations/version.rb", ::Opal
-load __dir__ + "/../../../rspec-mocks/upstream/lib/rspec/mocks/version.rb", ::Opal
-load __dir__ + "/../../../rspec-support/upstream/lib/rspec/support/version.rb", ::Opal
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-core/upstream/lib/rspec/core/version.rb", ::Opal
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-expectations/upstream/lib/rspec/expectations/version.rb", ::Opal
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-mocks/upstream/lib/rspec/mocks/version.rb", ::Opal
+::Opal::RSpec.load_namespaced __dir__ + "/../../../rspec-support/upstream/lib/rspec/support/version.rb", ::Opal

data/lib/opal/rspec.rb

@@ -1,5 +1,4 @@
 require 'opal'
-require 'opal-sprockets'
 require 'opal/rspec/version'
 require 'opal/rspec/runner'
 require 'opal/rspec/configuration_parser'

data/lib-opal/opal/rspec/fixes/rspec/core/configuration.rb

@@ -23,27 +23,49 @@ module ::RSpec; module Core; class Configuration
     str.gsub(/(?:\.js)?\.(?:rb|opal|\{rb,opal\})\z/, '')
   end
 
+  def glob_to_re_expand_alternatives(glob)
+    # If there are no braces, just return the string as an array
+    return [glob] unless glob =~ /(.*)\{([^\{\}]*?)\}(.*)/
+
+    prefix, contents, suffix = $1, $2, $3
+
+    alternatives = contents.split(',')
+
+    expanded_patterns = alternatives.map do |alternative|
+      "#{prefix}#{alternative}#{suffix}"
+    end
+
+    # Recursively expand for the rest of the pattern
+    return expanded_patterns.flat_map { |pattern| glob_to_re_expand_alternatives(pattern) }
+  end
+
   def glob_to_re(path, pattern)
     pattern = remove_ruby_ext(pattern)
-    path = "" if pattern.start_with?(path)
-    path += "/" unless path.end_with?("/")
-    re = Regexp.escape(pattern).gsub('\*\*', '.*?')
-                               .gsub('\*', '[^/]*?')
-                               .gsub('\?', '[^/]')
-                               .gsub(/\\{(.*?)\\}/) {
-                                 '(?:' + $1.gsub(",", "|") + ')'
-                               }
-    re = "(?:^|/)" + Regexp.escape(path) + re + "$"
-    # Strip the first `/` so it acts more like the intention of `**`
-    re = re.gsub("/.*?", ".*?")
+    if pattern.start_with?(path)
+      path = ""
+    else
+      path += "/" unless path.end_with?("/")
+    end
+    pattern = path + pattern
+    patterns = glob_to_re_expand_alternatives(pattern)
+    re = patterns.map { |i| Regexp.escape(i) }.join("|").then { |i| "(?:#{i})" }
+    re = re.gsub('\/\*\*\/', '(?:/|/.*?/)')
+           .gsub('\*', '[^/]*?')
+           .gsub('\?', '[^/]')
+    re = '(?:^|/)' + re + "$"
+    # Strip multiple '/'s
+    re = re.gsub(%r{(\\/|/)+}, '/')
     # Strip the `/./`
-    re = re.gsub("/\\.\\/", "\\/")
-    re = re.gsub("/)\\.\\/", "\\/)")
+    re = re.gsub('/\./', '/')
+    re = re.gsub('(?:^|/)\./', '(?:^|/)')
     Regexp.new(re)
   end
 
   # Only load from loaded files
   def get_matching_files(path, pattern)
+    if pattern.is_a?(Array)
+      return pattern.map { |pat| get_matching_files(path, pat) }.flatten.sort.uniq
+    end
     `Object.keys(Opal.modules)`.grep(glob_to_re(path, pattern)).sort
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-rspec
 version: !ruby/object:Gem::Version
-  version: 1.1.0.alpha1
+  version: 1.1.0.alpha3
 platform: ruby
 authors:
 - Adam Beynon
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-15 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -303,6 +303,7 @@ files:
 - lib/opal/rspec/runner.rb
 - lib/opal/rspec/sprockets.rb
 - lib/opal/rspec/sprockets_environment.rb
+- lib/opal/rspec/util.rb
 - lib/opal/rspec/version.rb
 - opal-rspec.gemspec
 - rspec-core/upstream/.document