opal-rspec 1.1.0.alpha1 → 1.1.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95ab0afeb6b8db964c718d2716cd7b4f91cf022dc38eb33b7271219a7f277e8d
-  data.tar.gz: c256b94c07aae78d0fab3407aad4cadc5f23f2d60662551056e1c65ad70d4a20
+  metadata.gz: daf042a48c3443b869f363a722554e1b71a3e4153f1ea6edd73562e1d0c5f6b1
+  data.tar.gz: 9e1db2043bedaa0c70c673a9485ecce6a99014db2b7f0eb51ec13d97c2b59d76
 SHA512:
-  metadata.gz: 0567fb3f9293fbcafa0c6990dcdfb36bf2e40936ff75b6f8879a798628c3a9384842e95da555851a9ff9abb876409d148434e066e8071bd62a525670760ed914
-  data.tar.gz: 0ee3ad1ace7524f5daf1025a7671309d23905bd9f6f87c280a297b8817c4292943a6a773cbe7c4dd208cf70836b5f197e2cec95924912880b13119136bc64419
+  metadata.gz: c92f9b1bd05afa875b886deb5d48b81b568f5042a0d51bf82f1bbcd98c5403cc0dc69c26dc671c9fc92646adbb889771c4d1fce7e6c69fffe717f581f09be6f4
+  data.tar.gz: e5ec66ded2c2ed976a3234946efc8bb4b6a003d1dbc764831730bbd3de8cd348e1da1e3818b9777e5405b1cca743827b29ef96650cedd1fd4bd7d4875a8d336e

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,14 @@
 # Opal-RSpec Changelog
 
+## 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

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/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.alpha2'
   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'

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.alpha2
 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-20 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