dapp 0.27.23 → 0.27.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13c3b1fd34f48a9d5136d13ca2739b516f15d4e4
-  data.tar.gz: e9110a1cece70e0f316708b7711e881962d6d866
+  metadata.gz: 92ace8efed7d94bce6963a716dd06bcf250565fa
+  data.tar.gz: 61ad2c2d8022efff30cbe82c25ba788ec1d5a74e
 SHA512:
-  metadata.gz: 755e78c11755206b5565324556812c185c0efe90e031fb81d769a232ac17b616e3947c5c9c096ad234ee73793ddd1c5608a0955d1f73869b31d9a4587fb99f07
-  data.tar.gz: e99184f90bf5669a1ee05f4d165433e304074db073957b50a6c56563912509fa0557d271b4c22f7d7e254db884fd93daa979ff21722e5b2ff2fb0dc10224559d
+  metadata.gz: dce06b2f76860a3a20864788e1018b22fec7726a606b785cd7b55eb9cb894075ff083bce2060488bb1fd0fcf7d1676020caa0080b0b4ebc8b3b58ad188194c4b
+  data.tar.gz: dc60b638a540429f1622793f78334902adfc92e734ed06f9fed6ee0e649b500e9c612dd050dbcbe59e3ac72faed3c9a7e3d950b5b3f41b10ba19e5b59aaeaaee

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.27.23'
+  VERSION = '0.27.24'
   BUILD_CACHE_VERSION = 29.1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.27.23
+  version: 0.27.24
 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
@@ -772,7 +772,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