Use bundler for installing dependencies, fix ruby-head issues

.github/workflows/tests.yml

@@ -13,11 +13,15 @@ jobs:
     runs-on: ubuntu-22.04
 
     strategy:
+      fail-fast: false
       matrix:
         ruby: ['3.0', '3.1', '3.2', '3.3', 'ruby-head']
-        rack: ['2', '3']
+        gemfile: ['rack-2', 'rack-3']
 
-    name: Ruby ${{ matrix.ruby }} - Rack ${{ matrix.rack }}
+    name: Ruby ${{ matrix.ruby }} - Rack ${{ matrix.gemfile }}
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
 
     steps:
       - uses: actions/checkout@v4
@@ -31,11 +35,5 @@ jobs:
           bundler-cache: true
           ruby-version: ${{ matrix.ruby }}
 
-      - name: Install raindrops
-        run: gem install raindrops-maintained -v 0.21.0
-
-      - name: Install Rack ${{ matrix.rack }}
-        run: gem install rack -v '~> ${{ matrix.rack }}.0'
-
       - name: Run tests with perl prove
         run: make -j1 && prove -vw

.gitignore

@@ -23,3 +23,5 @@ pkg/
 /LATEST
 /lib/unicorn/version.rb
 /*_1
+Gemfile.lock
+gemfiles/*.lock

GNUmakefile

@@ -3,9 +3,9 @@ all:: test
 
 RLFLAGS = -G2
 
-MRI = ruby
-RUBY = ruby
-RAKE = rake
+MRI = bundle exec ruby
+RUBY = bundle exec ruby
+RAKE = bundle exec rake
 RAGEL = ragel
 RSYNC = rsync
 OLDDOC = olddoc

Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

gemfiles/rack-2.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec path: "../"
+
+gem "rack", "~> 2.0"

gemfiles/rack-3.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec path: "../"
+
+gem "rack", "~> 3.0"

lib/unicorn.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 require 'etc'
 require 'stringio'
 require 'raindrops'

lib/unicorn/app/old_rails.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 
 # :enddoc:
 # This code is based on the original Rails handler in Mongrel

lib/unicorn/app/old_rails/static.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 # :enddoc:
 # This code is based on the original Rails handler in Mongrel
 # Copyright (c) 2005 Zed A. Shaw

lib/unicorn/cgi_wrapper.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 
 # :enddoc:
 # This code is based on the original CGIWrapper from Mongrel

lib/unicorn/configurator.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 require 'logger'
 
 # Implements a simple DSL for configuring a unicorn server.

lib/unicorn/const.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 
 module Unicorn::Const # :nodoc:
   # default TCP listen host address (0.0.0.0, all interfaces)

lib/unicorn/http_request.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 # :enddoc:
 # no stable API here
 require 'unicorn_http'

lib/unicorn/http_response.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 # :enddoc:
 # Writes a Rack response to your client using the HTTP/1.1 specification.
 # You use it by simply doing:

lib/unicorn/http_server.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 
 # This is the process manager of Unicorn. This manages worker
 # processes which in turn handle the I/O and application process.

lib/unicorn/launcher.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 
 # :enddoc:
 $stdout.sync = $stderr.sync = true

lib/unicorn/oob_gc.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 
 # Strongly consider https://github.com/tmm1/gctools if using Ruby 2.1+
 # It is built on new APIs in Ruby 2.1, so it is more intelligent than

lib/unicorn/preread_input.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 
 module Unicorn
 # This middleware is used to ensure input is buffered to memory

lib/unicorn/select_waiter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # fallback for non-Linux and Linux <4.5 systems w/o EPOLLEXCLUSIVE
 class Unicorn::SelectWaiter # :nodoc:
   def get_readers(ready, readers, timeout) # :nodoc:

lib/unicorn/socket_helper.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 # :enddoc:
 require 'socket'
 

lib/unicorn/stream_input.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 
 # When processing uploads, unicorn may expose a StreamInput object under
 # "rack.input" of the Rack environment when

lib/unicorn/tee_input.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 
 # Acts like tee(1) on an input input to provide a input-like stream
 # while providing rewindable semantics through a File/StringIO backing

lib/unicorn/tmpio.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 # :stopdoc:
 require 'tmpdir'
 

lib/unicorn/util.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 
 require 'fcntl'
 module Unicorn::Util # :nodoc:

lib/unicorn/worker.rb

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+# frozen_string_literal: false
 require "raindrops"
 
 # This class and its members can be considered a stable interface

t/lib.perl

@@ -202,7 +202,7 @@ sub unicorn {
 	state $eng = $ENV{TEST_RUBY_ENGINE} // `$ruby -e 'print RUBY_ENGINE'`;
 	state $ext = File::Spec->rel2abs("test/$eng-$ver/ext/unicorn_http");
 	state $exe = File::Spec->rel2abs('bin/unicorn');
-	my $pid = spawn(\%env, $ruby, '-I', $lib, '-I', $ext, $exe, @args);
+	my $pid = spawn(\%env, 'bundle', 'exec', $ruby, '-I', $lib, '-I', $ext, $exe, @args);
 	UnicornTest::AutoReap->new($pid);
 }