geminabox 2.0.0.rc.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e86bc4fb5fb4e91cbb648c2e67b4732e2a8d7f38e8e334e0747914707fc455f
-  data.tar.gz: b9bd8837e34ca7cb1da39e58ed0b3da2ca5c27e4813f473ce667ce29dac1192b
+  metadata.gz: 3afde9bba2ed91992e99d5e95ff71eb6a111d7a4b4362c1857e75a01dfdb671a
+  data.tar.gz: 360da5ba51676bd8d78ae6139c782b52d9f83f31ca7a5497c06c6d38394fd5b9
 SHA512:
-  metadata.gz: 510acff6266de9eb38f4631597cbdcd9810727d1d8e99f0c12969d019659d156f05d45532e47b6664a502d59f6f9b484ec8ef62812013947cae508e890c8906a
-  data.tar.gz: f33fdbae1f3d0c0bc7fe249920e039b08596f62eef941caff724fef6930948f2be00ef1f6ad409fce2514682deffa5148b191a792cea29e8b1b018f266adccc9
+  metadata.gz: 2a2dc5c9d5109dd36b987066ec29f620e9d646dacd7a39813447b84ab03ffa6edde2bec1c50b341b1d0604d1317f740900c26f5bd72f40ba076893e00aee9b9e
+  data.tar.gz: 44befa817d8a56f87be69c1c3ec06f75caed8c74a85e892207a5f06e43cb629da418db51eec3ac95fb081043c7066b7e64ab13edcfe5a7711a1020843f503d15

data/README.md

@@ -12,7 +12,10 @@ For basic auth, try [Rack::Auth](http://www.rubydoc.info/github/rack/rack/Rack/A
 
 ## System Requirements
 
-See [.github/workflows/ruby.yml](.github/workflows/ruby.yml) for supported ruby versions
+- 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)
+
+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).
 
 ## Server Setup
 

data/lib/geminabox/http_adapter/template_faraday_adapter.rb

@@ -27,7 +27,7 @@ module Geminabox
         faraday.adapter http_engine
         faraday.proxy(ENV['http_proxy']) if ENV['http_proxy']
       end
-      connection.basic_auth username, password if username
+      set_username_and_password connection, username, password if username
       connection
     end
 
@@ -39,7 +39,7 @@ module Geminabox
     end
 
     def http_engine
-      :net_http  # make requests with Net::HTTP
+      :net_http # make requests with Net::HTTP
     end
 
     def options
@@ -49,5 +49,17 @@ module Geminabox
       }
     end
 
+    private
+
+    def set_username_and_password(connection, username, password)
+      # Remove this condition when Faraday 1.x dropped (when Ruby 2.5 dropped)
+      if Gem::Version.new(Faraday::VERSION) < Gem::Version.new("2.0")
+        connection.request :basic_auth, username, password
+      else
+        # Faraday 2.x
+        connection.request :authorization, :basic, username, password
+      end
+    end
+
   end
 end

data/lib/geminabox/incoming_gem.rb

@@ -33,17 +33,7 @@ module Geminabox
     end
 
     def spec
-      @spec ||= extract_spec
-    end
-
-    def extract_spec
-      if Gem::Package.respond_to? :open
-        Gem::Package.open(gem_data, "r", nil) do |pkg|
-          return pkg.metadata
-        end
-      else
-        Gem::Package.new(@tempfile.path).spec
-      end
+      @spec ||= Gem::Package.new(@tempfile.path).spec
     end
 
     def name

data/lib/geminabox/version.rb

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

data/lib/geminabox.rb

@@ -7,7 +7,6 @@ require 'sinatra/base'
 require 'rubygems/user_interaction'
 require 'rubygems/indexer'
 require 'rubygems/package'
-require 'rss/atom'
 require 'tempfile'
 require 'json'
 require 'tilt/erb'

metadata

@@ -1,32 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Tom Lea
 - Jack Foy
 - Rob Nichols
 - Naotoshi Seo
+- Takuya Noguchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -73,16 +74,22 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: reentrant_flock
   requirement: !ruby/object:Gem::Requirement
@@ -97,26 +104,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rss
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: A sinatra based gem hosting app, with client side gem push style functionality.
+description: A private gem hosting and/or caching app, with client side gem push style
+  functionality. Web UI is provided.
 email:
 - contrib@tomlea.co.uk
 - jack@foys.net
 - rob@undervale.co.uk
 - sonots@gmail.com
+- takninnovationresearch@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -157,11 +152,13 @@ files:
 - views/index.erb
 - views/layout.erb
 - views/upload.erb
-homepage: http://tomlea.co.uk/p/gem-in-a-box
+homepage: https://github.com/geminabox/geminabox
 licenses:
 - MIT-LICENSE
 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"
@@ -172,15 +169,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.25
+      version: 2.4.0
 requirements: []
 rubygems_version: 3.3.16
 signing_key: 
 specification_version: 4
-summary: Really simple rubygem hosting
+summary: Really simple private RubyGems hosting
 test_files: []