geminabox 2.2.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12356dade9bded5c65e544736b210902fc950aecb8760b6d65804d8dac4046f9
-  data.tar.gz: 2be1eac2ca7122ce5bc5e02ef80024b06e27ed80a5e1f249787bb032f5d37ca3
+  metadata.gz: 0cfce489e43841df96a314d9a85776328e77a48c3093fabbd9333f5ac0a83079
+  data.tar.gz: d3b23957c2ac25f41aab48528e49f85d24fb6701aabec0ae5d8ef622ea189521
 SHA512:
-  metadata.gz: 1d8018a7ba17aa3f5a206775b24810ed20a4b26028e50b6107d4f0601b2ea639d2c34039eb609661f39235727422f33a2a46e83e0ade625d1313b3210bb6d0ce
-  data.tar.gz: aaf7aec9ca78b79a56742843c63b4e19ba76fec05f2f2863cb2ef445c6837c6e4ac6e43912f74436cc8f40178c03cd4aed1ddcbb7ae80a79f9ea40133b76b351
+  metadata.gz: '0985c4ba1960c2ef314f18a9a3a6209e76401ffd00ffed6ad79b5e75a3de169f47c315c87e25e930d8d72ecf3f41b94f2cd1d1d41f027ae0aa4c83796cd71cb8'
+  data.tar.gz: 9a28c37de926675893b4d620c037531e44894d084025ffbd6deb77d2f55be4e76fbc0f866e8547d29e6454f996dd9b1f5aea43c21ed44f9fd463c011d5e92c5b

data/README.md

