gemirro 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56fa41eef2a76a964a6d885f5c78ea8e6193c2442ae9dc7b3db6cae10c934ea9
-  data.tar.gz: '08152e167296fd41283619abf268f08279b950ff3d683f500f3cdce5fe49ae5e'
+  metadata.gz: 23b3ba616d8007252b6be8b5a3edd675246bb89839e8ae13fd2b01dcf9dff4d4
+  data.tar.gz: a82c036b510ce0da4f1c6475a7b6baac5afbcc065ce911bec8a6e789b84ad9ee
 SHA512:
-  metadata.gz: 0ab54b560eb64207ce1074ac87c02a71569ecf626069a59ae4aa3bfb8dbc5e504c57712e57e216a9c0d27347fca1c54db3037846fefe90ad1ad70de35423b257
-  data.tar.gz: da5e332d738e42ca80ed7946a2bb598b213ce50d54df704f672d3717d010b07bfa5dc3e07d7b3290cc95557f657635a7de46ab9372c6a981b3b19f233c3f2acf
+  metadata.gz: 6f31d4f862a961c03b097b9eff5bff4a5d8b9e02816346a9dcf581c393213b4f8754be127115374895dd3613179a550b4e1e63bb26fdaa13e50ebe1646693998
+  data.tar.gz: fc8957ef3a2231aca1c9c386cc27316b252e46267b360948b8cfe6fd0f1300b6a788edf6fbe3553d2a6889536216bf9921f06ec121f3cebb68a50a7111a636ed

data/.github/workflows/ruby.yml

@@ -0,0 +1,29 @@
+name: "Gemirro tests"
+
+on: [push, pull_request]
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['3.0', '3.1', '3.2']
+    name: Rspec on Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rspec
+
+  rubocop:
+    runs-on: ubuntu-latest
+    name: Run rubocop
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2'
+          bundler-cache: true
+      - run: bundle exec rubocop

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
+  SuggestExtensions: false
   NewCops: enable
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
   Include:
     - '**/Gemfile'
     - lib/**/*.rb
@@ -15,9 +16,9 @@ AllCops:
 Naming/FileName:
   Exclude:
     - Rakefile
-Layout/MethodLength:
+Metrics/MethodLength:
   Enabled: false
-Layout/ClassLength:
+Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
   Enabled: false
@@ -35,3 +36,5 @@ Style/OptionalBooleanParameter:
   Enabled: false
 Lint/MissingSuper:
   Enabled: false
+Style/TrailingUnderscoreVariable:
+  Enabled: false

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/Gemfile.lock

@@ -0,0 +1,126 @@
+PATH
+  remote: .
+  specs:
+    gemirro (1.6.0)
+      addressable (~> 2.8)
+      builder (~> 3.2)
+      compact_index (~> 0.15)
+      confstruct (~> 1.1)
+      erubis (~> 2.7)
+      httpclient (~> 2.8)
+      logger (> 0)
+      mutex_m (> 0)
+      ostruct (> 0)
+      parallel (~> 1.21)
+      rubygems-generate_index (> 0)
+      sinatra (>= 3.1, < 4.0)
+      slop (~> 3.6)
+      stringio (> 0)
+      thin (~> 1.8)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    builder (3.3.0)
+    compact_index (0.15.0)
+    confstruct (1.1.0)
+      hashie (>= 3.3, < 5)
+    daemons (1.4.1)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    erubis (2.7.0)
+    eventmachine (1.2.7)
+    fakefs (2.8.0)
+    hashie (4.1.0)
+    httpclient (2.8.3)
+    json (2.9.1)
+    language_server-protocol (3.17.0.3)
+    logger (1.6.5)
+    mustermann (3.0.3)
+      ruby2_keywords (~> 0.0.1)
+    mutex_m (0.3.0)
+    ostruct (0.6.1)
+    parallel (1.26.3)
+    parser (3.3.7.0)
+      ast (~> 2.4.1)
+      racc
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rack (2.2.10)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.10.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    rubocop (1.70.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    rubygems-generate_index (1.1.3)
+      compact_index (~> 0.15.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
+    sinatra (3.2.0)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.2.0)
+      tilt (~> 2.0)
+    slop (3.6.0)
+    stringio (3.1.2)
+    thin (1.8.2)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    tilt (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakefs (~> 2)
+  gemirro!
+  rack-test (~> 1.1)
+  rake (~> 13)
+  rspec (~> 3.10)
+  rubocop (~> 1)
+  simplecov (~> 0.21)
+
+BUNDLED WITH
+   2.5.16

data/MANIFEST

@@ -1,6 +1,8 @@
+.github/workflows/ruby.yml
 .gitignore
 .rubocop.yml
 Gemfile
+Gemfile.lock
 LICENSE
 MANIFEST
 README.md
@@ -8,7 +10,6 @@ Rakefile
 bin/gemirro
 gemirro.gemspec
 lib/gemirro.rb
-lib/gemirro/cache.rb
 lib/gemirro/cli.rb
 lib/gemirro/cli/index.rb
 lib/gemirro/cli/init.rb
@@ -32,7 +33,6 @@ lib/gemirro/versions_fetcher.rb
 lib/gemirro/versions_file.rb
 spec/fixtures/gems/gemirro-0.0.1.gem
 spec/fixtures/quick/gemirro-0.0.1.gemspec.rz
-spec/gemirro/cache_spec.rb
 spec/gemirro/cli_spec.rb
 spec/gemirro/configuration_spec.rb
 spec/gemirro/gem_spec.rb
@@ -53,16 +53,12 @@ task/rspec.rake
 task/rubocop.rake
 template/config.rb
 template/logs/.gitkeep
-template/public/dist/css/bootstrap.min.css
 template/public/dist/css/gemirro.css
-template/public/dist/fonts/glyphicons-halflings-regular.eot
-template/public/dist/fonts/glyphicons-halflings-regular.svg
-template/public/dist/fonts/glyphicons-halflings-regular.ttf
-template/public/dist/fonts/glyphicons-halflings-regular.woff
-template/public/dist/fonts/glyphicons-halflings-regular.woff2
-template/public/dist/js/bootstrap.min.js
 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
-views/not_found.erb
+views/not_found.erb

data/README.md

@@ -6,7 +6,7 @@ More, to mirroring a source, you only need to start the server, and gems will au
 
 ## Requirements
 
-* Ruby 2.2 or newer
+* Ruby 3.0 or newer
 * Enough space to store Gems
 * A recent version of Rubygems (`gem update --system`)
 

data/bin/gemirro

@@ -4,4 +4,10 @@
 require File.expand_path('../../lib/gemirro', __FILE__)
 
 options = Gemirro::CLI.options
-puts options if options.parse.empty?
+
+begin
+  puts options if options.parse.empty?
+rescue Slop::InvalidOptionError => e
+  puts e.message
+  puts options
+end

data/gemirro.gemspec

@@ -16,23 +16,23 @@ Gem::Specification.new do |s|
 
   s.files = File.read(File.expand_path('../MANIFEST', __FILE__)).split("\n")
 
-  s.required_ruby_version = '>= 2.5'
+  s.required_ruby_version = '>= 3.0'
 
   s.add_dependency 'addressable', '~>2.8'
   s.add_dependency 'builder', '~>3.2'
+  s.add_dependency 'compact_index', '~> 0.15'
   s.add_dependency 'confstruct', '~>1.1'
   s.add_dependency 'erubis', '~>2.7'
   s.add_dependency 'httpclient', '~>2.8'
+  s.add_dependency 'logger', '> 0' # stdlib
+  s.add_dependency 'mutex_m', '> 0' # stdlib
+  s.add_dependency 'ostruct', '> 0' # stdlib
   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 'rubygems-generate_index', '> 0' # stdlib
+  s.add_dependency 'sinatra', '>=3.1', '<4.0'
   s.add_dependency 'slop', '~>3.6'
+  s.add_dependency 'stringio', '> 0' # stdlib
   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/index.rb

@@ -22,8 +22,17 @@ Gemirro::CLI.options.command 'index' do
     indexer    = Gemirro::Indexer.new(config.destination)
     indexer.ui = Gem::SilentUI.new
 
-    config.logger.info('Generating indexes')
-    indexer.generate_index if opts[:u].nil?
-    indexer.update_index unless opts[:u].nil?
+    if File.exist?(File.join(config.destination, "specs.#{Gem.marshal_version}.gz"))
+      if opts[:u]
+        config.logger.info('Generating index updates')
+        indexer.update_index
+      else
+        config.logger.info('Generating indexes')
+        indexer.generate_index
+      end
+    else
+      config.logger.error("/public/specs.#{Gem.marshal_version}.gz file is missing.")
+      config.logger.error('Run "gemirro update" before running index.')
+    end
   end
 end

data/lib/gemirro/cli/init.rb

@@ -20,12 +20,17 @@ Gemirro::CLI.options.command 'init' do
         next if ['.', '..'].include?(File.basename(file))
 
         dest = File.join(directory, file.gsub(/^#{template}/, ''))
-        next if File.exist?(dest)
+        next if File.exist?(dest) && dest !~ /gemirro.css/
 
         FileUtils.cp_r(file, dest)
       end
     end
 
+    # make sure index updates blank local specs
+    ['specs.4.8', 'latest_specs.4.8', 'prerelease_specs.4.8'].each do |s|
+      File.utime(Time.at(0), Time.at(0), File.join(directory, 'public', s))
+    end
+
     puts "Initialized empty mirror in #{directory}"
   end
 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/cli/update.rb

@@ -17,5 +17,11 @@ Gemirro::CLI.options.command 'update' do
     gems     = Gemirro::GemsFetcher.new(source, versions)
 
     gems.fetch
+
+    source.gems.each do |gem|
+      gem.gemspec = true
+    end
+
+    gems.fetch
   end
 end

data/lib/gemirro/configuration.rb

@@ -12,7 +12,7 @@ module Gemirro
         error_log: '/tmp/gemirro.access.log',
         daemonize: true
       },
-
+      update_thread_count: begin; Etc.nprocessors - 1; rescue StandardError; 4; end,
       update_on_fetch: true,
       fetch_gem: true
     }

data/lib/gemirro/gems_fetcher.rb

@@ -31,10 +31,10 @@ module Gemirro
           gem.platform = versions[1] if versions
           version = versions[0] if versions
           if gem.gemspec?
-            gemfile = fetch_gemspec(gem, version)
-            if gemfile
+            gemspec = fetch_gemspec(gem, version)
+            if gemspec
               Utils.configuration.mirror_gemspecs_directory
-                   .add_file(gem.gemspec_filename(version), gemfile)
+                   .add_file(gem.gemspec_filename(version), gemspec)
             end
           else
             gemfile = fetch_gem(gem, version)
@@ -100,15 +100,10 @@ module Gemirro
     #
     def fetch_gem(gem, version)
       filename = gem.filename(version)
-      satisfied = if gem.only_latest?
-                    true
-                  else
-                    gem.requirement.satisfied_by?(version)
-                  end
+      satisfied = gem.only_latest? || gem.requirement.satisfied_by?(version)
       name = gem.name
 
-      if gem_exists?(filename) || ignore_gem?(name, version, gem.platform) ||
-         !satisfied
+      if gem_exists?(filename) || ignore_gem?(name, version, gem.platform) || !satisfied
         Utils.logger.debug("Skipping #{filename}")
         return
       end

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