dapp 0.32.6 → 0.32.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a8f8b1dd7f64d31564801f4b38aa8771069da71f16ff824b0028181ee2a3a5f
-  data.tar.gz: cee980c0a5d82326a777d316ee1272c63f7c2da29b2e37a10d01a8f04f7a5e4f
+  metadata.gz: 41651fe695a4d3716696d56e31865cda8c91ce2cb77f7dab31a195bfb9d4141a
+  data.tar.gz: 7cc7d9b4a7647693d4a90cb1e9ab49e81da40d840ba12d05e48b21c4cf7a6e73
 SHA512:
-  metadata.gz: 6920f802ddacb1f56e7c0bef7a1777cc3ac4398b9536f24e573efa8c4e59a6b1b62cb0e6b01fb88a0fa58be43c172f7f448f4b16197fa2612805f7d5a27199b3
-  data.tar.gz: 8d9495b6702781b2ab87c1482286566c23207a1f586813edb2aec309c35d7a04b312415b57ede3f8d1f7cd7cdbed6153c184ddb0fb7ce7ae4e7e867418c45349
+  metadata.gz: 8d4668e6f0c6366bc72ee341f5ecef888b7ebf86b98e71dab5c6ca86297591590bdbf56788a1e3cc3506e975a11535a195d3e0dd13840320aad6433439f115ed
+  data.tar.gz: baf03af5ea0181290b81dfb2a3b44f235e67875c9645767dea297bf72844a51faac512fea290aa5d6dcad00b86064b260b95b00d6103a7d655a84a85cb3010c9

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.32.6"
+  VERSION = "0.32.7"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.32.6
+  version: 0.32.7
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 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