gemirro 1.6.0 → 3.0.0

data/spec/gemirro/server_spec.rb

@@ -1,6 +1,10 @@
+require 'spec_helper'
 require 'rack/test'
 require 'json'
 require 'parallel'
+require 'sinatra/base'
+require 'puma'
+require 'base64'
 require 'gemirro/utils'
 require 'gemirro/mirror_directory'
 require 'gemirro/mirror_file'
@@ -37,7 +41,6 @@ module Gemirro
       Utils.instance_eval('@gems_source_collection = nil')
       FakeFS::FileSystem.clone(Gemirro::Configuration.views_directory)
       allow_any_instance_of(Indexer).to receive(:compress_indices)
-      allow_any_instance_of(Indexer).to receive(:compress_indicies)
       allow_any_instance_of(Indexer).to receive(:rand).and_return('0')
 
       source = Source.new('Rubygems', 'https://rubygems.org')
@@ -51,6 +54,9 @@ module Gemirro
           .and_return(nil)
           .and_yield(@fake_logger)
 
+
+        MirrorFile.new('/var/www/gemirro/versions.md5.aaa256.list').write('created_at: 2025-01-01T00:00:00Z\n---\nvolay 0.1.0\n')
+
         get '/'
         expect(last_response).to be_ok
       end
@@ -68,14 +74,7 @@ module Gemirro
       end
 
       it 'should display gem specifications' do
-        marshal_dump = Marshal.dump([['volay',
-                                      ::Gem::Version.create('0.1.0'),
-                                      'ruby']])
-
-        MirrorFile.new('/var/www/gemirro/specs.4.8.gz.local').write(Marshal.dump({}))
-
-
-        allow(Zlib::GzipReader).to receive(:open).and_return(double(read: marshal_dump))
+        MirrorFile.new('/var/www/gemirro/versions.md5.aaa256.list').write(%(created_at: 2025-01-01T00:00:00Z\n---\nvolay 0.1.0 checksum))
 
         get '/gem/volay'
 
@@ -84,48 +83,41 @@ module Gemirro
       end
       
       it 'responds to compact_index /names' do
-        MirrorFile.new('/var/www/gemirro/names.md5.sha256.list').write('---\n- volay\n')
+        MirrorFile.new('/var/www/gemirro/names.md5.aaa256.list').write(%(---\nvolay))
 
         get '/names'
         expect(last_response.status).to eq(200)
         expect(last_response).to be_ok
