Improved coverage.

.github/workflows/autobahn-server-tests.yaml

@@ -7,16 +7,13 @@ env:
 
 jobs:
   test:
-    runs-on: ${{matrix.os}}-latest
+    runs-on: ubuntu-latest
     continue-on-error: ${{matrix.experimental}}
 
     strategy:
       matrix:
-        os:
-          - ubuntu
-
         ruby:
-          - "3.1"
+          - "3.2"
 
         experimental: [false]
 
@@ -25,15 +22,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
         bundler-cache: true
 
-    - uses: actions/setup-python@v2
-      with:
-        python-version: pypy2
-
     - name: Run Autobahn server tests
       timeout-minutes: 30
       run: ruby autobahn-tests/autobahn-server-tests.rb

.github/workflows/coverage.yaml

@@ -21,7 +21,7 @@ jobs:
           - macos
 
         ruby:
-          - "3.1"
+          - "3.2"
 
     steps:
     - uses: actions/checkout@v3
@@ -47,7 +47,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.1"
+        ruby-version: "3.2"
         bundler-cache: true
 
     - uses: actions/download-artifact@v3

.github/workflows/documentation.yaml

@@ -1,41 +1,61 @@
 name: Documentation
 
-permissions:
-  contents: write
-
 on:
   push:
     branches:
       - main
 
+    # Allows you to run this workflow manually from the Actions tab:
+    workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages:
 permissions:
-  contents: write
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment:
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
 
 env:
   CONSOLE_OUTPUT: XTerm
   BUNDLE_WITH: maintenance
 
 jobs:
-  deploy:
+  generate:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.1"
+        ruby-version: "3.2"
         bundler-cache: true
 
     - name: Installing packages
       run: sudo apt-get install wget
 
-    - name: Prepare GitHub Pages
-      run: bundle exec bake github:pages:prepare --directory docs
-
     - name: Generate documentation
       timeout-minutes: 5
       run: bundle exec bake utopia:project:static --force no
 
-    - name: Deploy GitHub Pages
-      run: bundle exec bake github:pages:commit --directory docs
+    - name: Upload documentation artifact
+      uses: actions/upload-pages-artifact@v1
+      with:
+        path: docs
+
+  deploy:
+    runs-on: ubuntu-latest
+
+    environment:
+      name: github-pages
+      url: ${{steps.deployment.outputs.page_url}}
+
+    needs: generate
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

.github/workflows/test-external.yaml

@@ -23,6 +23,7 @@ jobs:
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
 
     steps:
     - uses: actions/checkout@v3

.github/workflows/test.yaml

@@ -24,6 +24,7 @@ jobs:
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
 
         experimental: [false]
 

.gitignore

@@ -1,8 +1,6 @@
 /.bundle/
-/coverage/
-/doc/
 /pkg/
-/tmp/
-
 /gems.locked
-.covered.db
+/.covered.db
+/external
+/autobahn-tests/report

.mailmap

@@ -0,0 +1 @@
+Aurora Nockert <aurora@aventine.se>

autobahn-tests/autobahn-server-tests.rb

@@ -1,20 +1,26 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2021, by Aurora Nockert.
+# Copyright, 2022-2023, by Samuel Williams.
 
-require "fileutils"
 require "json"
 
-Kernel.system("pip install autobahntestsuite", exception: true)
+config_root = File.expand_path("config", __dir__)
+report_root = File.expand_path("report", __dir__)
 
-falcon = Process.spawn("bundle exec #{__dir__}/autobahn-echo-server.ru", pgroup: true)
+falcon = Process.spawn("bundle", "exec", "./autobahn-echo-server.ru", chdir: __dir__, pgroup: true)
 falcon_pg = Process.getpgid(falcon)
 
-Kernel.system("wstest -m fuzzingclient", chdir: __dir__, exception: true)
-
-Process.kill("KILL", -falcon_pg)
-
-result = JSON.parse(File.read("/tmp/autobahn-server/index.json"))["protocol-websocket"]
+begin
+	system("docker", "run", "--rm", "-v", "#{config_root}:/config", "-v", "#{report_root}:/reports", "--net=host", "--name", "wstest", "crossbario/autobahn-testsuite", "wstest", "-m", "fuzzingclient", "-s", "/config/fuzzingclient.json", chdir: __dir__, exception: true)
+ensure
+	Process.kill("KILL", -falcon_pg)
+end
 
-FileUtils.rm_r("/tmp/autobahn-server/")
+results_path = File.expand_path("index.json", report_root)
+result = JSON.parse(File.read(results_path))["protocol-websocket"]
 
 def failed_state(name)
 	name != "OK" and name != "INFORMATIONAL"

autobahn-tests/fuzzingclient.json → autobahn-tests/config/fuzzingclient.json

@@ -1,5 +1,5 @@
 {
-   "outdir": "/tmp/autobahn-server",
+   "outdir": "/reports",
    "servers": [
       {
          "agent": "protocol-websocket",

config/external.yaml

@@ -1,3 +1,3 @@
 async-websocket:
   url: https://github.com/socketry/async-websocket
-  command: bundle exec rspec
+  command: bundle exec sus

config/sus.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022-2023, by Samuel Williams.
+
+require 'covered/sus'
+include Covered::Sus

fixtures/a_websocket_frame.rb

@@ -1,22 +1,7 @@
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require 'socket'
 

fixtures/disable_console_context.rb

@@ -1,22 +1,7 @@
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022-2023, by Samuel Williams.
 
 module DisableConsoleContext
 	def around
@@ -29,4 +14,4 @@ def around
 			Console.logger.level = level
 		end
 	end
-end
+end

fixtures/reactor_context.rb

@@ -1,22 +1,7 @@
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require 'async'
 

fixtures/server_context.rb

@@ -1,22 +1,7 @@
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require_relative 'reactor_context'
 

gems.rb

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2021, by Aurora Nockert.
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in protocol-websocket.gemspec

lib/protocol/websocket.rb

@@ -1,22 +1,7 @@
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require_relative 'websocket/version'
 require_relative 'websocket/framer'

lib/protocol/websocket/binary_frame.rb

@@ -1,22 +1,8 @@
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2021, by Aurora Nockert.
 
 require_relative 'frame'
 require_relative 'message'