shotgun3 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9af0fb39a20566ffcf21d9fc8f63f4684764e4119570836373ffa360c051ace
-  data.tar.gz: 76fb447e0c8180061e856bc39efbe33beae7b4a1e051e4a98d9171170aa8ca3f
+  metadata.gz: b0d077cbcde3b28dc2a01dd72ca068e06877d92cb02ff6e2f979dc13a23a7a62
+  data.tar.gz: aac81c57596c2f75a5f6e8fa7f310b2ed81cdc462cecc0f4ff0c80324186787f
 SHA512:
-  metadata.gz: f2171f369fa8d101eb587211f8de9ae58a3935b4cfccc137a02200e9259c700d593e95b8b36f309a4723b4a8d5d653cfd99434c1244609aba6f0c51e7d5bde5d
-  data.tar.gz: b8f4f13f150e8f54248c484e2fd120dc47f90f1f0f8a7f8db23ad7cd15100cdc736c04aeae0fdeb4966d8a598227a333d1bdceba4f68f7f0d28526afc73660a3
+  metadata.gz: 4ff00d32d1cb255cdf75e2a791d3a3957725f2494c5d0f98ab2435f0c032f33cbfcba9ee93d4ae6fb0903c8c6585e31caae5399378d8beb3ca7dcb23f0644053
+  data.tar.gz: 445b0d33d2ee7cab5f8ac2e3e8ea622c323a71c3dd89893d2d76bd5536e69080c46b3cae36f8e618721c6c9c4f7dc2559dc3afe1c3b180da3ad923afb4f1b324

data/Rakefile

@@ -5,7 +5,7 @@ task :default => [:test]
 
 Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/test_shotgun_*.rb']
-  t.ruby_opts = ['-rubygems'] if defined? Gem
+  t.ruby_opts = ['-r rubygems'] if defined? Gem
 end
 
 desc "build manual"
@@ -15,7 +15,7 @@ task :man do
 end
 
 require 'rubygems'
-SPEC = eval(File.read('shotgun.gemspec'))
+SPEC = eval(File.read('shotgun3.gemspec'))
 PACK = "#{SPEC.name}-#{SPEC.version}"
 
 desc 'build packages'
@@ -23,8 +23,8 @@ task :package => %W[pkg/#{PACK}.gem pkg/#{PACK}.tar.gz]
 
 directory 'pkg/'
 
-file "pkg/#{PACK}.gem" => %w[pkg/ shotgun.gemspec] + SPEC.files do |f|
-  sh "gem build shotgun.gemspec"
+file "pkg/#{PACK}.gem" => %w[pkg/ shotgun3.gemspec] + SPEC.files do |f|
+  sh "gem build shotgun3.gemspec"
   mv File.basename(f.name), f.name
 end
 

data/bin/shotgun

@@ -2,6 +2,13 @@
 
 require 'optparse'
 
+begin
+  require 'rackup'
+  puts "Using the new Rackup::Handler"
+rescue LoadError
+  puts "Rackup is not available using Rack::Handler"
+end
+
 env = ENV['RACK_ENV'] || 'development'
 host = ENV['HOST'] || '127.0.0.1'
 port = ENV['PORT'] || 9393
@@ -109,7 +116,8 @@ require 'rack'
 require 'shotgun'
 
 require 'thin' if server.to_s.downcase == 'thin'
-server = Rack::Handler.get(server) || Rack::Handler.default
+handler = defined?(Rackup::Handler) ? Rackup::Handler : Rack::Handler
+server = handler.get(server) || handler.default
 
 app =
   Rack::Builder.new do

data/shotgun3.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = 'shotgun3'
-  s.version = '1.0.0'
+  s.version = '1.2.0'
 
-  s.description = "Reloading Rack development server (Ruby 3 compatible)"
-  s.summary     = "This is probably a temporary fork, until the official gem supports Ruby 3. There's already a pending PR for this change but it's been there for a while"
+  s.description = "Reloading Rack development server (Ruby 3 and Rack 3 compatible)"
+  s.summary     = "This is probably a temporary fork, until the official gem supports Ruby 3 and Rack 3. There's already a pending PR for this change but it's been there for a while"
 
   s.license = "MIT"
 
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.add_dependency 'rack',    '~> 2.1'
+  s.add_dependency 'rack',    '~> 3.0'
 
   s.homepage = "https://github.com/rtomayko/shotgun"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shotgun3
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan Tomayko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-29 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,15 +16,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-description: Reloading Rack development server (Ruby 3 compatible)
+        version: '3.0'
+description: Reloading Rack development server (Ruby 3 and Rack 3 compatible)
 email: rtomayko@gmail.com
 executables:
 - shotgun
@@ -58,7 +58,7 @@ homepage: https://github.com/rtomayko/shotgun
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -73,11 +73,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
-summary: This is probably a temporary fork, until the official gem supports Ruby 3.
-  There's already a pending PR for this change but it's been there for a while
+summary: This is probably a temporary fork, until the official gem supports Ruby 3
+  and Rack 3. There's already a pending PR for this change but it's been there for
+  a while
 test_files:
 - test/big.ru
 - test/boom.ru