-        expect(last_response.body).to  eq('---\n- volay\n')
-        expect(last_response.headers['etag']).to eq("md5")
-        expect(last_response.headers['repr-digest']).to  eq('sha-256="sha256"')
+
+
+        expect(last_response.body).to  eq(%(---\nvolay))
+        expect(last_response.headers['etag']).to eq('"md5"')
+        expect(last_response.headers['repr-digest']).to  eq(%(sha-256=#{Base64.strict_encode64(['aaa256'].pack('H*'))}))
       end
 
       it 'responds to compact_index /info/[gemname]' do
-        marshal_dump = Marshal.dump([['volay',
-                                      ::Gem::Version.create('0.1.0'),
-                                      'ruby']])
-
-        MirrorFile.new('/var/www/gemirro/specs.4.8.gz.local').write(Marshal.dump({}))
-      
-        allow(Zlib::GzipReader).to receive(:open).and_return(double(read: marshal_dump))
-        
-        
         MirrorDirectory.new('/var/www/gemirro/info')
-        MirrorFile.new('/var/www/gemirro/info/volay.md5.sha256.list').write('---\n 0.1.0 |checksum:sha256\n')
+        MirrorFile.new('/var/www/gemirro/info/volay.md5.aaa256.list').write('---\n 0.1.0 |checksum:sha256\n')
         
 
         get '/info/volay'
         expect(last_response.status).to eq(200)
         expect(last_response).to be_ok
         expect(last_response.body).to eq('---\n 0.1.0 |checksum:sha256\n')
-        expect(last_response.headers['etag']).to eq("md5")
-        expect(last_response.headers['repr-digest']).to  eq('sha-256="sha256"')
+        expect(last_response.headers['etag']).to eq('"md5"')
+        expect(last_response.headers['repr-digest']).to  eq(%(sha-256=#{Base64.strict_encode64(['aaa256'].pack('H*'))}))
       end
       
 
       it 'responds to compact_index /versions' do
-        MirrorFile.new('/var/www/gemirro/versions.md5.sha256.list').write('created_at: 2025-01-01T00:00:00Z\m---\nvolay 0.1.0\n')
+        MirrorFile.new('/var/www/gemirro/versions.md5.aaa256.list').write(%(created_at: 2025-01-01T00:00:00Z\n---\nvolay 0.1.0))
       
         get '/versions'
         expect(last_response.status).to eq(200)
         expect(last_response).to be_ok
-        expect(last_response.body).to eq('created_at: 2025-01-01T00:00:00Z\m---\nvolay 0.1.0\n')
-        expect(last_response.headers['etag']).to eq("md5")
-        expect(last_response.headers['repr-digest']).to  eq('sha-256="sha256"')
+        expect(last_response.body).to eq(%(created_at: 2025-01-01T00:00:00Z\n---\nvolay 0.1.0))
+        expect(last_response.headers['etag']).to eq('"md5"')
+        expect(last_response.headers['repr-digest']).to  eq(%(sha-256=#{Base64.strict_encode64(['aaa256'].pack('H*'))}))
       end
       
 
@@ -214,31 +206,20 @@ module Gemirro
     end
 
     context 'dependencies' do
-      it 'should retrieve nothing' do
+      it 'should retrieve nothing and give 404' do
         get '/api/v1/dependencies'
-        expect(last_response.headers['Content-Type'])
-          .to eq('application/octet-stream')
-        expect(last_response.body).to eq('')
-        expect(last_response).to be_ok
+        expect(last_response.status).to eq(404)
+        expect(last_response).to_not be_ok
       end
 
-      it 'should retrieve empty json' do
-        get '/api/v1/dependencies.json'
-        expect(last_response.headers['Content-Type'])
-          .to eq('application/json')
-        expect(last_response.body).to eq('[]')
-        expect(last_response).to be_ok
-      end
 
-      it 'should retrieve empty json when gem was not found' do
+      it 'should retrieve nothing and give 404' do
         get '/api/v1/dependencies.json?gems=gemirro'
-        expect(last_response.headers['Content-Type'])
-          .to eq('application/json')
-        expect(last_response.body).to eq('[]')
-        expect(last_response).to be_ok
+        expect(last_response.status).to eq(404)
+        expect(last_response).to_not be_ok
       end
 
-      it 'should retrieve json when gem was found' do
+      it 'should retrieve nothing and give 404' do
         MirrorDirectory.new('/var/www/gemirro')
                        .add_directory('quick/Marshal.4.8')
         # rubocop:disable Metrics/LineLength
@@ -295,11 +276,8 @@ module Gemirro
         allow(Utils).to receive(:gems_collection)
           .and_return(collection)
         get '/api/v1/dependencies.json?gems=volay'
-        expect(last_response.headers['Content-Type'])
-          .to eq('application/json')
-
-        expect(last_response.body).to match(/"name":"volay"/)
-        expect(last_response).to be_ok
+        expect(last_response.status).to eq(404)
+        expect(last_response).to_not be_ok
       end
     end
   end

data/spec/gemirro/source_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'gemirro/configuration'
 require 'gemirro/http'
 require 'gemirro/utils'
 require 'gemirro/source'
@@ -21,20 +22,11 @@ module Gemirro
       Struct.new('FetchVersions', :body)
       result = Struct::FetchVersions.new(true)
       allow(Http).to receive(:get).once.with(
-        "https://rubygems.org/#{Configuration.versions_file}"
+        "https://rubygems.org/versions"
       ).and_return(result)
       expect(@source.fetch_versions).to be_truthy
     end
 
-    it 'should fetch prereleases versions' do
-      Struct.new('FetchPrereleaseVersions', :body)
-      result = Struct::FetchPrereleaseVersions.new(true)
-      allow(Http).to receive(:get).once.with(
-        "https://rubygems.org/#{Configuration.prerelease_versions_file}"
-      ).and_return(result)
-      expect(@source.fetch_prerelease_versions).to be_truthy
-    end
-
     it 'should fetch gem' do
       Struct.new('FetchGem', :body)
       result = Struct::FetchGem.new(true)

data/spec/gemirro/versions_fetcher_spec.rb

@@ -17,10 +17,9 @@ module Gemirro
 
     it 'should fetch versions' do
       allow(@source).to receive(:fetch_versions).once.and_return([])
-      allow(@source).to receive(:fetch_prerelease_versions).once.and_return([])
-      allow(VersionsFile).to receive(:load).with('nothing', 'nothing')
-      allow(File).to receive(:write).twice
-      allow(File).to receive(:read).twice.and_return('nothing')
+      allow(VersionsFile).to receive(:load).with('nothing')
+      allow(File).to receive(:write).once
+      allow(File).to receive(:read).once.and_return('nothing')
       expect(@fetcher.fetch).to be_nil
     end
   end

data/spec/gemirro/versions_file_spec.rb

@@ -7,44 +7,20 @@ module Gemirro
   describe 'VersionsFile' do
     include FakeFS::SpecHelpers
 
-    it 'should be initialized' do
-      @versions_file = VersionsFile.new([['gemirro', '0.0.1'],
-                                         ['gemirro', '0.0.2']])
-      expect(@versions_file.versions).to eq([['gemirro', '0.0.1'],
-                                             ['gemirro', '0.0.2']])
-      expect(@versions_file.versions_hash).to eq(
-        'gemirro' => [
-          ['gemirro', '0.0.1'],
-          ['gemirro', '0.0.2']
-        ]
-      )
-    end
-
     it 'should load versions file' do
-      spec = StringIO.new('w')
-      w_gz = Zlib::GzipWriter.new(spec)
-      w_gz.write(Marshal.dump([['gemirro', '0.0.1'],
-                               ['gemirro', '0.0.2']]))
-      w_gz.close
-      prerelease = StringIO.new('w')
-      w_gz = Zlib::GzipWriter.new(prerelease)
-      w_gz.write(Marshal.dump([['gemirro', '0.0.1.alpha1'],
-                               ['gemirro', '0.0.2.alpha2']]))
-      w_gz.close
+      spec = %(created_at: 2025-01-01T00:00:00Z\n---\ngemirro 0.0.1.alpha1,0.0.1,0.0.2.alpha2,0.0.2 checksum)
 
-      result = VersionsFile.load(spec.string, prerelease.string)
+      result = VersionsFile.new(spec)
       expect(result).to be_a(VersionsFile)
 
-      expect(result.versions).to eq([['gemirro', '0.0.1'],
-                                     ['gemirro', '0.0.2'],
-                                     ['gemirro', '0.0.1.alpha1'],
-                                     ['gemirro', '0.0.2.alpha2']])
+      expect(result.versions_string).to eq(%(created_at: 2025-01-01T00:00:00Z\n---\ngemirro 0.0.1.alpha1,0.0.1,0.0.2.alpha2,0.0.2 checksum))
+
       expect(result.versions_hash).to eq(
         'gemirro' => [
-          ['gemirro', '0.0.1'],
-          ['gemirro', '0.0.2'],
-          ['gemirro', '0.0.1.alpha1'],
-          ['gemirro', '0.0.2.alpha2']
+          ['gemirro', ::Gem::Version.new('0.0.1.alpha1'), 'ruby'],
+          ['gemirro', ::Gem::Version.new('0.0.1'), 'ruby'],
+          ['gemirro', ::Gem::Version.new('0.0.2.alpha2'), 'ruby'],
+          ['gemirro', ::Gem::Version.new('0.0.2'), 'ruby']
         ]
       )
     end

data/template/config.rb

@@ -60,6 +60,6 @@ Gemirro.configuration.configure do
   # All gem in the block will be downloaded with the update command.
   # Other gems will be downloaded with the server.
   define_source 'rubygems', 'https://rubygems.org' do
-    gem 'rack', '>= 1.0.0'
+    gem 'rack', '>= 3.0.0'
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gemirro
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Pierre Rambaud
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -66,34 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -151,81 +122,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.21'
 - !ruby/object:Gem::Dependency
-  name: rubygems-generate_index
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.4'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rackup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: slop
+  name: rubygems-generate_index
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: stringio
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: stringio
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 description: Create your own gems mirror.
 email: pierre.rambaud86@gmail.com
 executables:
@@ -290,9 +255,6 @@ files:
 - template/logs/.gitkeep
 - template/public/dist/css/gemirro.css
 - template/public/gems/.gitkeep
-- template/public/latest_specs.4.8
-- template/public/prerelease_specs.4.8
-- template/public/specs.4.8
 - views/gem.erb
 - views/index.erb
 - views/layout.erb
@@ -302,7 +264,6 @@ licenses:
 - GPL-3.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -310,15 +271,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Gem for easily creating your own gems mirror.
 test_files: []