Modernize gem.

socketry · Jan 26, 2023 · b03a6b7 · b03a6b7
1 parent 3a9de3e
commit b03a6b7
Show file tree

Hide file tree

Showing 26 changed files with 276 additions and 285 deletions.
diff --git a/.github/workflows/external.yml → .github/workflows/test-external.yaml b/.github/workflows/external.yml → .github/workflows/test-external.yaml
@@ -1,28 +1,37 @@
-name: External
+name: Test External
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
+env:
+  CONSOLE_OUTPUT: XTerm
+
 jobs:
   test:
     name: ${{matrix.ruby}} on ${{matrix.os}}
     runs-on: ${{matrix.os}}-latest
-
+    
     strategy:
       matrix:
         os:
           - ubuntu
-
+          - macos
+
         ruby:
-          - "3.1.2"
-          - "head"
-
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
+
     steps:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
         bundler-cache: true
-
+    
     - name: Run tests
-      timeout-minutes: 5
-      run: bundle exec bake external
+      timeout-minutes: 10
+      run: bundle exec bake test:external
diff --git a/.github/workflows/test.yml → .github/workflows/test.yaml b/.github/workflows/test.yml → .github/workflows/test.yaml
@@ -2,6 +2,12 @@ name: Test
 
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
+env:
+  CONSOLE_OUTPUT: XTerm
+
 jobs:
   test:
     name: ${{matrix.ruby}} on ${{matrix.os}}
@@ -25,7 +31,6 @@ jobs:
           - "3.2"
 
         experimental: [false]
-        env: [""]
 
         include:
           - os: ubuntu
@@ -46,6 +51,5 @@ jobs:
         bundler-cache: true
 
     - name: Run tests
-      timeout-minutes: 5
-      run: |
-        ${{matrix.env}} bundle exec rspec
+      timeout-minutes: 10
+      run: bundle exec rspec
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,4 @@
+Nick Sieger <[email protected]>
+Tohru Hashimoto <[email protected]>
+Takuya Noguchi <[email protected]>
+Vincent Pellé <[email protected]>
diff --git a/bake.rb b/bake.rb
diff --git a/CHANGELOG.md → changelog.md b/CHANGELOG.md → changelog.md
diff --git a/config/external.yaml b/config/external.yaml
@@ -0,0 +1,6 @@
+faraday-multipart:
+  url: https://github.com/lostisland/faraday-multipart.git
+  command: bundle exec rspec
+twitter:
+  url: https://github.com/sferik/twitter.git
+  command: bundle exec rspec
diff --git a/gems.rb b/gems.rb
@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022, by Samuel Williams.
+
 source "https://rubygems.org"
 
 gemspec
@@ -10,3 +15,8 @@
 		gem "bake-modernize"
 	end
 end
+
+group :test do
+	gem "bake-test"
+	gem "bake-test-external"
+end
diff --git a/lib/composite_io.rb b/lib/composite_io.rb
@@ -1,2 +1,17 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2006-2013, by Nick Sieger.
+# Copyright, 2010, by Tohru Hashimoto.
+# Copyright, 2011, by Jeff Hodges.
+# Copyright, 2011, by Alex Koppel.
+# Copyright, 2011, by Christine Yen.
+# Copyright, 2011, by Gerrit Riessen.
+# Copyright, 2011, by Luke Redpath.
+# Copyright, 2013, by Mislav Marohnić.
+# Copyright, 2013, by Leo Cassarani.
+# Copyright, 2019, by Olle Jonsson.
+# Copyright, 2022, by Samuel Williams.
+
 warn "Top level ::CompositeIO is deprecated, require 'multipart/post' and use `Multipart::Post::CompositeReadIO` instead!"
 require_relative 'multipart/post'
diff --git a/lib/multipart/post.rb b/lib/multipart/post.rb
@@ -1,24 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright, 2007-2013, by Nick Sieger.
-# 
-# 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.
+# Released under the MIT License.
+# Copyright, 2019, by Patrick Davey.
+# Copyright, 2021-2022, by Samuel Williams.
 
 require_relative 'post/multipartable'
 require_relative 'post/upload_io'
diff --git a/lib/multipart/post/composite_read_io.rb b/lib/multipart/post/composite_read_io.rb
@@ -1,24 +1,19 @@
 # frozen_string_literal: true
 
