gemirro 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54b02e5575feb8b7a4fcbb40f5fd91764fb0f589368e4a9207f6a5074fe2f05
-  data.tar.gz: 14449b2b15d5477216adaecea6e36aff26dae8b30104e3db627bdcdbdf7c6b7d
+  metadata.gz: f4433d72ad5aef6af085761295239943b68ca7afbf8decf4a6e4fd1724eae1d3
+  data.tar.gz: 73492105d34fa6b3dbd0da1f0158e9a9c6ac95915e2b714be1c107f375473264
 SHA512:
-  metadata.gz: ba26ee7c502dd1bbfc02fd55e1263097dedad78670281d8f775bd9c5940be1c46032130cd76be02fbdee3b8a4c2f24504f39b38c7e5901497c7eff28d13a0307
-  data.tar.gz: ce425c173bcfc46ea6298cc0911ddec8a838f321749f9ec782da8323afdaf3268f6071d629be5fa6b129fbe29d2198e930b6202225d23f17ac582fac71fc1533
+  metadata.gz: 1c5ab9469369f159fe071f0f9eb8215971018f5880cbbf4236333c30675a460f8b5936f136d2becc15203b07f8065d9f2c6309d3c58f5807e7be7555e7804314
+  data.tar.gz: bff9e9a7c93475fcfa4a8a341bc57823e3267b759c3602905449af813a4d239fc29f9bec3d12976b2e08e1bfb79daa27f5d2fe442c08e09c41547e2ba81d1415

data/.github/workflows/ruby.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['3.0', '3.1', '3.2']
+        ruby: ['3.2', '3.3', '3.4']
     name: Rspec on Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v4

data/.gitignore

@@ -4,4 +4,5 @@
 /.ruby-version
 /*.gem
 /.bundle
+/vendor
 .DS_Store

data/.rubocop.yml

@@ -1,7 +1,7 @@
 AllCops:
   SuggestExtensions: false
   NewCops: enable
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
   Include:
     - '**/Gemfile'
     - lib/**/*.rb
@@ -20,6 +20,8 @@ Metrics/MethodLength:
   Enabled: false
 Metrics/ClassLength:
   Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
 Metrics/CyclomaticComplexity:
   Enabled: false
 Metrics/PerceivedComplexity:

data/Gemfile

@@ -6,9 +6,10 @@ gemspec
 
 group :development, :test do
   gem 'fakefs', '~> 2'
-  gem 'rack-test', '~> 1.1'
+  gem 'rack-test', '~> 2.1'
   gem 'rake', '~> 13'
   gem 'rspec', '~> 3.10'
   gem 'rubocop', '~> 1'
   gem 'simplecov', '~> 0.21'
+  gem 'webmock', '~> 3.24'
 end

data/Gemfile.lock

@@ -1,114 +1,125 @@
 PATH
   remote: .
   specs:
-    gemirro (2.0.0)
+    gemirro (3.0.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)
+      puma (~> 6.4)
+      rackup (~> 2.2)
       rubygems-generate_index (> 0)
-      sinatra (>= 3.1, < 4.0)
-      slop (~> 3.6)
+      sinatra (~> 4.0)
       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)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bigdecimal (4.1.2)
     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)
+    crack (1.0.1)
+      bigdecimal
+      rexml
+    diff-lcs (1.6.2)
     docile (1.4.1)
-    erubis (2.7.0)
-    eventmachine (1.2.7)
     fakefs (2.8.0)
+    hashdiff (1.2.1)
     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)
+    json (2.21.2)
+    language_server-protocol (3.17.0.6)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    mustermann (3.1.1)
     mutex_m (0.3.0)
-    ostruct (0.6.1)
-    parallel (1.26.3)
-    parser (3.3.7.0)
+    nio4r (2.7.5)
+    ostruct (0.6.3)
+    parallel (1.28.0)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
-    public_suffix (6.0.1)
+    prism (1.9.0)
+    public_suffix (7.0.5)
+    puma (6.6.1)
+      nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.14)
-    rack-protection (3.2.0)
+    rack (3.2.7)
+    rack-protection (4.2.1)
       base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.2)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.3.1)
+      rack (>= 3)
     rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.10.0)
-    rspec (3.13.0)
+    rake (13.4.2)
+    regexp_parser (2.12.0)
+    rexml (3.4.4)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.8)
       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)
+    rspec-support (3.13.7)
+    rubocop (1.90.0)
+      json (>= 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.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)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.50.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    rubygems-generate_index (1.1.3)
-      compact_index (~> 0.15.0)
+    rubygems-generate_index (1.2.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    sinatra (3.2.0)
+    sinatra (4.2.1)
+      logger (>= 1.6.0)
       mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.2.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.2.1)
+      rack-session (>= 2.0.0, < 3)
       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)
+    stringio (3.2.0)
+    tilt (2.9.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    webmock (3.26.4)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -116,11 +127,12 @@ PLATFORMS
 DEPENDENCIES
   fakefs (~> 2)
   gemirro!
-  rack-test (~> 1.1)
+  rack-test (~> 2.1)
   rake (~> 13)
   rspec (~> 3.10)
   rubocop (~> 1)
   simplecov (~> 0.21)
+  webmock (~> 3.24)
 
 BUNDLED WITH
    2.5.16

data/bin/gemirro

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

data/gemirro.gemspec

@@ -16,23 +16,21 @@ Gem::Specification.new do |s|
 
   s.files = File.read(File.expand_path('../MANIFEST', __FILE__)).split("\n")
 
-  s.required_ruby_version = '>= 3.0'
+  s.required_ruby_version = '>= 3.2'
 
   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 'puma', '~> 6.4'
+  s.add_dependency 'rackup', '~> 2.2'
   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 'sinatra', '~> 4.0'
   s.add_dependency 'stringio', '> 0' # stdlib
-  s.add_dependency 'thin', '~>1.8'
 
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/gemirro/cli/index.rb

@@ -1,39 +1,59 @@
 # frozen_string_literal: true
 
-Gemirro::CLI.options.command 'index' do
-  banner 'Usage: gemirro index [OPTIONS]'
-  description 'Retrieve specs list from source.'
-  separator "\nOptions:\n"
+module Gemirro
+  module CLI
+    # `gemirro index` command
+    module IndexCommand
+      ##
+      # @param [Array] argv
+      #
+      def self.run(argv)
+        options = {}
+        option_parser(options).parse!(argv)
 
-  on :c=, :config=, 'Path to the configuration file'
-  on :l=, :log_level=, 'Set logger level'
-  on :u, :update, 'Update only'
+        Gemirro::CLI.load_configuration(options[:config])
+        config = Gemirro.configuration
+        config.logger_level = options[:log_level] if options[:log_level]
+        Gemirro::CLI.ensure_destination!(config)
 
-  run do |opts, _args|
-    Gemirro::CLI.load_configuration(opts[:c])
-    config = Gemirro.configuration
-    config.logger_level = opts[:l] if opts[:l]
+        indexer    = Gemirro::Indexer.new
+        indexer.ui = ::Gem::SilentUI.new
 
-    unless File.directory?(config.destination)
-      config.logger.error("The directory #{config.destination} does not exist")
-      abort
-    end
+        if File.exist?(File.join(config.versions_file))
+          indexer.download_source_versions
+          if options[:update]
+            config.logger.info('Generating index updates')
+            indexer.update_index
+          else
+            config.logger.info('Generating indexes')
+            indexer.generate_index
+          end
+        else
+          config.logger.error("#{File.basename(config.versions_file)} file is missing.")
+          config.logger.error('Run "gemirro update" before running index.')
+        end
+      end
 
-    indexer    = Gemirro::Indexer.new
-    indexer.ui = Gem::SilentUI.new
+      ##
+      # @param [Hash] options
+      # @return [OptionParser]
+      #
+      def self.option_parser(options)
+        OptionParser.new do |opts|
+          opts.banner = 'Usage: gemirro index [OPTIONS]'
+          opts.separator ''
+          opts.separator 'Options:'
+          opts.separator ''
 
-    if File.exist?(File.join(config.versions_file))
-      indexer.download_source_versions
-      if opts[:u]
-        config.logger.info('Generating index updates')
-        indexer.update_index
-      else
-        config.logger.info('Generating indexes')
-        indexer.generate_index
+          opts.on('-c', '--config CONFIG', 'Path to the configuration file') { |v| options[:config] = v }
+          opts.on('-l', '--log_level LEVEL', 'Set logger level') { |v| options[:log_level] = v }
+          opts.on('-u', '--update', 'Update only') { options[:update] = true }
+          opts.on('-h', '--help', 'Display this help message.') do
+            puts opts
+            exit
+          end
+        end
       end
-    else
-      config.logger.error("#{File.basename(config.versions_file)} file is missing.")
-      config.logger.error('Run "gemirro update" before running index.')
     end
   end
 end

data/lib/gemirro/cli/init.rb

@@ -1,31 +1,55 @@
 # frozen_string_literal: true
 
-Gemirro::CLI.options.command 'init' do
-  banner 'Usage: gemirro init [DIRECTORY] [OPTIONS]'
-  description 'Sets up a new mirror'
-  separator "\nOptions:\n"
-
-  on :force, 'Force overwrite'
-
-  run do |opts, args|
-    directory = File.expand_path(args[0] || Dir.pwd)
-    template  = Gemirro::Configuration.template_directory
-
-    Dir.mkdir(directory) unless File.directory?(directory)
-
-    if opts[:force]
-      FileUtils.cp_r(File.join(template, '.'), directory)
-    else
-      Dir.glob("#{template}/**/*", File::FNM_DOTMATCH).each do |file|
-        next if ['.', '..'].include?(File.basename(file))
-
-        dest = File.join(directory, file.gsub(/^#{template}/, ''))
-        next if File.exist?(dest) && dest !~ /gemirro.css/
+module Gemirro
+  module CLI
+    # `gemirro init` command
+    module InitCommand
+      ##
+      # @param [Array] argv
+      #
+      def self.run(argv)
+        options = {}
+        option_parser(options).parse!(argv)
+
+        directory = File.expand_path(argv[0] || Dir.pwd)
+        template  = Gemirro::Configuration.template_directory
+
+        Dir.mkdir(directory) unless File.directory?(directory)
+
+        if options[:force]
+          FileUtils.cp_r(File.join(template, '.'), directory)
+        else
+          Dir.glob("#{template}/**/*", File::FNM_DOTMATCH).each do |file|
+            next if ['.', '..'].include?(File.basename(file))
+
+            dest = File.join(directory, file.gsub(/^#{template}/, ''))
+            next if File.exist?(dest) && dest !~ /gemirro.css/
+
+            FileUtils.cp_r(file, dest)
+          end
+        end
+
+        puts "Initialized empty mirror in #{directory}"
+      end
 
-        FileUtils.cp_r(file, dest)
+      ##
+      # @param [Hash] options
+      # @return [OptionParser]
+      #
+      def self.option_parser(options)
+        OptionParser.new do |opts|
+          opts.banner = 'Usage: gemirro init [DIRECTORY] [OPTIONS]'
+          opts.separator ''
+          opts.separator 'Options:'
+          opts.separator ''
+
+          opts.on('--force', 'Force overwrite') { options[:force] = true }
+          opts.on('-h', '--help', 'Display this help message.') do
+            puts opts
+            exit
+          end
+        end
       end
     end
-
-    puts "Initialized empty mirror in #{directory}"
   end
 end

data/lib/gemirro/cli/list.rb

@@ -1,26 +1,46 @@
 # frozen_string_literal: true
 
-Gemirro::CLI.options.command 'list' do
-  banner 'Usage: gemirro list [OPTIONS]'
-  description 'List available gems.'
-  separator "\nOptions:\n"
+module Gemirro
+  module CLI
+    # `gemirro list` command
+    module ListCommand
+      ##
+      # @param [Array] argv
+      #
+      def self.run(argv)
+        options = {}
+        option_parser(options).parse!(argv)
 
-  on :c=, :config=, 'Path to the configuration file'
-  on :l=, :log_level=, 'Set logger level'
+        Gemirro::CLI.load_configuration(options[:config])
+        config = Gemirro.configuration
+        config.logger_level = options[:log_level] if options[:log_level]
+        Gemirro::CLI.ensure_destination!(config)
 
-  run do |opts, _args|
-    Gemirro::CLI.load_configuration(opts[:c])
-    config = Gemirro.configuration
-    config.logger_level = opts[:l] if opts[:l]
+        gems = Gemirro::Utils.gems_collection.group_by(&:name).sort
+        gems.each do |name, versions|
+          puts "#{name}: (#{versions.map(&:number).join(', ')})"
+        end
+      end
 
-    unless File.directory?(config.destination)
-      config.logger.error("The directory #{config.destination} does not exist")
-      abort
-    end
+      ##
+      # @param [Hash] options
+      # @return [OptionParser]
+      #
+      def self.option_parser(options)
+        OptionParser.new do |opts|
+          opts.banner = 'Usage: gemirro list [OPTIONS]'
+          opts.separator ''
+          opts.separator 'Options:'
+          opts.separator ''
 
-    gems = Gemirro::Utils.gems_collection.group_by(&:name).sort
-    gems.each do |name, versions|
-      puts "#{name}: (#{versions.map(&:number).join(', ')})"
+          opts.on('-c', '--config CONFIG', 'Path to the configuration file') { |v| options[:config] = v }
+          opts.on('-l', '--log_level LEVEL', 'Set logger level') { |v| options[:log_level] = v }
+          opts.on('-h', '--help', 'Display this help message.') do
+            puts opts
+            exit
+          end
+        end
+      end
     end
   end
 end