geminabox 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3afde9bba2ed91992e99d5e95ff71eb6a111d7a4b4362c1857e75a01dfdb671a
-  data.tar.gz: 360da5ba51676bd8d78ae6139c782b52d9f83f31ca7a5497c06c6d38394fd5b9
+  metadata.gz: 12356dade9bded5c65e544736b210902fc950aecb8760b6d65804d8dac4046f9
+  data.tar.gz: 2be1eac2ca7122ce5bc5e02ef80024b06e27ed80a5e1f249787bb032f5d37ca3
 SHA512:
-  metadata.gz: 2a2dc5c9d5109dd36b987066ec29f620e9d646dacd7a39813447b84ab03ffa6edde2bec1c50b341b1d0604d1317f740900c26f5bd72f40ba076893e00aee9b9e
-  data.tar.gz: 44befa817d8a56f87be69c1c3ec06f75caed8c74a85e892207a5f06e43cb629da418db51eec3ac95fb081043c7066b7e64ab13edcfe5a7711a1020843f503d15
+  metadata.gz: 1d8018a7ba17aa3f5a206775b24810ed20a4b26028e50b6107d4f0601b2ea639d2c34039eb609661f39235727422f33a2a46e83e0ade625d1313b3210bb6d0ce
+  data.tar.gz: aaf7aec9ca78b79a56742843c63b4e19ba76fec05f2f2863cb2ef445c6837c6e4ac6e43912f74436cc8f40178c03cd4aed1ddcbb7ae80a79f9ea40133b76b351

data/README.md

@@ -1,4 +1,7 @@
+[![](https://repository-images.githubusercontent.com/463074/c53c4131-3d92-42db-85b0-52f1e88c219a)](https://github.com/geminabox)
+
 # Gem in a Box – Really simple rubygem hosting
+
 [![Ruby](https://github.com/geminabox/geminabox/actions/workflows/ruby.yml/badge.svg)](https://github.com/geminabox/geminabox/actions/workflows/ruby.yml?query=branch%3Amaster)
 [![Gem Version](https://badge.fury.io/rb/geminabox.svg)](http://badge.fury.io/rb/geminabox)
 [![Code Climate](https://codeclimate.com/github/geminabox/geminabox/badges/gpa.svg)](https://codeclimate.com/github/geminabox/geminabox)
@@ -12,10 +15,16 @@ For basic auth, try [Rack::Auth](http://www.rubydoc.info/github/rack/rack/Rack/A
 
 ## System Requirements
 
-- Ruby 2.3 through 3.1 (Ruby 2.7, 3.0, or 3.1 is highly recommended)
-- RubyGems 2.4 through 3.3 (2.5.2 or higher is highly recommended)
+- 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:
 
-Use RubyGems the latest version (at least 2.5.2) for as an end-user full features like [`gem yank --host`](https://github.com/rubygems/rubygems/pull/1361).
+      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.
 
 ## Server Setup
 
@@ -179,6 +188,7 @@ Your Gemfile only needs:
 source 'https://rubygems.org'
 
 gem 'geminabox'
+gem 'rubygems-generate_index' # Required for Ruby 3.3+
 ```
 
 From there
@@ -193,6 +203,17 @@ docker run -d -p 9292:9292 geminabox:latest
 
 Your server should now be running!
 
+
+## Running the tests
+
+Running `rake` will run the complete test suite.
+
+The test suite uses
+[minitest-reporters](https://github.com/minitest-reporters/minitest-reporters)
+with the default reporter. To get more detailed test output, use `rake
+MINITEST_REPORTER=SpecReporter`. With this setting, output of the Geminabox
+server that is started for integration tests is sent to `stdout` as well.
+
 ## Licence
 
 [MIT_LICENSE](./MIT-LICENSE)

data/lib/geminabox/gem_list_merge.rb

@@ -15,7 +15,7 @@ module Geminabox
       when :combine_local_and_remote_gem_versions
         CombineLocalAndRemoteGemVersions
       else
-        raise ArgumentError, "Merge strategy must be :local_gems_take_precedence_over_remote_gems (default) or :merge_local_and_remote_gem_versions"
+        raise ArgumentError, "Merge strategy must be :local_gems_take_precedence_over_remote_gems (default) or :combine_local_and_remote_gem_versions"
       end
     end
 

data/lib/geminabox/indexer.rb

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

data/lib/geminabox/server.rb

@@ -164,7 +164,7 @@ module Geminabox
         gems.each do |gem|
           gem_path = File.expand_path(File.join(Geminabox.data, 'gems',
                                                 "#{gem.gemfile_name}.gem"))
-          File.delete gem_path if File.exists? gem_path
+          File.delete gem_path if File.exist? gem_path
         end
         self.class.reindex(:force_rebuild)
         return 200, 'Yanked gem and reindexed'

data/lib/geminabox/version.rb

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

data/lib/geminabox.rb

@@ -5,7 +5,19 @@ require 'digest/md5'
 require 'builder'
 require 'sinatra/base'
 require 'rubygems/user_interaction'
-require 'rubygems/indexer'
+# 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/package'
 require 'tempfile'
 require 'json'
@@ -13,6 +25,11 @@ 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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Tom Lea
@@ -9,10 +9,9 @@ authors:
 - Rob Nichols
 - Naotoshi Seo
 - Takuya Noguchi
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -159,7 +158,6 @@ metadata:
   homepage_uri: https://github.com/geminabox/geminabox
   source_code_uri: https://github.com/geminabox/geminabox
   changelog_uri: https://github.com/geminabox/geminabox/releases
-post_install_message: 
 rdoc_options:
 - "--main"
 - README.md
@@ -174,10 +172,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 requirements: []
-rubygems_version: 3.3.16
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Really simple private RubyGems hosting
 test_files: []