opal-rspec 1.1.0.alpha2 → 1.1.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf042a48c3443b869f363a722554e1b71a3e4153f1ea6edd73562e1d0c5f6b1
-  data.tar.gz: 9e1db2043bedaa0c70c673a9485ecce6a99014db2b7f0eb51ec13d97c2b59d76
+  metadata.gz: 0ade995b0c6d3f286e1fab0a744a29747a9404af45a8379dacbd30a42a04521d
+  data.tar.gz: c2e8c3252227413b183f0c0aaad68de756cb933b182aa250d92d565ffe4d8a71
 SHA512:
-  metadata.gz: c92f9b1bd05afa875b886deb5d48b81b568f5042a0d51bf82f1bbcd98c5403cc0dc69c26dc671c9fc92646adbb889771c4d1fce7e6c69fffe717f581f09be6f4
-  data.tar.gz: e5ec66ded2c2ed976a3234946efc8bb4b6a003d1dbc764831730bbd3de8cd348e1da1e3818b9777e5405b1cca743827b29ef96650cedd1fd4bd7d4875a8d336e
+  metadata.gz: c785be231521c658867c6fbe412066199feaab7ebb1f5fd28966f96f828bc5f783950f9ea1e8b27f2a973b46897809def87904e1f71105485881f8c03c436f33
+  data.tar.gz: 9ef0711790bcd41452f75f5d7a721f7db2194f30f88e17abbcc25a931d9a1424a88d65d70d4803a274778cfd295824ac8bc44531029103bf906e9a5bc2b45398

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # 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

data/lib/opal/rspec/configuration_parser.rb

@@ -22,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/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/version.rb

@@ -2,7 +2,7 @@ require 'opal/rspec/util'
 
 module Opal
   module RSpec
-    VERSION = '1.1.0.alpha2'
+    VERSION = '1.1.0.alpha3'
   end
 end
 

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.alpha2
+  version: 1.1.0.alpha3
 platform: ruby
 authors:
 - Adam Beynon
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal