gemirro 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56fa41eef2a76a964a6d885f5c78ea8e6193c2442ae9dc7b3db6cae10c934ea9
-  data.tar.gz: '08152e167296fd41283619abf268f08279b950ff3d683f500f3cdce5fe49ae5e'
+  metadata.gz: 1129e2117ef615eddf786284610e84808bd3e2ddd2ab21e8fafc972d9b5923e5
+  data.tar.gz: 2c6325d376cf3be31e8f447549697dfb9df6811da7e6aab17654059bf2a1cae6
 SHA512:
-  metadata.gz: 0ab54b560eb64207ce1074ac87c02a71569ecf626069a59ae4aa3bfb8dbc5e504c57712e57e216a9c0d27347fca1c54db3037846fefe90ad1ad70de35423b257
-  data.tar.gz: da5e332d738e42ca80ed7946a2bb598b213ce50d54df704f672d3717d010b07bfa5dc3e07d7b3290cc95557f657635a7de46ab9372c6a981b3b19f233c3f2acf
+  metadata.gz: 9550ed8196a872207d6db5809e97223f190aba44704c2886b469066f57ff7c5f4ab9ab50c11d8a43f010eef88a718fc7a5f736c3aebbf6fc2fd2a702d9c9b5f3
+  data.tar.gz: '0951b6fd87d27b0c830e25c1774e13fe88e322bcd8277facf4950726da931c4b1de2ee6ad0b8ba71742c9567615a57c742bbffcfb2c69a0a0ef81b67cc7bb8d6'

data/Gemfile

@@ -3,3 +3,12 @@
 source 'https://rubygems.org/'
 
 gemspec
+
+group :development, :test do
+  gem 'fakefs', '~> 2'
+  gem 'rack-test', '~> 1.1'
+  gem 'rake', '~> 13'
+  gem 'rspec', '~> 3.10'
+  gem 'rubocop', '~> 1'
+  gem 'simplecov', '~> 0.21'
+end

data/gemirro.gemspec

@@ -24,15 +24,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'erubis', '~>2.7'
   s.add_dependency 'httpclient', '~>2.8'
   s.add_dependency 'parallel', '~>1.21'
-  s.add_dependency 'sinatra', '>=2.1', '<4.0'
-  s.add_dependency 'sinatra-static-assets', '~>1.0'
+  s.add_dependency 'sinatra', '>=3.1', '<4.0'
   s.add_dependency 'slop', '~>3.6'
+  s.add_dependency 'stringio', '~> 3.1'
   s.add_dependency 'thin', '~>1.8'
 
-  s.add_development_dependency 'fakefs', '~>1'
-  s.add_development_dependency 'rack-test', '~>1.1'
-  s.add_development_dependency 'rake', '~>13'
-  s.add_development_dependency 'rspec', '~>3.10'
-  s.add_development_dependency 'rubocop', '~>1'
-  s.add_development_dependency 'simplecov', '~>0.21'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/gemirro/cli/server.rb

@@ -42,9 +42,7 @@ Gemirro::CLI.options.command 'server' do
   $PROGRAM_NAME = 'gemirro'
 
   def create_pid
-    File.open(@pid_file, 'w') do |f|
-      f.write(Process.pid.to_s)
-    end
+    File.write(@pid_file, Process.pid.to_s)
   rescue Errno::EACCES
     $stdout.reopen @orig_stdout
     puts "Error: Can't write to #{@pid_file} - Permission denied"
@@ -76,7 +74,7 @@ Gemirro::CLI.options.command 'server' do
     puts "done! (PID is #{pid})\n"
     Gemirro::Server.run!
     destroy_pid
-    $stdout.reopen '/dev/null', 'a'
+    $stdout.reopen File::NULL, 'a'
   end
 
   def stop

data/lib/gemirro/http.rb

@@ -40,21 +40,21 @@ module Gemirro
 
       if defined?(config.proxy)
         proxy = config.proxy
-        client.proxy=(proxy)
+        client.proxy = (proxy)
       end
 
       # Use my own ca file for self signed cert
       if defined?(config.rootca)
-          abort "The configuration file #{config.rootca} does not exist" unless File.file?(config.rootca)
-          client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_PEER
-          client.ssl_config.set_trust_ca(config.rootca)
+        abort "The configuration file #{config.rootca} does not exist" unless File.file?(config.rootca)
+        client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        client.ssl_config.set_trust_ca(config.rootca)
       elsif defined?(config.verify_mode)
         client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE unless config.verify_mode
       end
 
       # Enforce base auth
-      if defined?(config.basic_auth)
-        client.force_basic_auth=(true) if config.basic_auth
+      if defined?(config.basic_auth) && config.basic_auth
+        client.www_auth.basic_auth.force_auth = (true)
       end
       @client = client
     end

data/lib/gemirro/indexer.rb

@@ -183,7 +183,7 @@ module Gemirro
     def map_gems_to_specs(gems)
       gems.map.with_index do |gemfile, index|
         Utils.logger.info("[#{index + 1}/#{gems.size}]: Processing #{gemfile.split('/')[-1]}")
-        if File.size(gemfile).zero?
+        if File.empty?(gemfile)
           Utils.logger.warn("Skipping zero-length gem: #{gemfile}")
           next
         end

data/lib/gemirro/server.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'sinatra/base'
-require 'sinatra/static_assets'
 require 'thin'
 require 'uri'
 require 'addressable/uri'
@@ -11,8 +10,6 @@ module Gemirro
   # Launch Sinatra server to easily download gems.
   #
   class Server < Sinatra::Base
-    register Sinatra::StaticAssets
-
     # rubocop:disable Layout/LineLength
     URI_REGEXP = /^(.*)-(\d+(?:\.\d+){1,4}.*?)(?:-(x86-(?:(?:mswin|mingw)(?:32|64)).*?|java))?\.(gem(?:spec\.rz)?)$/.freeze
     # rubocop:enable Layout/LineLength
@@ -223,6 +220,8 @@ module Gemirro
         gem_collection.compact!
 
         Parallel.map(gem_collection, in_threads: 4) do |gem, spec|
+          next if spec.nil?
+
           dependencies = spec.dependencies.select do |d|
             d.type == :runtime
           end
@@ -262,7 +261,14 @@ module Gemirro
 
         File.open(spec_file, 'r') do |uz_file|
           uz_file.binmode
-          Marshal.load(::Gem.inflate(uz_file.read))
+          inflater = Zlib::Inflate.new
+          begin
+            inflate_data = inflater.inflate(uz_file.read)
+          ensure
+            inflater.finish
+            inflater.close
+          end
+          Marshal.load(inflate_data)
         end
       end
 

data/lib/gemirro/source.rb

@@ -46,8 +46,8 @@ module Gemirro
     #
     def fetch_prerelease_versions
       Utils.logger.info(
-        "Fetching #{Configuration.prerelease_versions_file}" \
-        " on #{@name} (#{@host})"
+        "Fetching #{Configuration.prerelease_versions_file} " \
+        "on #{@name} (#{@host})"
       )
       Http.get("#{host}/#{Configuration.prerelease_versions_file}").body
     end

data/lib/gemirro/version.rb

@@ -2,5 +2,5 @@
 
 # Gemirro Version
 module Gemirro
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/lib/gemirro.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'builder'
 require 'confstruct'
 require 'digest/sha2'
 require 'fileutils'

data/spec/gemirro/http_spec.rb

@@ -2,34 +2,93 @@ require 'spec_helper'
 require 'httpclient'
 require 'gemirro/http'
 
-# Http tests
 module Gemirro
-  describe 'Http' do
-    it 'should return http client' do
-      expect(Http.client).to be_a(HTTPClient)
+  describe Http do
+    let(:config) { double('Configuration') }
+
+    before do
+      Http.instance_variable_set(:@client, nil)
+      allow(Utils).to receive(:configuration).and_return(config)
     end
 
-    it 'should raise error when get request failed' do
-      uri = 'http://github.com/PierreRambaud'
-      Struct.new('HTTPError', :status, :reason)
-      result = Struct::HTTPError.new(401, 'Unauthorized')
-      allow(Http.client).to receive(:get)
-        .once.with(uri, follow_redirect: true).and_return(result)
-      expect { Http.get(uri) }
-        .to raise_error HTTPClient::BadResponseError, 'Unauthorized'
+    describe '.client' do
+      it 'initializes a new HTTPClient' do
+        expect(Http.client).to be_a(HTTPClient)
+      end
+
+      context 'with proxy configuration' do
+        it 'sets proxy configuration' do
+          allow(config).to receive(:proxy).and_return('http://proxy.example.com:8080')
+
+          expect(Http.client.proxy.to_s).to eq('http://proxy.example.com:8080')
+        end
+      end
+
+      context 'with SSL configuration' do
+        context 'with invalid root CA path' do
+          before do
+            allow(config).to receive(:rootca).and_return('/nonexistent/ca.crt')
+            allow(File).to receive(:file?).with('/nonexistent/ca.crt').and_return(false)
+          end
+
+          it 'aborts with error message' do
+            expect { Http.client }.to raise_error(SystemExit)
+          end
+        end
+
+        context 'with verify_mode disabled' do
+          before do
+            allow(config).to receive(:verify_mode).and_return(false)
+          end
+
+          it 'sets SSL verify mode to VERIFY_NONE' do
+            expect(Http.client.ssl_config.verify_mode).to eq(OpenSSL::SSL::VERIFY_NONE)
+          end
+        end
+      end
+
+      context 'with basic auth forced' do
+        before do
+          allow(config).to receive(:basic_auth).and_return(true)
+        end
+
+        it 'forces basic authentication' do
+          expect(Http.client.www_auth.basic_auth.force_auth).to be true
+        end
+      end
     end
 
-    it 'should execute get request' do
-      uri = 'http://github.com/PierreRambaud'
-      Struct.new('HTTPResponse', :status, :body)
-      result = Struct::HTTPResponse.new(200, 'body content')
-      allow(Http.client).to receive(:get)
-        .once.with(uri, follow_redirect: true).and_return(result)
-
-      response = Http.get(uri)
-      expect(response).to be_a(Struct::HTTPResponse)
-      expect(response.body).to eq('body content')
-      expect(response.status).to eq(200)
+    describe '.get' do
+      let(:client) { instance_double(HTTPClient) }
+
+      before do
+        allow(Http).to receive(:client).and_return(client)
+      end
+
+      context 'with successful response' do
+        let(:response) { double('Response', status: 200, body: 'content') }
+
+        it 'returns response for successful request' do
+          allow(client).to receive(:get)
+            .with('http://example.com', follow_redirect: true)
+            .and_return(response)
+
+          expect(Http.get('http://example.com')).to eq(response)
+        end
+      end
+
+      context 'with error response' do
+        let(:response) { double('Response', status: 404, reason: 'Not Found') }
+
+        it 'raises BadResponseError for failed request' do
+          allow(client).to receive(:get)
+            .with('http://example.com', follow_redirect: true)
+            .and_return(response)
+
+          expect { Http.get('http://example.com') }
+            .to raise_error(HTTPClient::BadResponseError, 'Not Found')
+        end
+      end
     end
   end
-end
+end

data/spec/gemirro/indexer_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'builder'
 require 'rubygems/indexer'
 require 'tempfile'
 require 'gemirro/source'
@@ -34,6 +35,8 @@ module Gemirro
     end
 
     it 'should install indices' do
+      allow(Gemirro.configuration).to receive(:destination).and_return('/tmp')
+
       dir = MirrorDirectory.new('/tmp')
       dir.add_directory('test')
       dir.add_directory('gem_generate_index/quick/Marshal.4.8')

data/views/layout.erb

@@ -9,12 +9,9 @@
 
     <title>Gemirro - a simple ruby gems mirror</title>
 
-    <%=
-      stylesheet_link_tag(
-      "/dist/css/bootstrap.min.css",
-      "/dist/css/gemirro.css",
-      :media => "screen"
-    ) %>
+    <link href="/dist/css/bootstrap.min.css" media="screen" rel="stylesheet" type="text/css" />
+    <link href="/dist/css/gemirro.css" media="screen" rel="stylesheet" type="text/css" />
+
   </head>
   <body>
     <div class="container-fluid">
@@ -29,11 +26,7 @@
         </div>
       </div>
     </div>
-    <%=
-      javascript_script_tag(
-      "/dist/js/jquery-3.2.1.slim.min.js",
-      "/dist/js/bootstrap.bundle.min.js",
-      :media => "screen"
-    ) %>
+    <script src="/dist/js/jquery-3.2.1.slim.min.js" type="text/javascript"></script>
+    <script src="/dist/js/bootstrap.bundle.min.js" type="text/javascript"></script>
   </body>
 </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemirro
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Pierre Rambaud
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -100,7 +100,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -110,38 +110,38 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-static-assets
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: slop
+  name: stringio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -156,90 +156,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
 description: Create your own gems mirror.
 email: pierre.rambaud86@gmail.com
 executables:
@@ -318,7 +234,8 @@ files:
 homepage: https://github.com/PierreRambaud/gemirro
 licenses:
 - GPL-3.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -334,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Gem for easily creating your own gems mirror.