gemirro 0.16.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 53a589bb6c9b40c33e0a84892f1234ac29325925
-  data.tar.gz: d5e693ae10f39df546d7775a3b75165f62f9717f
+SHA256:
+  metadata.gz: f5ce407f251612fd3198509818414c754d97508355e1fc1a723a08448bfb369f
+  data.tar.gz: 669d4d88aa1db6241b7e8861934d12893accde19fad6454d829a9e143569622b
 SHA512:
-  metadata.gz: aba9f0f69f137771f76210819f3116da4911c8012b8f1415c21f9598a59b3586e122d00b5e7b5337bc35940a13055db0a5596c09170f7f7d71a226f15e4d391c
-  data.tar.gz: d3606123b938190a0dcdbd094ebb39c76f65921c20f522ea53db3409117b32698ba4225cd7f7d568736a6ca6638138715a0a8cfb3c01b2306480cbfd6e3653b0
+  metadata.gz: 3c49aa30264c21ca2fb840f5c4b2b6dd6058c5b587e94ff5ae4e94488a00d86f25e0a56de742c9ab8078a6350bb5f15d38119b69decfdd5088e0c8b0ff4dafa6
+  data.tar.gz: 96e25a3b96ca072f6823b8583626b9dd502048e444423af8d50ffcc9040a139daa5aa36314ce914edef2123c335015a6f8f1f758b18a62339fcfe60d3c006afa

data/.rubocop.yml

@@ -1,4 +1,6 @@
 AllCops:
+  NewCops: enable
+  TargetRubyVersion: 2.5
   Include:
     - '**/Gemfile'
     - lib/**/*.rb
@@ -7,16 +9,15 @@ AllCops:
   Exclude:
     - files/**/*
     - templates/**/*
+    - spec/**/*
+    - vendor/**/*
+
 Naming/FileName:
   Exclude:
     - Rakefile
-ModuleLength:
+Layout/MethodLength:
   Enabled: false
-MethodLength:
-  Enabled: false
-ClassLength:
-  Enabled: false
-ParameterLists:
+Layout/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
   Enabled: false
@@ -28,3 +29,9 @@ Metrics/BlockLength:
   Enabled: false
 Security/MarshalLoad:
   Enabled: false
+Style/ExpandPathArguments:
+  Enabled: false
+Style/OptionalBooleanParameter:
+  Enabled: false
+Lint/MissingSuper:
+  Enabled: false

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 rvm:
-  - 2.2
-  - 2.3
-  - 2.4
+  - 2.6
 
 install: bundle install --jobs=3 --retry=3
 script: bundle exec rake

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org/'
 
 gemspec

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.0.0 or newer
+* Ruby 2.2 or newer
 * Enough space to store Gems
 * A recent version of Rubygems (`gem update --system`)
 

data/bin/gemirro

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require File.expand_path('../../lib/gemirro', __FILE__)
 