-# Copyright, 2007-2013, by Nick Sieger.
-# 
-# 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.
+# Released under the MIT License.
+# Copyright, 2006-2013, by Nick Sieger.
+# Copyright, 2010, by Tohru Hashimoto.
+# Copyright, 2011, by Jeff Hodges.
+# Copyright, 2011, by Alex Koppel.
+# Copyright, 2011, by Christine Yen.
+# Copyright, 2011, by Gerrit Riessen.
+# Copyright, 2011, by Luke Redpath.
+# Copyright, 2013, by Mislav Marohnić.
+# Copyright, 2013, by Leo Cassarani.
+# Copyright, 2019, by Olle Jonsson.
+# Copyright, 2019, by Patrick Davey.
+# Copyright, 2021, by Lewis Cowles.
+# Copyright, 2021-2022, by Samuel Williams.
 
 module Multipart
   module Post

diff --git a/lib/multipart/post/multipartable.rb b/lib/multipart/post/multipartable.rb
@@ -1,24 +1,17 @@
 # frozen_string_literal: true
 
-# Copyright, 2007-2013, by Nick Sieger.
-# 
-# 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.
+# Released under the MIT License.
+# Copyright, 2008, by McClain Looney.
+# Copyright, 2008-2013, by Nick Sieger.
+# Copyright, 2011, by Gerrit Riessen.
+# Copyright, 2013, by Vincent Pellé.
+# Copyright, 2013, by Gustav Ernberg.
+# Copyright, 2013, by Socrates Vicente.
+# Copyright, 2013, by Steffen Grunwald.
+# Copyright, 2019, by Olle Jonsson.
+# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019, by Patrick Davey.
+# Copyright, 2022, by Jason York.
 
 require_relative 'parts'
 require_relative 'composite_read_io'

diff --git a/lib/multipart/post/parts.rb b/lib/multipart/post/parts.rb
@@ -1,24 +1,23 @@
 # frozen_string_literal: true
 
-# Copyright, 2007-2013, by Nick Sieger.
-# 
-# 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.
+# Released under the MIT License.
+# Copyright, 2008-2009, by McClain Looney.
+# Copyright, 2009-2013, by Nick Sieger.
+# Copyright, 2011, by Johannes Wagener.
+# Copyright, 2011, by Gerrit Riessen.
+# Copyright, 2011, by Jason Moore.
+# Copyright, 2012, by Steven Davidovitz.
+# Copyright, 2012, by hexfet.
+# Copyright, 2013, by Vincent Pellé.
+# Copyright, 2013, by Gustav Ernberg.
+# Copyright, 2013, by Socrates Vicente.
+# Copyright, 2017, by David Moles.
+# Copyright, 2017, by Matt Colyer.
+# Copyright, 2017, by Eric Hutzelman.
+# Copyright, 2019-2021, by Olle Jonsson.
+# Copyright, 2019, by Ethan Turkeltaub.
+# Copyright, 2019, by Patrick Davey.
+# Copyright, 2021-2022, by Samuel Williams.
 
 require 'stringio'
 

diff --git a/lib/multipart/post/upload_io.rb b/lib/multipart/post/upload_io.rb
@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-# Copyright, 2007-2013, by Nick Sieger.
-# 
-# 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.
+# Released under the MIT License.
+# Copyright, 2022, by Samuel Williams.
 
 module Multipart
   module Post

diff --git a/lib/multipart/post/version.rb b/lib/multipart/post/version.rb
@@ -1,24 +1,8 @@
 # frozen_string_literal: true
 
-# Copyright, 2007-2013, by Nick Sieger.
-# 
-# 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.
+# Released under the MIT License.
+# Copyright, 2019, by Patrick Davey.
+# Copyright, 2021-2023, by Samuel Williams.
 
 module Multipart
   module Post

diff --git a/lib/multipart_post.rb b/lib/multipart_post.rb
@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2009-2013, by Nick Sieger.
+# Copyright, 2019-2022, by Samuel Williams.
+
 warn "Top level ::MultipartPost is deprecated, require 'multipart/post' and use `Multipart::Post` instead!"
 require_relative 'multipart/post'
 

diff --git a/lib/multipartable.rb b/lib/multipartable.rb
@@ -1,3 +1,17 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2008, by McClain Looney.
+# Copyright, 2008-2013, by Nick Sieger.
+# Copyright, 2011, by Gerrit Riessen.
+# Copyright, 2013, by Vincent Pellé.
+# Copyright, 2013, by Gustav Ernberg.
+# Copyright, 2013, by Socrates Vicente.
+# Copyright, 2013, by Steffen Grunwald.
+# Copyright, 2019, by Olle Jonsson.
+# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019, by Patrick Davey.
+
 warn "Top level ::Multipartable is deprecated, require 'multipart/post' and use `Multipart::Post::Multipartable` instead!"
 require_relative 'multipart/post'