Skip to content

Modernize gem. #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/test-external.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
- macos

ruby:
- "2.7"
- "3.0"
- "3.1"
- "3.2"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
- macos

ruby:
- "2.7"
- "3.0"
- "3.1"
- "3.2"
Expand Down
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Juan Antonio Martín Lucas <dev@jaml.pro>
Aurora Nockert <aurora@aventine.se>
Thomas Morgan <tm@iprog.com>
Peter Runich <43861241+PeterRunich@users.noreply.github.com>
9 changes: 3 additions & 6 deletions async-websocket.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand All @@ -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
2 changes: 1 addition & 1 deletion examples/mud/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion examples/utopia/bake.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion fixtures/rack_application/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion fixtures/upgrade_application.rb
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
7 changes: 6 additions & 1 deletion gems.rb
Original file line number Diff line number Diff line change
@@ -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'

Expand All @@ -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"
2 changes: 1 addition & 1 deletion lib/async/websocket.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
3 changes: 2 additions & 1 deletion lib/async/websocket/adapters/rails.rb
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
1 change: 1 addition & 0 deletions lib/async/websocket/upgrade_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions lib/async/websocket/upgrade_response.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion lib/async/websocket/version.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions license.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 13 additions & 5 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
3 changes: 2 additions & 1 deletion test/async/websocket/adapters/rack.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
1 change: 1 addition & 0 deletions test/async/websocket/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# Released under the MIT License.
# Copyright, 2023, by Samuel Williams.
# Copyright, 2023, by Thomas Morgan.

require 'async/websocket/client'

Expand Down