@@ -15,16 +15,8 @@ For basic auth, try [Rack::Auth](http://www.rubydoc.info/github/rack/rack/Rack/A
 
 ## System Requirements
 
-- Ruby 2.3 through 3.4 (Ruby 3.2+ is highly recommended)
-- RubyGems 2.5 or later (latest version recommended)
-- **Ruby 3.3+ users:** You must also install the `rubygems-generate_index` gem.
-  `Gem::Indexer` was extracted from RubyGems in 3.3 and geminabox requires it
-  to function. Add it to your Gemfile or install it directly:
-
-      gem install rubygems-generate_index
-
-**Note:** Ruby 2.x support is deprecated. geminabox 3.0 will require Ruby >= 3.0.
-Pin to `gem 'geminabox', '~> 2.2'` if you cannot upgrade yet.
+- Ruby 3.0 or later (Ruby 3.2+ recommended)
+- RubyGems 3.2.3 or later (latest version recommended)
 
 ## Server Setup
 
@@ -51,6 +43,12 @@ Start your gem server with 'rackup' to run WEBrick or hook up the config.ru as y
 
 ## RubyGems Proxy
 
+> **Deprecated.** The RubyGems proxy is unmaintained and **will be removed in
+> Geminabox 4.0.** It depends on the RubyGems.org Dependency API
+> (`/api/v1/dependencies`), which was [sunset on 2023-05-24](https://blog.rubygems.org/2023/02/22/dependency-api-deprecation.html)
+> in favour of the Compact Index API, so proxy mode no longer functions.
+> Enabling it now emits a deprecation warning. Do not rely on this feature.
+
 Geminabox can be configured to pull gems, it does not currently have, from rubygems.org. To enable this mode you can either:
 
 Set RUBYGEM_PROXY to true in the environment:
@@ -188,7 +186,8 @@ Your Gemfile only needs:
 source 'https://rubygems.org'
 
 gem 'geminabox'
-gem 'rubygems-generate_index' # Required for Ruby 3.3+
+gem 'rackup'
+gem 'webrick' # or other server you prefer
 ```
 
 From there

data/lib/geminabox/disk_cache.rb

@@ -46,26 +46,22 @@ module Geminabox
 
     def read(key_hash)
       read_int(key_hash) do |path|
-        begin
-          File.read(path)
-        rescue Errno::ENOENT
-          # There is a possibility that the file is removed by another process
-          # after checking File.exist?. Return nil if the file does not exist.
-          nil
-        end
+        File.read(path)
+      rescue Errno::ENOENT
+        # There is a possibility that the file is removed by another process
+        # after checking File.exist?. Return nil if the file does not exist.
+        nil
       end
     end
 
     def marshal_read(key_hash)
       read_int(key_hash) do |path|
-        begin
-          File.open(path) {|fp| Marshal.load(fp) }
-        rescue Errno::ENOENT, EOFError
-          # There is a possibility that the file is removed by another process.
-          # Marshal.load raises EOFError if the file is removed after File.open(path) succeeds.
-          # Return nil if the file does not exist.
-          nil
-        end
+        File.open(path) {|fp| Marshal.load(fp) }
+      rescue Errno::ENOENT, EOFError
+        # There is a possibility that the file is removed by another process.
+        # Marshal.load raises EOFError if the file is removed after File.open(path) succeeds.
+        # Return nil if the file does not exist.
+        nil
       end
     end
 

data/lib/geminabox/hostess.rb

@@ -5,6 +5,8 @@ require 'sinatra/base'
 module Geminabox
 
   class Hostess < Sinatra::Base
+    set :host_authorization, { permitted_hosts: [] }
+
     def serve
       headers["Cache-Control"] = 'no-transform'
       send_file(File.expand_path(File.join(Geminabox.data, *request.path_info)), :type => response['Content-Type'])
@@ -20,23 +22,16 @@ module Geminabox
       end
     end
 
-    %w[/quick/Marshal.4.8/*.gemspec.rz
-       /yaml.Z
-       /Marshal.4.8.Z
-    ].each do |deflated_index|
-      get deflated_index do
-        content_type('application/x-deflate')
-        serve
-      end
+    get '/quick/Marshal.4.8/*.gemspec.rz' do
+      content_type('application/x-deflate')
+      serve
     end
 
-    %w[/yaml
-       /Marshal.4.8
-       /specs.4.8
+    %w[/specs.4.8
        /latest_specs.4.8
        /prerelease_specs.4.8
-    ].each do |old_index|
-      get old_index do
+    ].each do |index|
+      get index do
         serve
       end
     end

data/lib/geminabox/indexer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'geminabox'
+require 'rubygems/indexer'
 
 module Geminabox::Indexer
   def self.updated_gemspecs(indexer)

data/lib/geminabox/proxy/hostess.rb

@@ -6,6 +6,8 @@ require 'net/http'
 module Geminabox
   module Proxy
     class Hostess < Sinatra::Base
+      set :host_authorization, { permitted_hosts: [] }
+
       attr_accessor :file_handler
       def serve
         headers["Cache-Control"] = 'no-transform'
@@ -27,25 +29,18 @@ module Geminabox
         end
       end
 
-      %w[quick/Marshal.4.8/*.gemspec.rz
-         yaml.Z
-         Marshal.4.8.Z
-      ].each do |deflated_index|
-        get "/#{deflated_index}" do
-          copy_file request.path_info[1..-1]
-          content_type('application/x-deflate')
-          serve
-        end
+      get '/quick/Marshal.4.8/*.gemspec.rz' do
+        copy_file request.path_info[1..]
+        content_type('application/x-deflate')
+        serve
       end
 
-      %w[yaml
-         Marshal.4.8
-         specs.4.8
+      %w[specs.4.8
          latest_specs.4.8
          prerelease_specs.4.8
-      ].each do |old_index|
-        get "/#{old_index}" do
-          splice_file old_index
+      ].each do |index|
+        get "/#{index}" do
+          splice_file index
           serve
         end
       end

data/lib/geminabox/server.rb

@@ -9,8 +9,10 @@ module Geminabox
     enable :static, :methodoverride
     set :public_folder, Geminabox.public_folder
     set :views, Geminabox.views
+    set :host_authorization, { permitted_hosts: [] }
 
     if Geminabox.rubygems_proxy
+      Geminabox.warn_rubygems_proxy_deprecation
       use Proxy::Hostess
     else
       use Hostess
@@ -60,7 +62,7 @@ module Geminabox
       end
 
       def indexer
-        Gem::Indexer.new(Geminabox.data, :build_legacy => Geminabox.build_legacy)
+        Gem::Indexer.new(Geminabox.data)
       end
 
       def dependency_cache
@@ -158,8 +160,8 @@ module Geminabox
       halt 400 unless request.form_data?
 
       serialize_update do
-        gems = load_gems.select { |gem| request['gem_name'] == gem.name and
-                                  request['version'] == gem.number.version }
+        gems = load_gems.select { |gem| params['gem_name'] == gem.name and
+                                  params['version'] == gem.number.version }
         halt 404, 'Gem not found' if gems.size == 0
         gems.each do |gem|
           gem_path = File.expand_path(File.join(Geminabox.data, 'gems',

data/lib/geminabox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geminabox
-  VERSION = '2.2.0' unless defined? VERSION
+  VERSION = '3.1.0' unless defined? VERSION
 end

data/lib/geminabox.rb

@@ -5,19 +5,7 @@ require 'digest/md5'
 require 'builder'
 require 'sinatra/base'
 require 'rubygems/user_interaction'
-# Gem::Indexer was extracted from RubyGems in 3.3+.
-# On Ruby 3.3+, require the rubygems-generate_index gem instead.
-begin
-  require 'rubygems/indexer'
-rescue LoadError
-  begin
-    require 'rubygems-generate_index'
-  rescue LoadError
-    raise LoadError,
-          "Ruby 3.3+ requires the 'rubygems-generate_index' gem. " \
-          "Add it to your Gemfile or run: gem install rubygems-generate_index"
-  end
-end
+require 'rubygems/indexer'
 require 'rubygems/package'
 require 'tempfile'
 require 'json'
@@ -25,11 +13,6 @@ require 'tilt/erb'
 require 'rack/protection'
 
 module Geminabox
-  if RUBY_VERSION < '3.0'
-    warn "DEPRECATION: geminabox 3.0 will require Ruby >= 3.0. " \
-         "You are running Ruby #{RUBY_VERSION}. Please plan your upgrade. " \
-         "Pin to gem 'geminabox', '~> 2.2' if you cannot upgrade yet."
-  end
 
   class Error < StandardError ; end
 
@@ -74,14 +57,6 @@ module Geminabox
       :on_gem_received
     )
 
-    attr_reader :build_legacy
-
-    def build_legacy=(value)
-      warn "Setting `Geminabox.build_legacy` is deprecated and will be removed in the future. Geminbox will always build modern indices"
-
-      @build_legacy = value
-    end
-
     def set_defaults(defaults)
       defaults.each do |method, default|
         variable = "@#{method}"
@@ -93,6 +68,17 @@ module Geminabox
       Server.settings
     end
 
+    # Deprecated: the RubyGems proxy is unmaintained and will be removed in
+    # Geminabox 4.0. It depends on the RubyGems.org Dependency API
+    # (/api/v1/dependencies), which was sunset on 2023-05-24, so proxy mode no
+    # longer functions.
+    def warn_rubygems_proxy_deprecation
+      warn '[DEPRECATION] Geminabox RubyGems proxy is deprecated and will be ' \
+           'removed in Geminabox 4.0. It depends on the RubyGems.org ' \
+           'Dependency API (/api/v1/dependencies), which was sunset on ' \
+           '2023-05-24, so proxy mode no longer functions.'
+    end
+
     def call(env)
       Server.call env
     end
@@ -101,7 +87,6 @@ module Geminabox
   set_defaults(
     data:                           File.join(File.dirname(__FILE__), *%w[.. data]),
     public_folder:                  File.join(File.dirname(__FILE__), *%w[.. public]),
-    build_legacy:                   false,
     incremental_updates:            true,
     views:                          File.join(File.dirname(__FILE__), *%w[.. views]),
     allow_replace:                  false,

data/lib/geminabox_client.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'uri'
-require 'cgi'
+require 'cgi/escape'
 require 'geminabox'
 
 class GeminaboxClient

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Tom Lea
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +103,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubygems-generate_index
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: A private gem hosting and/or caching app, with client side gem push style
   functionality. Web UI is provided.
 email:
@@ -153,7 +167,7 @@ files:
 - views/upload.erb
 homepage: https://github.com/geminabox/geminabox
 licenses:
-- MIT-LICENSE
+- MIT
 metadata:
   homepage_uri: https://github.com/geminabox/geminabox
   source_code_uri: https://github.com/geminabox/geminabox
@@ -167,12 +181,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.2.3
 requirements: []
 rubygems_version: 4.0.3
 specification_version: 4