dapp 0.31.24 → 0.31.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f08df7a48bb18b2e9e7ded768223977716980e3707fd2f4af629a8dae697e29a
-  data.tar.gz: 15f1e8782d38395f41586eb0133fadab302a6a9a4bd702267eb3300a7c8c103e
+  metadata.gz: 188ede0b2d40031f6757b6ae8c1895ab2650cea761cdd9a82ce30490f2fa5432
+  data.tar.gz: 833cc49603a4c403c346e66d51b4b08960a0db34b77761aa7b6c4b1b464beb18
 SHA512:
-  metadata.gz: f1da128b18817908c2469180d040abd7164c61ad88c8d47aba517acd990b77bf4bb89ed7e7d553a9a8ed958efcd6a4987cf82a91290af33829581dce9a568e34
-  data.tar.gz: 8805240ea6b21f03cf1a1b8258f2b6afcf7e4e39ee9667d18e0e601db61576640ae3cb06afee1c4eca13f45e1b5315c49299d5563794b9a4bf5e2c940535a9a9
+  metadata.gz: 61eec808098804233f970295e8e407a855e14917a259e514e92645996ea312739780e988f5ecbfb66ef8db4ac3fa51bf34784a8b3da3175b4dbf5c373ac3097e
+  data.tar.gz: fc867c80aa9020f587992dbac1e4ac664070e6995d7368f4eb5b871fc1e67c09f418211866767cd3dc04b5f79041633ab99c1d4b32b0bdf6ec828f01fdc86894

data/lib/dapp/dapp/dappfile.rb

@@ -126,12 +126,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.31.24"
+  VERSION = "0.31.25"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.31.24
+  version: 0.31.25
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2019-01-10 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