docker-cake 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c65060c27c01fce55231395ee5ad9200948a4be7
-  data.tar.gz: e9fc17acf691b35fbb212bb18fcd74b50d908308
+  metadata.gz: bb308277d72c9e12243d29048577958bcb3143fb
+  data.tar.gz: 0bebde5d78dddf58e42f16a86266b05fecf0f030
 SHA512:
-  metadata.gz: da38d0dffb2c6e0eee7de50ec7f2f870e539878f67f65377da781011ad8df84985b96d6ec32e1029740e21dd2b1512985438be6fc8f9cc11b49e1c0986eee33b
-  data.tar.gz: 31857508135384c7a536cb8ce8dc304d26d943916741827d227f81adc0cfdb069703864725230dac4d0b2f33ae7c39752ec0e124834730d5121853850d36e200
+  metadata.gz: 46f7c1023778cbb0d8aa626d6df4676f700d5b66ff55c0065f4f0fc2158f1efc4b3dd1410e9cb2bbd4c581e1dab80f9b1c7e72ba7c4fe0ee7f04564bcba61268
+  data.tar.gz: bc7334825b0e6c7c4a59ef374af115bfc76f80bc34d4bdc52fceebfba26202ec06a3e6b4525b7c8a64aebd2d19a1357a17d09408c011264608eb070968e6adac

data/docker-cake.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |gem|
   gem.specification_version = 3
 
   gem.name = 'docker-cake'
-  gem.version = "0.1"
+  gem.version = "0.2"
   gem.authors = ["Pavel Evstigneev"]
   gem.email = ["pavel.evst@gmail.com"]
   gem.license = 'MIT'

data/lib/docker_cake.rb

@@ -7,7 +7,7 @@ class DockerCake
   attr_accessor :registry
 
   def initialize(url: nil, user: nil, password: nil)
-    @registry ||= RegistryApiClient.new(user: user, password: password)
+    @registry ||= RegistryApiClient.new(user: user, password: password, url: url)
   end
 
   def repo_info(name, tag = 'latest')
@@ -17,10 +17,19 @@ class DockerCake
 
   def compare_versions(repo_name, filter: /.+/, max: 10)
     tags = registry.tags(repo_name, false)['tags']
+
+    if ENV['DEBUG']
+      puts "Found tags: #{tags.join(", ")}"
+    end
+
     tags.select! {|t| t =~ filter}
 
     selected_tags = tags.last(max)
 
+    if ENV['DEBUG']
+      puts "Analyzing #{selected_tags.size} tags: #{selected_tags.join(", ")}..."
+    end
+
     manifests = {}
     procs = selected_tags.map do |tag|
       lambda { manifests[tag] = registry.manifest_layers(repo_name, tag) }

data/lib/docker_cake/cli.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'socket'
 require_relative '../docker_cake'
 
 options = {}
@@ -49,13 +50,48 @@ if !repo || repo == ''
   exit(1)
 end
 
-connect_options = {user: options[:user], password: options[:password]}
-connect_options[:url] = options[:url] if options[:url]
+connect_options = {
+  user: options[:user],
+  password: options[:password],
+  url: options[:url]
+}
 
-if options[:layers]
-  DockerCake.new(connect_options).repo_info(repo, tag || 'latest')
-else
-  opts = {}
-  opts[:max] = options[:max].to_i if options[:max]
-  DockerCake.new(connect_options).compare_versions(repo, opts)
-end
+begin
+  if options[:layers]
+    DockerCake.new(connect_options).repo_info(repo, tag || 'latest')
+  else
+    opts = {}
+    opts[:max] = options[:max].to_i if options[:max]
+    DockerCake.new(connect_options).compare_versions(repo, opts)
+  end
+rescue RegistryApiClient::RegistryAuthenticationException => e
+  puts "Permission denied, make sure username and password are correct"
+  puts "Server response: #{e.message}"
+  puts "Example:"
+  puts "    docker-cake bob/private_repo -u bob -p ***"
+  exit 1
+rescue RegistryApiClient::HTTP::NotFound => e
+  if options[:layers]
+    puts "Repository or tag not found"
+  else
+    puts "Repository not found"
+  end
+  puts "Example:"
+  puts "    docker-cake library/ruby"
+  exit 1
+rescue RegistryApiClient::JsonError => error
+  message = error.message.size > 300 ? error.message[0..300] + "..." : error.message
+  puts "Error parsing JSON response: #{message} (#{(error.parent || error).class})"
+  body = error.response.size > 300 ? error.response[0..300] + "..." : error.response
+  puts "Server response body: #{body}"
+  if ENV['DEBUG']
+    headers = error.response.headers.to_a.map {|pair| pair.join(": ")}.join("\n  ")
+    puts "Headers:\n  #{headers}"
+  end
+  exit 1
+rescue SocketError => e
+  puts "Can not connect to registery:"
+  puts "#{e.class}: #{e.message}"
+  puts e.backtrace if ENV['DEBUG']
+  exit 1
+end

data/lib/docker_cake/registry_api_client.rb

@@ -26,6 +26,16 @@ class RegistryApiClient
   class InvalidMethod < Exception
   end
 
+  class JsonError < Exception
+    attr_reader :response
+    attr_reader :parent
+    def initialize(message, response = nil)
+      super(message)
+      @parent = message if message.is_a?(Exception)
+      @response = response
+    end
+  end
+
   class Waiter
     def initialize
       @queue = Queue.new
@@ -70,6 +80,7 @@ class RegistryApiClient
   # @option options [#to_s] :user User name for basic authentication
   # @option options [#to_s] :password Password for basic authentication
   def initialize(url: DEFAULT_REGISTRY, user: nil, password: nil)
+    url = url || DEFAULT_REGISTRY
     @url = url
     uri = URI.parse(url)
     @base_uri = "#{uri.scheme}://#{uri.host}:#{uri.port}"
@@ -112,7 +123,11 @@ class RegistryApiClient
   def tags(repo, withHashes = false)
     response = http_get("/v2/#{repo}/tags/list")
     # parse the response
-    resp = JSON.parse(response)
+    resp = begin
+      JSON.parse(response)
+    rescue JSON::ParserError => e
+      raise JsonError.new(e, response)
+    end
     # do we include the hashes?
     if withHashes then
       useGet = false
@@ -200,7 +215,9 @@ class RegistryApiClient
       end
     end
 
-    threads.map(&:join)
+    threads.each do |t|
+      t.alive? && t.join
+    end
 
     if errors.size > 0
       raise errors.first
@@ -232,9 +249,9 @@ class RegistryApiClient
         else
           return req_no_auth(type, url, stream: stream, manifest: manifest)
         end
-      rescue SocketError => e
-        p e
-        raise RegistryUnknownException
+#      rescue SocketError => e
+#        p e
+#        raise RegistryUnknownException
       rescue HTTP::Unauthorized => e
         header = e.response.headers[:www_authenticate]
         method = header.downcase.split(' ')[0]
@@ -279,11 +296,11 @@ class RegistryApiClient
           headers: {Accept: manifest || @manifest_format},
           block_response: block
         )
-      rescue SocketError
-        raise RegistryUnknownException
-      rescue HTTP::Unauthorized
-        raise RegistryAuthenticationException
-      rescue MethodNotAllowed
+#      rescue SocketError
+#        raise RegistryUnknownException
+      rescue HTTP::Unauthorized => error
+        raise RegistryAuthenticationException.new(error)
+      rescue HTTP::MethodNotAllowed
         raise InvalidMethod
       end
       return response
@@ -303,11 +320,11 @@ class RegistryApiClient
           headers: {Authorization: 'Bearer ' + token, Accept: manifest || @manifest_format},
           block_response: block
         )
-      rescue SocketError
-        raise RegistryUnknownException
-      rescue HTTP::Unauthorized
-        raise RegistryAuthenticationException
-      rescue MethodNotAllowed
+#      rescue SocketError
+#        raise RegistryUnknownException
+      rescue HTTP::Unauthorized => e
+        raise RegistryAuthenticationException.new(e)
+      rescue HTTP::MethodNotAllowed
         raise InvalidMethod
       end
 
@@ -324,7 +341,12 @@ class RegistryApiClient
       if AUTH_CACHE[scope].is_a?(String)
         return AUTH_CACHE[scope]
       elsif AUTH_CACHE[scope].is_a?(PubSub)
-        return AUTH_CACHE[scope].wait
+        result = AUTH_CACHE[scope].wait
+        if result.is_a?(Exception)
+          raise result
+        else
+          return result
+        end
       else
         AUTH_CACHE[scope] = PubSub.new
       end
@@ -343,9 +365,10 @@ class RegistryApiClient
           user: @user,
           password: @password
         )
-      rescue HTTP::Unauthorized
+      rescue HTTP::Unauthorized => error
         # bad authentication
-        raise RegistryAuthenticationException
+        AUTH_CACHE[scope].notify(error)
+        raise RegistryAuthenticationException.new(error)
       end
       # now save the web token
       token = JSON.parse(response)["token"]
@@ -373,7 +396,7 @@ class RegistryApiClient
   module HTTP
     extend self
 
-    class Unauthorized < Exception
+    class ResponseError < Exception
       attr_accessor :response
       def initialize(message, response)
         super(message)
@@ -381,12 +404,13 @@ class RegistryApiClient
       end
     end
 
-    class MethodNotAllowed < Exception
-      attr_accessor :response
-      def initialize(message, response)
-        super(message)
-        @response = response
-      end
+    class Unauthorized < ResponseError
+    end
+
+    class MethodNotAllowed < ResponseError
+    end
+
+    class NotFound < ResponseError
     end
 
     def execute(method:, url:, headers: {}, user: nil, password: nil, block_response: nil, body: nil, query: nil)
@@ -439,6 +463,10 @@ class RegistryApiClient
           raise MethodNotAllowed.new(http_resp.body, response)
         end
 
+        if http_resp.code.to_s == '404'
+          raise NotFound.new(http_resp.body, response)
+        end
+
         return response
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-cake
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Pavel Evstigneev