data/gemirro.gemspec

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'date'
 require File.expand_path('../lib/gemirro/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'gemirro'
   s.version     = Gemirro::VERSION
-  s.date        = Date.today.to_s
   s.authors     = ['Pierre Rambaud']
   s.email       = 'pierre.rambaud86@gmail.com'
   s.license     = 'GPL-3.0'
@@ -15,21 +16,22 @@ Gem::Specification.new do |s|
 
   s.files = File.read(File.expand_path('../MANIFEST', __FILE__)).split("\n")
 
-  s.required_ruby_version = '>= 1.9.2'
+  s.required_ruby_version = '>= 2.5'
 
+  s.add_dependency 'addressable', '~>2.5'
   s.add_dependency 'builder', '~>3.2'
   s.add_dependency 'confstruct', '~>1.0'
   s.add_dependency 'erubis', '~>2.7'
   s.add_dependency 'httpclient', '~>2.8'
-  s.add_dependency 'parallel', '~>1.12'
-  s.add_dependency 'sinatra', '~>2.0'
+  s.add_dependency 'parallel', '~>1.20'
+  s.add_dependency 'sinatra', '~>2.0.1'
   s.add_dependency 'slop', '~>3.6'
   s.add_dependency 'thin', '~>1.7'
 
-  s.add_development_dependency 'fakefs', '~>0.11'
-  s.add_development_dependency 'rack-test', '~>0.7'
-  s.add_development_dependency 'rake', '~>12.1'
-  s.add_development_dependency 'rspec', '~>3.7'
-  s.add_development_dependency 'rubocop', '~>0.51'
-  s.add_development_dependency 'simplecov', '~>0.15'
+  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'
 end

data/lib/gemirro.rb

@@ -1,21 +1,21 @@
-require 'rubygems'
-require 'rubygems/user_interaction'
-require 'rubygems/indexer'
-require 'slop'
-require 'fileutils'
-require 'digest/sha2'
+# frozen_string_literal: true
+
 require 'confstruct'
-require 'zlib'
+require 'digest/sha2'
+require 'fileutils'
 require 'httpclient'
-require 'logger'
-require 'stringio'
 require 'json'
+require 'logger'
 require 'parallel'
+require 'rubygems'
+require 'rubygems/indexer'
+require 'rubygems/user_interaction'
+require 'slop'
+require 'stringio'
 require 'tempfile'
+require 'zlib'
 
-unless $LOAD_PATH.include?(File.expand_path('../', __FILE__))
-  $LOAD_PATH.unshift(File.expand_path('../', __FILE__))
-end
+$LOAD_PATH.unshift(File.expand_path('../', __FILE__)) unless $LOAD_PATH.include?(File.expand_path('../', __FILE__))
 
 require 'gemirro/version'
 require 'gemirro/configuration'

data/lib/gemirro/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The Cache class contains all method to store marshal informations
@@ -102,6 +104,7 @@ module Gemirro
     #
     def write(key_hash, value)
       return value if value.nil? || value.empty?
+
       File.open(key_path(key_hash), 'wb') do |f|
         Marshal.dump(value, f)
       end

data/lib/gemirro/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   # CLI mode
   module CLI
@@ -32,9 +34,7 @@ module Gemirro
       config_file += '/config.rb' unless config_file.end_with?('.rb') ||
                                          !File.directory?(config_file)
 
-      unless File.file?(config_file)
-        abort "The configuration file #{config_file} does not exist"
-      end
+      abort "The configuration file #{config_file} does not exist" unless File.file?(config_file)
 
       require(config_file)
     end

data/lib/gemirro/cli/index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gemirro::CLI.options.command 'index' do
   banner 'Usage: gemirro index [OPTIONS]'
   description 'Retrieve specs list from source.'

data/lib/gemirro/cli/init.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gemirro::CLI.options.command 'init' do
   banner 'Usage: gemirro init [DIRECTORY] [OPTIONS]'
   description 'Sets up a new mirror'
@@ -16,8 +18,10 @@ Gemirro::CLI.options.command 'init' do
     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)
+
         FileUtils.cp_r(file, dest)
       end
     end

data/lib/gemirro/cli/list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gemirro::CLI.options.command 'list' do
   banner 'Usage: gemirro list [OPTIONS]'
   description 'List available gems.'

data/lib/gemirro/cli/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gemirro::CLI.options.command 'server' do
   banner 'Usage: gemirro server [OPTIONS]'
   description 'Manage web server'
@@ -36,7 +38,7 @@ Gemirro::CLI.options.command 'server' do
   end
 
   # Copy stdout because we'll need to reopen it later on
-  @orig_stdout = STDOUT.clone
+  @orig_stdout = $stdout.clone
   $PROGRAM_NAME = 'gemirro'
 
   def create_pid
@@ -44,7 +46,7 @@ Gemirro::CLI.options.command 'server' do
       f.write(Process.pid.to_s)
     end
   rescue Errno::EACCES
-    STDOUT.reopen @orig_stdout
+    $stdout.reopen @orig_stdout
     puts "Error: Can't write to #{@pid_file} - Permission denied"
     exit!
   end
@@ -63,20 +65,18 @@ Gemirro::CLI.options.command 'server' do
 
   def start
     puts 'Starting...'
-    if File.exist?(@pid_file)
-      if running?(pid)
-        puts "Error: #{$PROGRAM_NAME} already running"
-        abort
-      end
+    if File.exist?(@pid_file) && running?(pid)
+      puts "Error: #{$PROGRAM_NAME} already running"
+      abort
     end
 
-    Process.daemon
+    Process.daemon if Gemirro::Utils.configuration.server.daemonize
     create_pid
-    STDOUT.reopen @orig_stdout
+    $stdout.reopen @orig_stdout
     puts "done! (PID is #{pid})\n"
     Gemirro::Server.run!
     destroy_pid
-    STDOUT.reopen '/dev/null', 'a'
+    $stdout.reopen '/dev/null', 'a'
   end
 
   def stop
@@ -113,6 +113,7 @@ Gemirro::CLI.options.command 'server' do
 
   def running?(process_id)
     return false if process_id.nil?
+
     Process.getpgid(process_id.to_i) != -1
   rescue Errno::ESRCH
     false

data/lib/gemirro/cli/update.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gemirro::CLI.options.command 'update' do
   banner 'Usage: gemirro update [OPTIONS]'
   description 'Updates the list of Gems'

data/lib/gemirro/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Configuration
 module Gemirro
   ##
@@ -7,7 +9,8 @@ module Gemirro
     default_config = {
       server: {
         access_log: '/tmp/gemirro.access.log',
-        error_log: '/tmp/gemirro.access.log'
+        error_log: '/tmp/gemirro.access.log',
+        daemonize: true
       },
 
       update_on_fetch: true,
@@ -39,7 +42,7 @@ module Gemirro
     # @return [Logger]
     #
     def logger
-      @logger ||= Logger.new(STDOUT)
+      @logger ||= Logger.new($stdout)
     end
 
     ##
@@ -161,7 +164,7 @@ module Gemirro
     # @return [Hash]
     #
     def ignored_gems
-      @ignored_gems ||= Hash.new { |hash, key| hash[key] = [] }
+      @ignored_gems ||= Hash.new { |hash, key| hash[key] = {} }
     end
 
     ##
@@ -170,9 +173,10 @@ module Gemirro
     # @param [String] name
     # @param [String] version
     #
-    def ignore_gem(name, version)
-      ignored_gems[name] ||= []
-      ignored_gems[name] << version
+    def ignore_gem(name, version, platform)
+      ignored_gems[platform] ||= {}
+      ignored_gems[platform][name] ||= []
+      ignored_gems[platform][name] << version
     end
 
     ##
@@ -182,8 +186,12 @@ module Gemirro
     # @param [String] version
     # @return [TrueClass|FalseClass]
     #
-    def ignore_gem?(name, version)
-      ignored_gems[name].include?(version)
+    def ignore_gem?(name, version, platform)
+      if ignored_gems[platform][name]
+        ignored_gems[platform][name].include?(version)
+      else
+        false
+      end
     end
 
     ##

data/lib/gemirro/gem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The Gem class contains data about a Gem such as the name, requirement as
@@ -12,8 +14,9 @@ module Gemirro
   #  @return [Gem::Version]
   #
   class Gem
-    attr_reader :name, :requirement, :platform
-    attr_accessor :gemspec
+    attr_reader :name, :requirement
+    attr_accessor :gemspec, :platform
+
     ONLY_LATEST = %i[latest newest].freeze
 
     ##
@@ -23,7 +26,7 @@ module Gemirro
     # @return [Gem::Version]
     #
     def self.version_for(requirement)
-      ::Gem::Version.new(requirement.requirements.sort.last.last.version)
+      ::Gem::Version.new(requirement.requirements.max.last.version)
     end
 
     ##
@@ -33,9 +36,7 @@ module Gemirro
     def initialize(name, requirement = nil, platform = 'ruby')
       requirement ||= ::Gem::Requirement.default
 
-      if requirement.is_a?(String)
-        requirement = ::Gem::Requirement.new(requirement)
-      end
+      requirement = ::Gem::Requirement.new(requirement) if requirement.is_a?(String)
 
       @name = name
       @requirement = requirement

data/lib/gemirro/gem_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The Gem class contains data about a Gem such as the name, requirement as

data/lib/gemirro/gem_version_collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The VersionCollection class contains a collection of ::Gem::Version
@@ -10,8 +12,7 @@ module Gemirro
   class GemVersionCollection
     include Enumerable
 
-    attr_reader :gems
-    attr_reader :grouped
+    attr_reader :gems, :grouped
 
     ##
     # @param [Array] gems

data/lib/gemirro/gems_fetcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The GemsFetcher class is responsible for downloading Gems from an external
@@ -25,7 +27,9 @@ module Gemirro
     #
     def fetch
       @source.gems.each do |gem|
-        versions_for(gem).each do |version|
+        versions_for(gem).each do |versions|
+          gem.platform = versions[1] if versions
+          version = versions[0] if versions
           if gem.gemspec?
             gemfile = fetch_gemspec(gem, version)
             if gemfile
@@ -55,7 +59,7 @@ module Gemirro
       return [available.last] if gem.only_latest?
 
       versions = available.select do |v|
-        gem.requirement.satisfied_by?(v)
+        gem.requirement.satisfied_by?(v[0])
       end
 
       versions = [available.last] if versions.empty?
@@ -103,12 +107,13 @@ module Gemirro
                   end
       name = gem.name
 
-      if gem_exists?(filename) || ignore_gem?(name, version) || !satisfied
+      if gem_exists?(filename) || ignore_gem?(name, version, gem.platform) ||
+         !satisfied
         Utils.logger.debug("Skipping #{filename}")
         return
       end
 
-      Utils.configuration.ignore_gem(gem.name, version)
+      Utils.configuration.ignore_gem(gem.name, version, gem.platform)
       Utils.logger.info("Fetching #{filename}")
 
       fetch_from_source(filename, gem, version)
@@ -131,7 +136,7 @@ module Gemirro
         Utils.logger.error("Failed to retrieve #{filename}: #{e.message}")
         Utils.logger.debug("Adding #{filename} to the list of ignored Gems")
 
-        Utils.configuration.ignore_gem(gem.name, version)
+        Utils.configuration.ignore_gem(gem.name, version, gem.platform)
       end
 
       data

data/lib/gemirro/http.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The Http class is responsible for executing GET request
@@ -18,9 +20,7 @@ module Gemirro
     def self.get(url)
       response = client.get(url, follow_redirect: true)
 
-      unless HTTP::Status.successful?(response.status)
-        raise HTTPClient::BadResponseError, response.reason
-      end
+      raise HTTPClient::BadResponseError, response.reason unless HTTP::Status.successful?(response.status)
 
       response
     end

data/lib/gemirro/indexer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The Indexer class is responsible for downloading useful file directly
@@ -118,6 +120,7 @@ module Gemirro
         else
           source_content = download_from_source(file)
           next if source_content.nil?
+
           MirrorFile.new(dst_name).write(source_content)
         end
 
@@ -136,6 +139,7 @@ module Gemirro
       Utils.logger.info("Download from source: #{file}")
       resp = Http.get("#{source_host}/#{File.basename(file)}")
       return unless resp.code == 200
+
       resp.body
     end
 
@@ -155,7 +159,7 @@ module Gemirro
     #
     def build_indicies
       specs = *map_gems_to_specs(gem_file_list)
-      specs.select! { |s| s.class == ::Gem::Specification }
+      specs.select! { |s| s.instance_of?(::Gem::Specification) }
       ::Gem::Specification.dirs = []
       ::Gem::Specification.all = specs
 
@@ -178,22 +182,23 @@ module Gemirro
     #
     def map_gems_to_specs(gems)
       gems.map.with_index do |gemfile, index|
-        # rubocop:disable Metrics/LineLength
         Utils.logger.info("[#{index + 1}/#{gems.size}]: Processing #{gemfile.split('/')[-1]}")
-        # rubocop:enable Metrics/LineLength
-
         if File.size(gemfile).zero?
           Utils.logger.warn("Skipping zero-length gem: #{gemfile}")
           next
         end
 
         begin
-          spec = if ::Gem::Package.respond_to? :open
-                   ::Gem::Package
-                     .open(File.open(gemfile, 'rb'), 'r', &:metadata)
-                 else
-                   ::Gem::Package.new(gemfile).spec
-                 end
+          begin
+            spec = if ::Gem::Package.respond_to? :open
+                     ::Gem::Package
+                       .open(File.open(gemfile, 'rb'), 'r', &:metadata)
+                   else
+                     ::Gem::Package.new(gemfile).spec
+                   end
+          rescue NotImplementedError
+            next
+          end
 
           spec.loaded_from = gemfile
 
@@ -325,6 +330,7 @@ module Gemirro
       end
 
       return false if source_content.nil?
+
       new_content = source_content.concat(content).uniq
       create_zlib_file(dst_name, new_content)
     end

data/lib/gemirro/mirror_directory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The MirrorDirectory is used for dealing with files and directories that are

data/lib/gemirro/mirror_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # Similar to {Gemirro::MirrorDirectory} the MirrorFile class is used to

data/lib/gemirro/server.rb

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
+
 require 'sinatra/base'
 require 'thin'
 require 'uri'
+require 'addressable/uri'
 
 module Gemirro
   ##
   # Launch Sinatra server to easily download gems.
   #
   class Server < Sinatra::Base
-    # rubocop:disable Metrics/LineLength
-    URI_REGEXP = /^(.*)-(\d+(?:\.\d+){1,4}.*?)(?:-(x86-(?:(?:mswin|mingw)(?:32|64)).*?|java))?\.(gem(?:spec\.rz)?)$/
-    GEMSPEC_TYPE = 'gemspec.rz'.freeze
-    GEM_TYPE = 'gem'.freeze
+    # rubocop:disable Layout/LineLength
+    URI_REGEXP = /^(.*)-(\d+(?:\.\d+){1,4}.*?)(?:-(x86-(?:(?:mswin|mingw)(?:32|64)).*?|java))?\.(gem(?:spec\.rz)?)$/.freeze
+    # rubocop:enable Layout/LineLength
+    GEMSPEC_TYPE = 'gemspec.rz'
+    GEM_TYPE = 'gem'
 
     access_logger = Logger.new(Utils.configuration.server.access_log).tap do |logger|
-      ::Logger.class_eval { alias_method :write, :'<<' }
+      ::Logger.class_eval { alias_method :write, :<< }
       logger.level = ::Logger::INFO
     end
-    # rubocop:enable Metrics/LineLength
 
     error_logger = File.new(Utils.configuration.server.error_log, 'a+')
     error_logger.sync = true
@@ -127,6 +130,7 @@ module Gemirro
     #
     def fetch_gem(resource)
       return unless Utils.configuration.fetch_gem
+
       name = File.basename(resource)
       result = name.match(URI_REGEXP)
       return unless result
@@ -138,10 +142,8 @@ module Gemirro
         gem = Utils.stored_gem(gem_name, gem_version, gem_platform)
         gem.gemspec = true if gem_type == GEMSPEC_TYPE
 
-        # rubocop:disable Metrics/LineLength
         return if Utils.gems_fetcher.gem_exists?(gem.filename(gem_version)) && gem_type == GEM_TYPE
         return if Utils.gems_fetcher.gemspec_exists?(gem.gemspec_filename(gem_version)) && gem_type == GEMSPEC_TYPE
-        # rubocop:enable Metrics/LineLength
 
         Utils.logger
              .info("Try to download #{gem_name} with version #{gem_version}")
@@ -167,7 +169,7 @@ module Gemirro
 
       Utils.logger.info('Generating indexes')
       indexer.update_index
-      indexer.updated_gems.peach do |gem|
+      indexer.updated_gems.each do |gem|
         Utils.cache.flush_key(File.basename(gem))
       end
     rescue SystemExit => e
@@ -215,9 +217,7 @@ module Gemirro
         gem_collection = Parallel.map(gem_collection, in_threads: 4) do |gem|
           [gem, spec_for(gem.name, gem.number, gem.platform)]
         end
-        gem_collection.reject! do |_, spec|
-          spec.nil?
-        end
+        gem_collection.compact!
 
         Parallel.map(gem_collection, in_threads: 4) do |gem, spec|
           dependencies = spec.dependencies.select do |d|
@@ -280,7 +280,7 @@ module Gemirro
       # @return [String]
       #
       def homepage(spec)
-        URI.parse(URI.escape(spec.homepage))
+        URI.parse(Addressable::URI.escape(spec.homepage))
       end
     end
   end

data/lib/gemirro/source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The Source class is used for storing information about an external source
@@ -34,7 +36,7 @@ module Gemirro
         "Fetching #{Configuration.versions_file} on #{@name} (#{@host})"
       )
 
-      Http.get(host + '/' + Configuration.versions_file).body
+      Http.get("#{host}/#{Configuration.versions_file}").body
     end
 
     ##
@@ -47,7 +49,7 @@ module Gemirro
         "Fetching #{Configuration.prerelease_versions_file}" \
         " on #{@name} (#{@host})"
       )
-      Http.get(host + '/' + Configuration.prerelease_versions_file).body
+      Http.get("#{host}/#{Configuration.prerelease_versions_file}").body
     end
 
     ##

data/lib/gemirro/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The Utils class is responsible for executing specific traitments
@@ -16,6 +18,7 @@ module Gemirro
                 :gems_fetcher,
                 :gems_collection,
                 :stored_gems)
+
     ##
     # Cache class to store marshal and data into files
     #
@@ -44,6 +47,7 @@ module Gemirro
       Parallel.map(file_paths, in_threads: 4) do |file_path|
         next if data[:files].key?(file_path) &&
                 data[:files][file_path] == File.mtime(file_path)
+
         has_file_changed = true
       end
 
@@ -53,6 +57,7 @@ module Gemirro
       gems = []
       Parallel.map(file_paths, in_threads: 4) do |file_path|
         next unless File.exist?(file_path)
+
         gems.concat(Marshal.load(Zlib::GzipReader.open(file_path).read))
         data[:files][file_path] = File.mtime(file_path)
       end
@@ -75,7 +80,7 @@ module Gemirro
         File.join(configuration.destination,
                   [specs_file_type,
                    marshal_version,
-                   'gz' + (orig ? '.orig' : '')].join('.'))
+                   "gz#{orig ? '.orig' : ''}"].join('.'))
       end
     end
 

data/lib/gemirro/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # Gemirro Version
 module Gemirro
-  VERSION = '0.16.0'.freeze
+  VERSION = '1.3.0'
 end

data/lib/gemirro/versions_fetcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The VersionsFetcher class is used for retrieving the file that contains all

data/lib/gemirro/versions_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemirro
   ##
   # The VersionsFile class acts as a small Ruby wrapper around the RubyGems
@@ -65,7 +67,7 @@ module Gemirro
     # @return [Array]
     #
     def versions_for(gem)
-      versions_hash[gem].map { |version| version[1] }
+      versions_hash[gem].map { |version| [version[1], version[2]] }
     end
   end
 end

data/spec/gemirro/configuration_spec.rb

@@ -68,10 +68,11 @@ module Gemirro
 
     it 'should return ignored gems' do
       expect(@config.ignored_gems).to eq({})
-      expect(@config.ignore_gem?('rake', '1.0.0')).to be_falsy
-      expect(@config.ignore_gem('rake', '1.0.0')).to eq(['1.0.0'])
-      expect(@config.ignored_gems).to eq('rake' => ['1.0.0'])
-      expect(@config.ignore_gem?('rake', '1.0.0')).to be_truthy
+      expect(@config.ignore_gem?('rake', '1.0.0', 'ruby')).to be_falsy
+      expect(@config.ignore_gem('rake', '1.0.0', 'ruby')).to eq(['1.0.0'])
+      expect(@config.ignored_gems).to eq('ruby' => {'rake' => ['1.0.0']})
+      expect(@config.ignore_gem?('rake', '1.0.0', 'ruby')).to be_truthy
+      expect(@config.ignore_gem?('rake', '1.0.0', 'java')).to be_falsy
     end
 
     it 'should add and return source' do

data/spec/gemirro/gems_fetcher_spec.rb

@@ -34,9 +34,10 @@ module Gemirro
     it 'should ignore gem' do
       allow(Utils.logger).to receive(:info)
         .once.with('Fetching gemirro-0.0.1.gem')
-      expect(@fetcher.ignore_gem?('gemirro', '0.0.1')).to be_falsy
-      Utils.configuration.ignore_gem('gemirro', '0.0.1')
-      expect(@fetcher.ignore_gem?('gemirro', '0.0.1')).to be_truthy
+      expect(@fetcher.ignore_gem?('gemirro', '0.0.1', 'ruby')).to be_falsy
+      Utils.configuration.ignore_gem('gemirro', '0.0.1', 'ruby')
+      expect(@fetcher.ignore_gem?('gemirro', '0.0.1', 'ruby')).to be_truthy
+      expect(@fetcher.ignore_gem?('gemirro', '0.0.1', 'java')).to be_falsy
     end
 
     it 'should log error when fetch gem failed' do
@@ -44,7 +45,7 @@ module Gemirro
         .once.with('Fetching gemirro-0.0.1.gem')
       gem = Gem.new('gemirro')
       version = ::Gem::Version.new('0.0.1')
-      Utils.configuration.ignore_gem('gemirro', '0.0.1')
+      Utils.configuration.ignore_gem('gemirro', '0.0.1', 'ruby')
       allow(@source).to receive(:fetch_gem)
         .once.with('gemirro', version).and_raise(ArgumentError)
       allow(Utils.logger).to receive(:error)
@@ -53,7 +54,7 @@ module Gemirro
         .once.with(/Adding (.*) to the list of ignored Gems/)
 
       expect(@fetcher.fetch_gem(gem, version)).to be_nil
-      expect(@fetcher.ignore_gem?('gemirro', '0.0.1')).to be_truthy
+      expect(@fetcher.ignore_gem?('gemirro', '0.0.1', 'ruby')).to be_truthy
     end
 
     it 'should fetch gem' do
@@ -125,9 +126,10 @@ module Gemirro
     it 'should retrieve versions for specific gem' do
       gem = Gem.new('gemirro', '0.0.2')
       allow(@versions_file).to receive(:versions_for)
-        .once.with('gemirro').and_return([::Gem::Version.new('0.0.1'),
-                                          ::Gem::Version.new('0.0.2')])
-      expect(@fetcher.versions_for(gem)).to eq([::Gem::Version.new('0.0.2')])
+        .once.with('gemirro')
+        .and_return([[::Gem::Version.new('0.0.1'), 'ruby'],
+                     [::Gem::Version.new('0.0.2'), 'ruby']])
+      expect(@fetcher.versions_for(gem)).to eq([[::Gem::Version.new('0.0.2'), 'ruby']])
     end
 
     it 'should fetch all gems and log debug if gem is not satisfied' do

data/spec/gemirro/server_spec.rb

@@ -125,7 +125,7 @@ module Gemirro
       end
 
       it 'should try to download gems.' do
-        source = Gemirro::Source.new('test', 'http://rubygems.org')
+        source = Gemirro::Source.new('test', 'https://rubygems.org')
 
         versions_fetcher = Gemirro::VersionsFetcher.new(source)
         allow(versions_fetcher).to receive(:fetch).once.and_return(true)
@@ -166,7 +166,7 @@ module Gemirro
       end
 
       it 'should catch exceptions' do
-        source = Gemirro::Source.new('test', 'http://rubygems.org')
+        source = Gemirro::Source.new('test', 'https://rubygems.org')
 
         versions_fetcher = Gemirro::VersionsFetcher.new(source)
         allow(versions_fetcher).to receive(:fetch).once.and_return(true)

data/template/config.rb

@@ -17,6 +17,9 @@ Gemirro.configuration.configure do
   #
   # server.host 'localhost'
   # server.port '2000'
+
+  # If you don't want the server to run daemonized, uncomment the following
+  # server.daemonize false
   server.access_log File.expand_path('../logs/access.log', __FILE__)
   server.error_log File.expand_path('../logs/error.log', __FILE__)
 
@@ -32,7 +35,7 @@ Gemirro.configuration.configure do
   # You must define a source which where gems will be downloaded.
   # All gem in the block will be downloaded with the update command.
   # Other gems will be downloaded with the server.
-  define_source 'rubygems', 'http://rubygems.org' do
+  define_source 'rubygems', 'https://rubygems.org' do
     gem 'rack', '>= 1.0.0'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gemirro
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Pierre Rambaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
@@ -128,84 +142,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.1'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.21'
 description: Create your own gems mirror.
 email: pierre.rambaud86@gmail.com
 executables:
@@ -295,15 +309,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Gem for easily creating your own gems mirror.