gemirro 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5ce407f251612fd3198509818414c754d97508355e1fc1a723a08448bfb369f
-  data.tar.gz: 669d4d88aa1db6241b7e8861934d12893accde19fad6454d829a9e143569622b
+  metadata.gz: 56fa41eef2a76a964a6d885f5c78ea8e6193c2442ae9dc7b3db6cae10c934ea9
+  data.tar.gz: '08152e167296fd41283619abf268f08279b950ff3d683f500f3cdce5fe49ae5e'
 SHA512:
-  metadata.gz: 3c49aa30264c21ca2fb840f5c4b2b6dd6058c5b587e94ff5ae4e94488a00d86f25e0a56de742c9ab8078a6350bb5f15d38119b69decfdd5088e0c8b0ff4dafa6
-  data.tar.gz: 96e25a3b96ca072f6823b8583626b9dd502048e444423af8d50ffcc9040a139daa5aa36314ce914edef2123c335015a6f8f1f758b18a62339fcfe60d3c006afa
+  metadata.gz: 0ab54b560eb64207ce1074ac87c02a71569ecf626069a59ae4aa3bfb8dbc5e504c57712e57e216a9c0d27347fca1c54db3037846fefe90ad1ad70de35423b257
+  data.tar.gz: da5e332d738e42ca80ed7946a2bb598b213ce50d54df704f672d3717d010b07bfa5dc3e07d7b3290cc95557f657635a7de46ab9372c6a981b3b19f233c3f2acf

data/MANIFEST

@@ -1,6 +1,5 @@
 .gitignore
 .rubocop.yml
-.travis.yml
 Gemfile
 LICENSE
 MANIFEST
@@ -62,9 +61,8 @@ 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/dist/js/jquery.min.js
 template/public/gems/.gitkeep
 views/gem.erb
 views/index.erb
 views/layout.erb
-views/not_found.erb
+views/not_found.erb

data/README.md

@@ -29,7 +29,7 @@ This is done by running the `gemirro init` command.
 $ gemirro init /srv/http/mirror.com/
 ```
 
-Once created you can edit the main configuration file called `config.rb`.
+Once created you can edit the main configuration file called [config.rb](https://github.com/PierreRambaud/gemirro/blob/master/template/config.rb).
 This configuration file specifies what source to mirror, destination directory, server host and port, etc.
 
 Once configured and if you add gem in the `define_source`, you can pull them by running the following command:

data/gemirro.gemspec

@@ -18,15 +18,16 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.5'
 
-  s.add_dependency 'addressable', '~>2.5'
+  s.add_dependency 'addressable', '~>2.8'
   s.add_dependency 'builder', '~>3.2'
-  s.add_dependency 'confstruct', '~>1.0'
+  s.add_dependency 'confstruct', '~>1.1'
   s.add_dependency 'erubis', '~>2.7'
   s.add_dependency 'httpclient', '~>2.8'
-  s.add_dependency 'parallel', '~>1.20'
-  s.add_dependency 'sinatra', '~>2.0.1'
+  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 'slop', '~>3.6'
-  s.add_dependency 'thin', '~>1.7'
+  s.add_dependency 'thin', '~>1.8'
 
   s.add_development_dependency 'fakefs', '~>1'
   s.add_development_dependency 'rack-test', '~>1.1'

data/lib/gemirro/http.rb

@@ -29,7 +29,34 @@ module Gemirro
     # @return [HTTPClient]
     #
     def self.client
-      @client ||= HTTPClient.new
+      client ||= HTTPClient.new
+      config = Utils.configuration
+      if defined?(config.upstream_user)
+        user = config.upstream_user
+        password = config.upstream_password
+        domain = config.upstream_domain
+        client.set_auth(domain, user, password)
+      end
+
+      if defined?(config.proxy)
+        proxy = config.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)
+      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
+      end
+      @client = client
     end
   end
 end

data/lib/gemirro/indexer.rb

@@ -40,8 +40,8 @@ module Gemirro
 
       unless defined?(Builder::XChar)
         raise 'Gem::Indexer requires that the XML Builder ' \
-        'library be installed:' \
-        "\n\tgem install builder"
+              'library be installed:' \
+              "\n\tgem install builder"
       end
 
       options = { build_modern: true }.merge options

data/lib/gemirro/server.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'sinatra/base'
+require 'sinatra/static_assets'
 require 'thin'
 require 'uri'
 require 'addressable/uri'
@@ -10,6 +11,8 @@ 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

data/lib/gemirro/version.rb

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

data/template/config.rb

@@ -32,6 +32,24 @@ Gemirro.configuration.configure do
   #
   # fetch_gem false
 
+  # If upstream repository requires authentication
+  # upstream_user 'username'
+  # upstream_password 'password'
+  # upstream_domain 'https://internal.com'
+
+  # Enforce the the base_auth
+  # basic_auth true
+
+  # Set the proxy server if behind the firewall
+  # proxy 'http://proxy.internal.com:80'
+
+  # Root CA cert location if additional root ca is added
+  # This will overwrite verfiy_mode. use PEER as default
+  # rootca '/etc/root_ca.crt'
+
+  # Not verify certificate in case the proxy has self-signed cert
+  # verify_mode false
+
   # 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.