dapp 0.31.11 → 0.31.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d33ae2a3a71b3597375c0a89a61c5481c571424dfac572c172027fac7a68cc
-  data.tar.gz: 3c8f7beb793466764b3a98ea02a5efcf869890ec02feca57aec1c971bcd4f449
+  metadata.gz: c28ba5496dc4b589d1f3658ed2b3c5f50d198989faf42835ac2b4ce34192f017
+  data.tar.gz: 598dc4cd7acb7e7c090f1c180a2ef0cb5c73ac98ed69795f2e172369647bb664
 SHA512:
-  metadata.gz: 7a372ae26601c8cafcc31c00b1bcf6997e624c509a412f6eda7ad0798e3858977fe334b76a433959bafd6165e266ebdb4f8ef7a3830d8d1e92e3f6cd29eadbc3
-  data.tar.gz: 9e957758e5fde76456f98f790bd138aa2bc96dce8d3802fcf2f8a2617aa99f2f19c318bca6a8b4b57de7cd1fd365de0d88b4467b1751a19182c4823373fdb6e8
+  metadata.gz: 71f90aa3bec4715c0756d93424f4a429ecfb8d687ee5c99c00f897e2df4bae328a5da91ffe75456887665f785cd97489e15414d979c335193b32216ff2c888fe
+  data.tar.gz: 0fb343b1d47491841e781c3a1d93ea9a88c0af92e9ad918938c66802633ff6a5a739a56f53fb2bc52290d8f9d96867812a3527948d558b0c793cd2cfa9d4b78c

data/lib/dapp/dimg/dapp/command/stages/common.rb

@@ -14,7 +14,7 @@ module Dapp
                   dimg[:parent] = image_history['container_config']['Image']
                   dimg[:labels] = image_history['config']['Labels'] || {}
                   dimg[:labels]['dapp'] == name
-                rescue DockerRegistry::Error::ManifestInvalid => err
+                rescue ::Dapp::Dimg::DockerRegistry::Error::ManifestInvalid => err
                   log_warning "WARNING: Ignore dimg `#{dimg[:dimg]}` tag `#{dimg[:tag]}`: got manifest-invalid-error from docker registry: #{err.message}"
                   false
                 end
@@ -52,7 +52,7 @@ module Dapp
                 end
 
                 return { dimg: dimg_name, tag: tag, id: id }
-              rescue DockerRegistry::Error::NotFound => err
+              rescue ::Dapp::Dimg::DockerRegistry::Error::NotFound => err
                 log_warning "WARNING: Ignore dimg `#{dimg_name}` tag `#{tag}`: got not-found-error from docker registry on get-image-manifest request: #{err.message}"
                 return nil
               end
@@ -63,7 +63,7 @@ module Dapp
               unless dry_run?
                 begin
                   registry.image_delete(repo_image[:tag], repo_image[:dimg])
-                rescue DockerRegistry::Error::NotFound => err
+                rescue ::Dapp::Dimg::DockerRegistry::Error::NotFound => err
                   log_warning "WARNING: Ignore dimg `#{repo_image[:dimg]}` tag `#{repo_image[:tag]}`: got not-found-error from docker registry on image-delete request: #{err.message}"
                 end
               end

data/lib/dapp/dimg/docker_registry.rb

@@ -11,7 +11,7 @@ module Dapp
             expected_hostname_url = [protocol, expected_hostname].join('://')
             return Dimg.new(repo, expected_hostname_url, expected_repo_suffix) if hostname_exist?(expected_hostname_url)
           end
-          raise Error::Registry, code: :registry_not_available, data: { registry: repo }
+          raise ::Dapp::Dimg::Error::Registry, code: :registry_not_available, data: { registry: repo }
         else
           Default.new(repo, expected_repo_suffix)
         end

data/lib/dapp/dimg/docker_registry/base.rb

@@ -70,9 +70,9 @@ module Dapp
           url = api_url(*uri)
           request(url, **default_api_options.merge(options))
         rescue Excon::Error::MethodNotAllowed
-          raise DockerRegistry::Error::Base, code: :method_not_allowed, data: { url: url, registry: api_url, method: options[:method] }
+          raise ::Dapp::Dimg::DockerRegistry::Error::Base, code: :method_not_allowed, data: { url: url, registry: api_url, method: options[:method] }
         rescue Excon::Error::NotFound
-          raise DockerRegistry::Error::ImageNotFound.new(url, api_url)
+          raise ::Dapp::Dimg::DockerRegistry::Error::ImageNotFound.new(url, api_url)
         rescue Excon::Error::Unauthorized
           user_not_authorized!
         rescue Excon::Error => err
@@ -81,13 +81,13 @@ module Dapp
             if response_data
               (response_data["errors"] || []).each do |err_data|
                 if err_data["code"] == "MANIFEST_INVALID"
-                  raise DockerRegistry::Error::ManifestInvalid.new(url, api_url, "#{err.response.status_line.strip}: #{err.response.reason_phrase.strip}: #{err.response.body.strip}")
+                  raise ::Dapp::Dimg::DockerRegistry::Error::ManifestInvalid.new(url, api_url, "#{err.response.status_line.strip}: #{err.response.reason_phrase.strip}: #{err.response.body.strip}")
                 end
               end
             end
           end
 
-          raise(DockerRegistry::Error::Base,
+          raise(::Dapp::Dimg::DockerRegistry::Error::Base,
             code: :unknown_error,
             data: { url: url,
                     registry: api_url,
@@ -104,7 +104,7 @@ module Dapp
         end
 
         def user_not_authorized!
-          raise DockerRegistry::Error::Base, code: :user_not_authorized, data: { registry: api_url }
+          raise ::Dapp::Dimg::DockerRegistry::Error::Base, code: :user_not_authorized, data: { registry: api_url }
         end
       end
     end # DockerRegistry

data/lib/dapp/dimg/docker_registry/base/authorization.rb

@@ -9,7 +9,7 @@ module Dapp
                 when /Bearer/ then { headers: { Authorization: "Bearer #{authorization_token(authenticate_header)}" } }
                 when /Basic/ then { headers: { Authorization: "Basic #{authorization_auth}" } }
                 when nil then {}
-                else raise DockerRegistry::Error::Base, code: :authenticate_type_not_supported, data: { registry: api_url }
+                else raise ::Dapp::Dimg::DockerRegistry::Error::Base, code: :authenticate_type_not_supported, data: { registry: api_url }
               end
             end
           end
@@ -19,7 +19,7 @@ module Dapp
             realm = options.delete(:realm)
             begin
               response = raw_request(realm, headers: { Authorization: "Basic #{authorization_auth}" }, query: options, expects: [200])
-            rescue DockerRegistry::Error::Base
+            rescue ::Dapp::Dimg::DockerRegistry::Error::Base
               raise unless (response = raw_request(realm, query: options)).status == 200
             end
             JSON.load(response.body)['token']

data/lib/dapp/dimg/docker_registry/dimg.rb

@@ -16,7 +16,7 @@ module Dapp
 
         def tags
           super
-        rescue DockerRegistry::Error::Base => e
+        rescue ::Dapp::Dimg::DockerRegistry::Error::Base => e
           raise unless e.net_status[:code] == :page_not_found
           []
         end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.11"
+  VERSION = "0.31.12"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.31.11
+  version: 0.31.12
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout