diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index 214149c..cbff675 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -20,7 +20,6 @@ jobs: - macos ruby: - - "2.7" - "3.0" - "3.1" - "3.2" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5c765b6..942ede7 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,7 +21,6 @@ jobs: - macos ruby: - - "2.7" - "3.0" - "3.1" - "3.2" diff --git a/.mailmap b/.mailmap index 16a64a8..4d28a24 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,4 @@ Juan Antonio Martín Lucas Aurora Nockert Thomas Morgan +Peter Runich <43861241+PeterRunich@users.noreply.github.com> diff --git a/async-websocket.gemspec b/async-websocket.gemspec index 20bdacd..8256784 100644 --- a/async-websocket.gemspec +++ b/async-websocket.gemspec @@ -7,7 +7,7 @@ Gem::Specification.new do |spec| spec.version = Async::WebSocket::VERSION spec.summary = "An async websocket library on top of websocket-driver." - spec.authors = ["Samuel Williams", "destructobeam", "Olle Jonsson", "Aurora Nockert", "Bryan Powell", "Gleb Sinyavskiy", "Janko Marohnić", "Juan Antonio Martín Lucas", "Michel Boaventura"] + 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.license = "MIT" spec.cert_chain = ['release.cert'] @@ -17,13 +17,10 @@ Gem::Specification.new do |spec| spec.files = Dir.glob(['{lib}/**/*', '*.md'], File::FNM_DOTMATCH, base: __dir__) + spec.required_ruby_version = ">= 3.0" + spec.add_dependency "async-http", "~> 0.54" spec.add_dependency "async-io", "~> 1.23" spec.add_dependency "protocol-rack", "~> 0.1" spec.add_dependency "protocol-websocket", "~> 0.11" - - spec.add_development_dependency "bundler" - spec.add_development_dependency "covered" - spec.add_development_dependency "sus", "~> 0.18" - spec.add_development_dependency "sus-fixtures-async-http", "~> 0.2.3" end diff --git a/examples/mud/client.rb b/examples/mud/client.rb index 4850c21..67e7991 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-2022, by Samuel Williams. +# Copyright, 2019-2023, by Samuel Williams. # Copyright, 2020, by Juan Antonio Martín Lucas. require 'async' diff --git a/examples/utopia/bake.rb b/examples/utopia/bake.rb index 0a7e0de..631ae0b 100644 --- a/examples/utopia/bake.rb +++ b/examples/utopia/bake.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2020-2022, by Samuel Williams. +# Copyright, 2018-2023, by Samuel Williams. # Prepare the application for start/restart. def deploy diff --git a/fixtures/rack_application/client.rb b/fixtures/rack_application/client.rb index 851e4d2..98eca72 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-2022, by Samuel Williams. +# Copyright, 2018-2023, by Samuel Williams. require 'async' require 'async/io/stream' diff --git a/fixtures/upgrade_application.rb b/fixtures/upgrade_application.rb index d67f128..b61f8e7 100644 --- a/fixtures/upgrade_application.rb +++ b/fixtures/upgrade_application.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2019-2022, by Samuel Williams. +# Copyright, 2019-2023, by Samuel Williams. require 'async/websocket/adapters/rack' diff --git a/gems.rb b/gems.rb index bc04589..82adbfa 100644 --- a/gems.rb +++ b/gems.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2015-2022, by Samuel Williams. +# Copyright, 2015-2023, by Samuel Williams. source 'https://rubygems.org' @@ -20,3 +20,8 @@ end # gem "protocol-websocket", path: "../protocol-websocket" + +# Moved Development Dependencies +gem "covered" +gem "sus", "~> 0.18" +gem "sus-fixtures-async-http", "~> 0.2.3" diff --git a/lib/async/websocket.rb b/lib/async/websocket.rb index ac9edc5..761640c 100644 --- a/lib/async/websocket.rb +++ b/lib/async/websocket.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2015-2022, by Samuel Williams. +# Copyright, 2015-2023, by Samuel Williams. require_relative 'websocket/version' require_relative 'websocket/server' diff --git a/lib/async/websocket/adapters/rails.rb b/lib/async/websocket/adapters/rails.rb index 0b6e764..5c10325 100644 --- a/lib/async/websocket/adapters/rails.rb +++ b/lib/async/websocket/adapters/rails.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2021-2022, by Samuel Williams. +# Copyright, 2021-2023, by Samuel Williams. +# Copyright, 2023, by Emily Love Mills. require_relative 'rack' diff --git a/lib/async/websocket/upgrade_request.rb b/lib/async/websocket/upgrade_request.rb index 8f3d6ca..cadbebb 100644 --- a/lib/async/websocket/upgrade_request.rb +++ b/lib/async/websocket/upgrade_request.rb @@ -2,6 +2,7 @@ # Released under the MIT License. # Copyright, 2019-2023, by Samuel Williams. +# Copyright, 2023, by Thomas Morgan. require 'protocol/http/middleware' require 'protocol/http/request' diff --git a/lib/async/websocket/upgrade_response.rb b/lib/async/websocket/upgrade_response.rb index 21e9597..0fd5e4b 100644 --- a/lib/async/websocket/upgrade_response.rb +++ b/lib/async/websocket/upgrade_response.rb @@ -2,6 +2,7 @@ # Released under the MIT License. # Copyright, 2019-2023, by Samuel Williams. +# Copyright, 2023, by Thomas Morgan. require 'async/http/body/hijack' require 'protocol/http/response' diff --git a/lib/async/websocket/version.rb b/lib/async/websocket/version.rb index 6fccbc9..8119829 100644 --- a/lib/async/websocket/version.rb +++ b/lib/async/websocket/version.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2018-2022, by Samuel Williams. +# Copyright, 2018-2023, by Samuel Williams. module Async module WebSocket diff --git a/license.md b/license.md index d5fc2bb..99acbe4 100644 --- a/license.md +++ b/license.md @@ -9,6 +9,9 @@ Copyright, 2020-2021, by Olle Jonsson. Copyright, 2020, by Juan Antonio Martín Lucas. Copyright, 2021, by Gleb Sinyavskiy. Copyright, 2021, by Aurora Nockert. +Copyright, 2023, by Peter Runich. +Copyright, 2023, by Thomas Morgan. +Copyright, 2023, by Emily Love Mills. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/readme.md b/readme.md index fb996a1..29409c6 100644 --- a/readme.md +++ b/readme.md @@ -12,8 +12,16 @@ Please see the [project documentation](https://socketry.github.io/async-websocke We welcome contributions to this project. -1. Fork it -2. Create your feature branch (`git checkout -b my-new-feature`) -3. Commit your changes (`git commit -am 'Add some feature'`) -4. Push to the branch (`git push origin my-new-feature`) -5. Create new Pull Request +1. Fork it. +2. Create your feature branch (`git checkout -b my-new-feature`). +3. Commit your changes (`git commit -am 'Add some feature'`). +4. Push to the branch (`git push origin my-new-feature`). +5. Create new Pull Request. + +### Developer Certificate of Origin + +This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this project must agree to this document to have their contributions accepted. + +### Contributor Covenant + +This project is governed by [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms. diff --git a/test/async/websocket/adapters/rack.rb b/test/async/websocket/adapters/rack.rb index 4df422d..17c6a30 100644 --- a/test/async/websocket/adapters/rack.rb +++ b/test/async/websocket/adapters/rack.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true # Released under the MIT License. -# Copyright, 2019-2023, by Samuel Williams. +# Copyright, 2015-2023, by Samuel Williams. +# Copyright, 2019, by destructobeam. require 'async/websocket' require 'async/websocket/client' diff --git a/test/async/websocket/client.rb b/test/async/websocket/client.rb index c486218..64d7bb0 100644 --- a/test/async/websocket/client.rb +++ b/test/async/websocket/client.rb @@ -2,6 +2,7 @@ # Released under the MIT License. # Copyright, 2023, by Samuel Williams. +# Copyright, 2023, by Thomas Morgan. require 'async/websocket/client'