dapp 0.26.13 → 0.26.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d412d73ba9ef9e52304ba44ec6dff7e3d4061da
-  data.tar.gz: 8389156770f560f2795986f5d761fe258b006c1f
+  metadata.gz: e0c8e71b2112018034b155f90f7fe43bb40efd2d
+  data.tar.gz: 69f57e4c27bb9b4463f460a704c3b9cf161b1718
 SHA512:
-  metadata.gz: eefabcec93c03e9510070449c1a426a32381b572b38df7a366b68d714a68c390e006d4d0b4f5eb5cbe1fa2299be1936d533225333d328032711eef11152b5794
-  data.tar.gz: 4719564edff45d34bc4e4ec1273679d817464b7dc492f76a83c19c1d41aec032220fb8dce36dc1fd6f8673dd464a5b26ec13f92598c4780da0812a6f4fb8fd7d
+  metadata.gz: 61488411fb2ba6e430bb252f35dac9246e8fc4de17fba41c53c7532cea1c381da6bb87da4c7893a76f8724f9071f8f0640d4b21e580f081d5f77af65018b0728
+  data.tar.gz: d92e4046236d70e43a0c3d9a143fa98ae2ad0cbc871c51c7d4f891ee9ad668caed676741bc86646ed5e46fe71f1a321024f9c65740d2de705f6ebf7a31b366b7

data/lib/dapp/dapp/dappfile.rb

@@ -124,12 +124,12 @@ module Dapp
           return if File.exists? dappfile_yml_bin_path
 
           log_process("Downloading dappfile-yml dapp dependency") do
-            location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/dappfile-yml")
+            location = URI("https://dl.bintray.com/dapp/ruby2go/#{::Dapp::VERSION}/dappfile-yml")
 
             tmp_bin_path = File.join(self.class.tmp_base_dir, "dappfile-yml-#{SecureRandom.uuid}")
             ::Dapp::Downloader.download(location, tmp_bin_path, show_progress: true, progress_titile: dappfile_yml_bin_path)
 
-            checksum_location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/dappfile-yml.sha")
+            checksum_location = URI("https://dl.bintray.com/dapp/ruby2go/#{::Dapp::VERSION}/dappfile-yml.sha")
             tmp_bin_checksum_path = tmp_bin_path + ".checksum"
             ::Dapp::Downloader.download(checksum_location, tmp_bin_checksum_path)
 

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

@@ -29,10 +29,25 @@ module Dapp
             [:realm, :service, :scope].map do |option|
               /#{option}="([[^"].]*)/ =~ header
               next unless Regexp.last_match(1)
-              [option, Regexp.last_match(1)]
+
+              option_value = begin
+                if option == :scope
+                  handle_scope_option(Regexp.last_match(1))
+                else
+                  Regexp.last_match(1)
+                end
+              end
+
+              [option, option_value]
             end.compact.to_h
           end
 
+          def handle_scope_option(resourcescope)
+            resource_type, resource_name, actions = resourcescope.split(":")
+            actions                               = actions.split(",").map { |action| action == "delete" ? "*" : action }.join(",")
+            [resource_type, resource_name, actions].join(":")
+          end
+
           def authorization_auth
             @authorization_auth ||= begin
               if ::Dapp::Dapp.options_with_docker_credentials?

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.26.13"
+  VERSION = "0.26.14"
   BUILD_CACHE_VERSION = 27.1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.26.13
+  version: 0.26.14
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -234,14 +234,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement