docker_registry2 1.9.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4b040151a73ef44e9ac9b07bb2998283fb86e1ed33d41cc523b6229e1372121
-  data.tar.gz: 0b27fcb25ccbe51eb4ee88655ba076d93daa8ed26de37ff0ef32185edceb9b54
+  metadata.gz: 7c94a748970c4e621a4bb1b856ea14915fbc83b55cff85743e7ef4333afb2360
+  data.tar.gz: 340ce8d170519eb1a958a3c4d08314658d214ad0bd3e8c57d30d931086d885b0
 SHA512:
-  metadata.gz: 0f04c98177280e070b1d2fdc0b9577027a8802db7aa91eac54d62b5adf0043b242d6e3d896a83f8805717c5c551e16585d0c64183247149c62196e7d3092d1b6
-  data.tar.gz: a4101e6d617104332dbf23a0a2edd4b61dbad4b7f7844317fddbad81461a07671c405195380db95173823217e37b0c7aa839b2fa74b621cf26387a3366e06357
+  metadata.gz: d4b64a53ae13758dadce8fd95708fbabd76cc604a740194584ba472022a2fd71c01c7526c1d577fa7aa253a8c72df069dce5b8242e48402dc2518f1d9e117633
+  data.tar.gz: e3416ec4b0d38da96d5f7053b791f5d1b795b00a10a91d30c7aef30d454956728b94751cbb3d3eeeb9ac2a980404c1a5abbfdb0f327044e500891db20bc9c169

data/README.md

@@ -55,6 +55,13 @@ opts = { open_timeout: 2, read_timeout: 5 }
 reg = DockerRegistry2.connect("https://my.registy.corp.com", opts)
 ```
 
+Your may pass extra options for RestClient::Request.execute through `http_options` :
+
+```ruby
+opts = { http_options: { proxy: 'http://proxy.example.com:8080/' } }
+reg = DockerRegistry2.connect("https://my.registy.corp.com", opts)
+```
+
 You can connect anonymously or with credentials:
 
 #### Anonymous

data/lib/docker_registry2.rb

@@ -8,8 +8,6 @@ require File.dirname(__FILE__) + '/registry/blob'
 module DockerRegistry2
   def self.connect(uri="https://registry.hub.docker.com",opts={})
     @reg = DockerRegistry2::Registry.new(uri,opts)
-    @reg.ping
-    @reg
   end
 
   def self.search(query = '')

data/lib/registry/registry.rb

@@ -7,15 +7,19 @@ class DockerRegistry2::Registry
   # @param [Hash] options Client options
   # @option options [#to_s] :user User name for basic authentication
   # @option options [#to_s] :password Password for basic authentication
-  # @option options [#to_s] :open_timeout Time to wait for a connection with a registry
-  # @option options [#to_s] :read_timeout Time to wait for data from a registry
+  # @option options [#to_s] :open_timeout Time to wait for a connection with a registry.
+  #                                       It is ignored if http_options[:open_timeout] is also specified.
+  # @option options [#to_s] :read_timeout Time to wait for data from a registry.
+  #                                       It is ignored if http_options[:read_timeout] is also specified.
+  # @option options [Hash] :http_options Extra options for RestClient::Request.execute.
   def initialize(uri, options = {})
     @uri = URI.parse(uri)
     @base_uri = "#{@uri.scheme}://#{@uri.host}:#{@uri.port}"
     @user = options[:user]
     @password = options[:password]
-    @open_timeout = options[:open_timeout] || 2
-    @read_timeout = options[:read_timeout] || 5
+    @http_options = options[:http_options] || {}
+    @http_options[:open_timeout] ||= options[:open_timeout] || 2
+    @http_options[:read_timeout] ||= options[:read_timeout] || 5
   end
 
   def doget(url)
@@ -34,10 +38,6 @@ class DockerRegistry2::Registry
     return doreq "head", url
   end
 
-  def ping
-    response = doget '/v2/'
-  end
-
   def search(query = '')
     response = doget "/v2/_catalog"
     # parse the response
@@ -109,13 +109,13 @@ class DockerRegistry2::Registry
 
   def blob(repo, digest, outpath=nil)
     blob_url = "/v2/#{repo}/blobs/#{digest}"
-    if outpath.nil? 
+    if outpath.nil?
       response = doget(blob_url)
       DockerRegistry2::Blob.new(response.headers, response.body)
     else
       File.open(outpath, 'w') do |fd|
         doreq('get', blob_url, fd)
-      end 
+      end
 
       outpath
     end
@@ -217,13 +217,15 @@ class DockerRegistry2::Registry
     parts.each do |part, index|
       section = part.split(';')
       url = section[0][/<(.*)>/,1]
-      name = section[1][/rel="(.*)"/,1].to_sym
+      name = section[1][/rel="?([^"]*)"?/,1].to_sym
       links[name] = url
     end
 
     if links[:next]
       query=URI(links[:next]).query
-      last=URI::decode_www_form(query).to_h["last"]
+      link_key = @uri.host.eql?('quay.io') ? 'next_page' : 'last'
+      last=URI::decode_www_form(query).to_h[link_key]
+
     end
     last
   end
@@ -244,22 +246,20 @@ class DockerRegistry2::Registry
             stream.write chunk
           end
         }
-        response = RestClient::Request.execute(
+        response = RestClient::Request.execute(@http_options.merge(
           method: type,
           url: @base_uri+url,
           headers: headers(payload: payload),
           block_response: block,
-          open_timeout: @open_timeout,
-          read_timeout: @read_timeout,
           payload: payload
-        )
+        ))
       rescue SocketError
         raise DockerRegistry2::RegistryUnknownException
       rescue RestClient::NotFound => error
         raise DockerRegistry2::NotFound, error
       rescue RestClient::Unauthorized => e
         header = e.response.headers[:www_authenticate]
-        method = header.downcase.split(' ')[0]
+        method = header.to_s.downcase.split(' ')[0]
         case method
         when 'basic'
           response = do_basic_req(type, url, stream, payload)
@@ -279,17 +279,15 @@ class DockerRegistry2::Registry
             stream.write chunk
           end
         }
-        response = RestClient::Request.execute(
+        response = RestClient::Request.execute(@http_options.merge(
           method: type,
           url: @base_uri+url,
           user: @user,
           password: @password,
           headers: headers(payload: payload),
           block_response: block,
-          open_timeout: @open_timeout,
-          read_timeout: @read_timeout,
           payload: payload
-        )
+        ))
       rescue SocketError
         raise DockerRegistry2::RegistryUnknownException
       rescue RestClient::Unauthorized
@@ -310,15 +308,13 @@ class DockerRegistry2::Registry
             stream.write chunk
           end
         }
-        response = RestClient::Request.execute(
+        response = RestClient::Request.execute(@http_options.merge(
           method: type,
           url: @base_uri+url,
           headers: headers(payload: payload, bearer_token: token),
           block_response: block,
-          open_timeout: @open_timeout,
-          read_timeout: @read_timeout,
           payload: payload
-        )
+        ))
       rescue SocketError
         raise DockerRegistry2::RegistryUnknownException
       rescue RestClient::Unauthorized
@@ -342,14 +338,12 @@ class DockerRegistry2::Registry
       # authenticate against the realm
       uri = URI.parse(target[:realm])
       begin
-        response = RestClient::Request.execute(
+        response = RestClient::Request.execute(@http_options.merge(
           method: :get,
           url: uri.to_s, headers: {params: target[:params]},
           user: @user,
           password: @password,
-          open_timeout: @open_timeout,
-          read_timeout: @read_timeout
-        )
+        ))
       rescue RestClient::Unauthorized, RestClient::Forbidden
         # bad authentication
         raise DockerRegistry2::RegistryAuthenticationException

data/lib/registry/version.rb

@@ -1,3 +1,3 @@
 module DockerRegistry2
-  VERSION = '1.9.0'
+  VERSION = '1.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_registry2
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Avi Deitcher https://github.com/deitch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Docker v2 registry HTTP API client