From f0406b10797bc9f660cf97b5b574d5e106fbed60 Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Wed, 24 Apr 2024 14:40:59 +1200 Subject: [PATCH] Modernize gem. --- .editorconfig | 4 ++++ .github/workflows/coverage.yaml | 4 ++-- .github/workflows/documentation.yaml | 5 +---- .github/workflows/test-external.yaml | 2 +- .github/workflows/test.yaml | 2 +- .mailmap | 1 + async-websocket.gemspec | 7 ++++--- examples/chat/client.rb | 2 +- examples/chat/multi-client.rb | 2 +- examples/mud/client.rb | 2 +- examples/polygon.io/client.rb | 2 +- fixtures/rack_application/client.rb | 2 +- gems.rb | 16 ++++++++-------- lib/async/websocket/server.rb | 2 +- license.md | 4 ++-- test/async/websocket/adapters/rack.rb | 2 +- test/async/websocket/connection.rb | 2 +- 17 files changed, 32 insertions(+), 29 deletions(-) diff --git a/.editorconfig b/.editorconfig index 538ba2b..a6e7d26 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,3 +3,7 @@ root = true [*] indent_style = tab indent_size = 2 + +[*.{yml,yaml}] +indent_style = space +indent_size = 2 diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index d72c844..68adbf2 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -21,7 +21,7 @@ jobs: - macos ruby: - - "3.2" + - "3.3" steps: - uses: actions/checkout@v4 @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.2" + ruby-version: "3.3" bundler-cache: true - uses: actions/download-artifact@v3 diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml index e2e0f93..8dc5227 100644 --- a/.github/workflows/documentation.yaml +++ b/.github/workflows/documentation.yaml @@ -5,9 +5,6 @@ on: 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: read @@ -32,7 +29,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.2" + ruby-version: "3.3" bundler-cache: true - name: Installing packages diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index 876b250..21898f5 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -20,9 +20,9 @@ jobs: - macos ruby: - - "3.0" - "3.1" - "3.2" + - "3.3" steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3310dec..0769a98 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,9 +21,9 @@ jobs: - macos ruby: - - "3.0" - "3.1" - "3.2" + - "3.3" experimental: [false] diff --git a/.mailmap b/.mailmap index 4d28a24..85a942f 100644 --- a/.mailmap +++ b/.mailmap @@ -2,3 +2,4 @@ Juan Antonio Martín Lucas Aurora Nockert Thomas Morgan Peter Runich <43861241+PeterRunich@users.noreply.github.com> +Simon Crocker diff --git a/async-websocket.gemspec b/async-websocket.gemspec index 0d18b2c..f751648 100644 --- a/async-websocket.gemspec +++ b/async-websocket.gemspec @@ -6,8 +6,8 @@ Gem::Specification.new do |spec| spec.name = "async-websocket" spec.version = Async::WebSocket::VERSION - spec.summary = "An async websocket library on top of websocket-driver." - spec.authors = ["Samuel Williams", "destructobeam", "Olle Jonsson", "Thomas Morgan", "Aurora Nockert", "Bryan Powell", "Emily Love Mills", "Gleb Sinyavskiy", "Janko Marohnić", "Juan Antonio Martín Lucas", "Michel Boaventura", "Peter Runich"] + spec.summary = "An async websocket library on top of protocol-websocket." + spec.authors = ["Samuel Williams", "Simon Crocker", "Olle Jonsson", "Thomas Morgan", "Aurora Nockert", "Bryan Powell", "Emily Love Mills", "Gleb Sinyavskiy", "Janko Marohnić", "Juan Antonio Martín Lucas", "Michel Boaventura", "Peter Runich"] spec.license = "MIT" spec.cert_chain = ['release.cert'] @@ -18,11 +18,12 @@ Gem::Specification.new do |spec| spec.metadata = { "documentation_uri" => "https://socketry.github.io/async-websocket/", "funding_uri" => "https://github.com/sponsors/ioquatix", + "source_code_uri" => "https://github.com/socketry/async-websocket.git", } spec.files = Dir.glob(['{lib}/**/*', '*.md'], File::FNM_DOTMATCH, base: __dir__) - spec.required_ruby_version = ">= 3.0" + spec.required_ruby_version = ">= 3.1" spec.add_dependency "async-http", "~> 0.54" spec.add_dependency "protocol-rack", "~> 0.5" diff --git a/examples/chat/client.rb b/examples/chat/client.rb index ca0c19d..e99cd02 100755 --- a/examples/chat/client.rb +++ b/examples/chat/client.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2018-2022, by Samuel Williams. +# Copyright, 2018-2024, by Samuel Williams. require 'async' require 'async/http/endpoint' diff --git a/examples/chat/multi-client.rb b/examples/chat/multi-client.rb index c88d8b9..b3eeea4 100755 --- a/examples/chat/multi-client.rb +++ b/examples/chat/multi-client.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2019-2022, by Samuel Williams. +# Copyright, 2019-2024, by Samuel Williams. require 'async' require 'async/semaphore' diff --git a/examples/mud/client.rb b/examples/mud/client.rb index 1409552..bf9d5e1 100755 --- a/examples/mud/client.rb +++ b/examples/mud/client.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2019-2023, by Samuel Williams. +# Copyright, 2019-2024, by Samuel Williams. # Copyright, 2020, by Juan Antonio Martín Lucas. require 'async' diff --git a/examples/polygon.io/client.rb b/examples/polygon.io/client.rb index d183baf..8e30865 100644 --- a/examples/polygon.io/client.rb +++ b/examples/polygon.io/client.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2020-2022, by Samuel Williams. +# Copyright, 2020-2024, by Samuel Williams. require 'async' require 'async/http/endpoint' diff --git a/fixtures/rack_application/client.rb b/fixtures/rack_application/client.rb index f9977d2..1261de5 100644 --- a/fixtures/rack_application/client.rb +++ b/fixtures/rack_application/client.rb @@ -2,7 +2,7 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2018-2023, by Samuel Williams. +# Copyright, 2018-2024, by Samuel Williams. require 'async' require 'async/http/endpoint' diff --git a/gems.rb b/gems.rb index 04795dc..4ba7d0e 100644 --- a/gems.rb +++ b/gems.rb @@ -1,12 +1,14 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2015-2023, by Samuel Williams. +# Copyright, 2015-2024, by Samuel Williams. source 'https://rubygems.org' gemspec +# gem "protocol-websocket", path: "../protocol-websocket" + group :maintenance, optional: true do gem "bake-gem" gem "bake-modernize" @@ -15,13 +17,11 @@ end group :test do + gem "sus" + gem "covered" + + gem "sus-fixtures-async-http" + gem "bake-test" gem "bake-test-external" end - -# gem "protocol-websocket", path: "../protocol-websocket" - -# Moved Development Dependencies -gem "covered" -gem "sus", "~> 0.18" -gem "sus-fixtures-async-http", "~> 0.8" diff --git a/lib/async/websocket/server.rb b/lib/async/websocket/server.rb index 130704d..5d77833 100644 --- a/lib/async/websocket/server.rb +++ b/lib/async/websocket/server.rb @@ -2,7 +2,7 @@ # Released under the MIT License. # Copyright, 2018-2023, by Samuel Williams. -# Copyright, 2019, by destructobeam. +# Copyright, 2019, by Simon Crocker. require_relative 'connection' require_relative 'response' diff --git a/license.md b/license.md index 99acbe4..8a55185 100644 --- a/license.md +++ b/license.md @@ -1,8 +1,8 @@ # MIT License -Copyright, 2015-2023, by Samuel Williams. +Copyright, 2015-2024, by Samuel Williams. Copyright, 2019, by Bryan Powell. -Copyright, 2019, by destructobeam. +Copyright, 2019, by Simon Crocker. Copyright, 2019, by Michel Boaventura. Copyright, 2019, by Janko Marohnić. Copyright, 2020-2021, by Olle Jonsson. diff --git a/test/async/websocket/adapters/rack.rb b/test/async/websocket/adapters/rack.rb index 17c6a30..3db624e 100644 --- a/test/async/websocket/adapters/rack.rb +++ b/test/async/websocket/adapters/rack.rb @@ -2,7 +2,7 @@ # Released under the MIT License. # Copyright, 2015-2023, by Samuel Williams. -# Copyright, 2019, by destructobeam. +# Copyright, 2019, by Simon Crocker. require 'async/websocket' require 'async/websocket/client' diff --git a/test/async/websocket/connection.rb b/test/async/websocket/connection.rb index dd6da2e..eeb007c 100644 --- a/test/async/websocket/connection.rb +++ b/test/async/websocket/connection.rb @@ -2,7 +2,7 @@ # Released under the MIT License. # Copyright, 2015-2023, by Samuel Williams. -# Copyright, 2019, by destructobeam. +# Copyright, 2019, by Simon Crocker. require 'async/websocket/connection'