docker_registry2 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 396635930a86cd9f517fe62ec5d697162800ceed5da3209b56c9951529c48acd
-  data.tar.gz: aa924fcb85dedc352020b686ecae75d2b755ee1d4d87ab4cc7f27991a0a3e84b
+  metadata.gz: 3210236b320a090f2886dca3102073b9c128ffd9ce6ec39e7623f2299a77c428
+  data.tar.gz: 67fb86e3c93a888f3e9f8a7fa327379bc97a56afe284cb8c64a71bc73618ecfb
 SHA512:
-  metadata.gz: 2dfbaa1a8e21b917363855a5f31c57dbd08517d0f58fc1faf43520d6e321074d4b6083246ee3863a4e6a886d5f5dc9ba239eeef7deda747536db69a77f08a480
-  data.tar.gz: 6b034ef24e2f306d8a4a5047e03a101307c55698e0ce3295eefc15481abbc64034b07bc61b5c0651aad41bd03f2a6920f0cf98b81c733c845353d1e784db8aad
+  metadata.gz: 1917a3edf585627022223123e7eefe254aa84d9ad91243ea029bd81cbf3272364c5a881f1b20df95203336085dda67dc5ade26e29c5bf0da3b08c9b5cf520a56
+  data.tar.gz: 76e2f9676f2ff888a2a42d2f02814f7ef521b1ab0bc1b92a32dfae7fe94699aa548359ada17ea898ddce27b67ba38d3cc888c6f2cea76fe6cea83c0baad2b55c

data/docker_registry2.gemspec

@@ -22,15 +22,15 @@ Gem::Specification.new do |spec|
                                                                  File.directory?(f)
                                                                end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3'
-  spec.add_development_dependency 'rubocop', '>= 0.26.0'
+  spec.add_development_dependency 'rubocop', '>= 1.63.0'
   spec.add_development_dependency 'vcr', '~> 6'
   spec.add_development_dependency 'webmock'
 
   spec.add_dependency 'rest-client', '>= 1.8.0'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/registry/registry.rb

@@ -17,7 +17,9 @@ module DockerRegistry2
     # @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}#{@uri.path}"
+      @base_uri = +"#{@uri.scheme}://#{@uri.host}:#{@uri.port}#{@uri.path}"
+      # `URI.join("https://example.com/foo/bar", "v2")` drops `bar` in the base URL. A trailing slash prevents that.
+      @base_uri << '/' unless @base_uri.end_with? '/'
       @user = options[:user]
       @password = options[:password]
       @http_options = options[:http_options] || {}
@@ -49,16 +51,18 @@ module DockerRegistry2
         response = doget(url)
         yield response
 
-        link_header = response.headers[:link]
-        break unless link_header
+        link_header = response.headers[:link] or break
+        next_url = parse_link_header(link_header)[:next] or break
 
-        url = parse_link_header(link_header)[:next]
+        # The next URL in the Link header may be relative to the request URL, or absolute.
+        # URI.join handles both cases nicely.
+        url = URI.join(response.request.url, next_url)
       end
     end
 
     def search(query = '')
       all_repos = []
-      paginate_doget('/v2/_catalog') do |response|
+      paginate_doget('v2/_catalog') do |response|
         repos = JSON.parse(response)['repositories']
         repos.select! { |repo| repo.match?(/#{query}/) } unless query.empty?
         all_repos += repos
@@ -75,7 +79,7 @@ module DockerRegistry2
       query_vars = ''
       query_vars = "?#{URI.encode_www_form(params)}" if params.length.positive?
 
-      response = doget "/v2/#{repo}/tags/list#{query_vars}"
+      response = doget "v2/#{repo}/tags/list#{query_vars}"
       # parse the response
       resp = JSON.parse response
       # parse out next page link if necessary
@@ -104,7 +108,7 @@ module DockerRegistry2
 
     def manifest(repo, tag)
       # first get the manifest
-      response = doget "/v2/#{repo}/manifests/#{tag}"
+      response = doget "v2/#{repo}/manifests/#{tag}"
       parsed = JSON.parse response.body
       manifest = DockerRegistry2::Manifest[parsed]
       manifest.body = response.body
@@ -113,7 +117,7 @@ module DockerRegistry2
     end
 
     def blob(repo, digest, outpath = nil)
-      blob_url = "/v2/#{repo}/blobs/#{digest}"
+      blob_url = "v2/#{repo}/blobs/#{digest}"
       if outpath.nil?
         response = doget(blob_url)
         DockerRegistry2::Blob.new(response.headers, response.body)
@@ -127,7 +131,7 @@ module DockerRegistry2
     end
 
     def manifest_digest(repo, tag)
-      tag_path = "/v2/#{repo}/manifests/#{tag}"
+      tag_path = "v2/#{repo}/manifests/#{tag}"
       dohead(tag_path).headers[:docker_content_digest]
     rescue DockerRegistry2::InvalidMethod
       # Pre-2.3.0 registries didn't support manifest HEAD requests
@@ -161,9 +165,9 @@ module DockerRegistry2
 
     def rmtag(image, tag)
       # TODO: Need full response back. Rewrite other manifests() calls without JSON?
-      reference = doget("/v2/#{image}/manifests/#{tag}").headers[:docker_content_digest]
+      reference = doget("v2/#{image}/manifests/#{tag}").headers[:docker_content_digest]
 
-      dodelete("/v2/#{image}/manifests/#{reference}").code
+      dodelete("v2/#{image}/manifests/#{reference}").code
     end
 
     def pull(repo, tag, dir)
@@ -195,7 +199,6 @@ module DockerRegistry2
         # download layer
         # puts "getting layer (v2) #{layer['digest']}"
         blob(repo, layer['digest'], layer_file)
-        layer_file
       end
     end
 
@@ -215,7 +218,6 @@ module DockerRegistry2
         # puts "getting layer (v1) #{layer['blobSum']}"
         blob(repo, layer['blobSum'], layer_file)
         # return layer file
-        layer_file
       end
     end
 
@@ -226,7 +228,7 @@ module DockerRegistry2
 
       raise DockerRegistry2::RegistryVersionException unless manifest['schemaVersion'] == 2
 
-      doput "/v2/#{newrepo}/manifests/#{newtag}", manifest.to_json
+      doput "v2/#{newrepo}/manifests/#{newtag}", manifest.to_json
     end
 
     def copy(repo, tag, newregistry, newrepo, newtag); end
@@ -234,14 +236,13 @@ module DockerRegistry2
     # gets the size of a particular blob, given the repo and the content-addressable hash
     # usually unneeded, since manifest includes it
     def blob_size(repo, blobSum)
-      response = dohead "/v2/#{repo}/blobs/#{blobSum}"
+      response = dohead "v2/#{repo}/blobs/#{blobSum}"
       Integer(response.headers[:content_length], 10)
     end
 
     # Parse the value of the Link HTTP header and return a Hash whose keys are the rel values turned into symbols, and
     # the values are URLs. For example, `{ next: '/v2/_catalog?n=100&last=x' }`.
     def parse_link_header(header)
-      last = ''
       parts = header.split(',')
       links = {}
 
@@ -290,7 +291,7 @@ module DockerRegistry2
                 end
         response = RestClient::Request.execute(@http_options.merge(
                                                  method: type,
-                                                 url: @base_uri + url,
+                                                 url: URI.join(@base_uri, url).to_s,
                                                  headers: headers(payload: payload),
                                                  block_response: block,
                                                  payload: payload
@@ -301,7 +302,7 @@ module DockerRegistry2
         raise DockerRegistry2::NotFound, "Image not found at #{@uri.host}"
       rescue RestClient::Unauthorized => e
         header = e.response.headers[:www_authenticate]
-        method = header.to_s.downcase.split(' ')[0]
+        method = header.to_s.downcase.split[0]
         case method
         when 'basic'
           response = do_basic_req(type, url, stream, payload)
@@ -327,7 +328,7 @@ module DockerRegistry2
                 end
         response = RestClient::Request.execute(@http_options.merge(
                                                  method: type,
-                                                 url: @base_uri + url,
+                                                 url: URI.join(@base_uri, url).to_s,
                                                  user: @user,
                                                  password: @password,
                                                  headers: headers(payload: payload),
@@ -360,7 +361,7 @@ module DockerRegistry2
                 end
         response = RestClient::Request.execute(@http_options.merge(
                                                  method: type,
-                                                 url: @base_uri + url,
+                                                 url: URI.join(@base_uri, url).to_s,
                                                  headers: headers(payload: payload, bearer_token: token),
                                                  block_response: block,
                                                  payload: payload

data/lib/registry/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DockerRegistry2
-  VERSION = '1.18.0'
+  VERSION = '1.18.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_registry2
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Avi Deitcher https://github.com/deitch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 1.63.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 1.63.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,8 @@ files:
 homepage: https://github.com/deitch/docker_registry2
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -144,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Docker v2 registry HTTP API client