dapp 0.28.6 → 0.28.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d50daa2908b334f3467aa28afad6c9e203e5c2cb
-  data.tar.gz: 16cd4c67e191e37ffa61222623c1da4c368744c6
+  metadata.gz: 592ed9350dbf2109166302b8f2822958f07a3f37
+  data.tar.gz: 519a6669b3a5a43c6e8cfa32b07cdd8f9d42993f
 SHA512:
-  metadata.gz: 1b1e4c3a60102d01fc59b85054ccad52e2cdb8fc4021afc31df4f4d02268e97e1945500ac724efbde63fabaf2c0826f93dccdcfb8dde88908635d2e8491cbd5d
-  data.tar.gz: bb18523a6ba5da1af2301ef283745590baf86fa7720a48e61114732e38d19e4059e565905c783ab75f56e822cd789e3b4006e7f538fac1e6eb68bf4a354528cd
+  metadata.gz: e1293446ae2892d1b124da405b8932079e305a808258a597cc2707432ba41aef889d5ec94a4a60f090672dcae57e4ce4ff713057fca032160aa483818cc2ea64
+  data.tar.gz: 55dacf105324bce5117973c55f20533c329550ba7c8c3ec24fa1fc0744b2ad83bdebb9578051a22d6c14647bacbb674030bff0180c5dc8fb89fa8b35437c59c3

data/lib/dapp/core_ext/pathname.rb

@@ -8,13 +8,15 @@ module Dapp
         path_descends = []
         cleanpath.descend {|d| path_descends << d}
 
-        (path_descends & another_path_descends) == another_path_descends &&
-          (path_descends - another_path_descends).any?
+        (path_descends & another_path_descends) == another_path_descends
       end
 
       def subpath_of(another_path)
-        return unless subpath_of? another_path
-        cleanpath.to_s.partition(::Pathname.new(another_path).cleanpath.to_s + '/').last
+        another_cleanpath = ::Pathname.new(another_path).cleanpath
+
+        return     unless subpath_of? another_path
+        return '.' if cleanpath.to_s == another_cleanpath.to_s
+        cleanpath.to_s.partition(another_cleanpath.to_s + '/').last
       end
     end # Pathname
   end # CoreExt

data/lib/dapp/dapp.rb

@@ -165,7 +165,7 @@ module Dapp
     def host_docker_login(repo)
       return unless self.class.options_with_docker_credentials?
       username, password = self.class.docker_credentials
-      shellout!("#{host_docker} login -u '#{username}' -p '#{password}' '#{repo}'")
+      shellout!("#{host_docker} login --username '#{username}' --password-stdin '#{repo}'", input: password)
     end
 
     class << self

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.28.6"
+  VERSION = "0.28.7"
   BUILD_CACHE_VERSION = 29
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.28.6
+  version: 0.28.7
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout