dapp 0.28.12 → 0.28.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce2ecd99ff403bd8bfef56dd58f6eb5108d9b785
-  data.tar.gz: 02a10c52829563ed3c6c50df6f84a3eecb2b0d71
+  metadata.gz: 1b6014c2f1cb43c4ea464da1d5c5721f460bc018
+  data.tar.gz: 7867d71a55823b3ca5219869447dd8b960922135
 SHA512:
-  metadata.gz: f4dbf483095769a11aba2d98f69bccde96eef0b51604ce12f276497ae00f222024e33903a7ef8f91efad6038ea08322d536011b396bb6890c6349783d295bdc2
-  data.tar.gz: 8c0fcee53c0bd45b6eaa2e009eafff3a5ec715e05b8931fd36f3e67093096638ee3145b5a296b992e2f76b99b7cb10bce31b244dcbfd788a74498ef80942e1d2
+  metadata.gz: 7f0736ef350f51429ad42c891ba6e7b76a8188a83f8968c99dc8fdfc1e2e739d6806f8c30e68146d8002dc8bc21a6e844dcfedf09b1d9432f9d595f97823bc5a
+  data.tar.gz: c5d495806719956c2e7e3977945dc8ea75207371b247be448a0e9c3c13758ee8a53bcb145419f3a9c901a90a445b398345d2877817bab3cb43108e1eb8dcce6d

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.28.12"
+  VERSION = "0.28.13"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.28.12
+  version: 0.28.13
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 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
@@ -773,7 +773,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell