dapp 0.28.6 → 0.28.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d50daa2908b334f3467aa28afad6c9e203e5c2cb
4
- data.tar.gz: 16cd4c67e191e37ffa61222623c1da4c368744c6
3
+ metadata.gz: 592ed9350dbf2109166302b8f2822958f07a3f37
4
+ data.tar.gz: 519a6669b3a5a43c6e8cfa32b07cdd8f9d42993f
5
5
  SHA512:
6
- metadata.gz: 1b1e4c3a60102d01fc59b85054ccad52e2cdb8fc4021afc31df4f4d02268e97e1945500ac724efbde63fabaf2c0826f93dccdcfb8dde88908635d2e8491cbd5d
7
- data.tar.gz: bb18523a6ba5da1af2301ef283745590baf86fa7720a48e61114732e38d19e4059e565905c783ab75f56e822cd789e3b4006e7f538fac1e6eb68bf4a354528cd
6
+ metadata.gz: e1293446ae2892d1b124da405b8932079e305a808258a597cc2707432ba41aef889d5ec94a4a60f090672dcae57e4ce4ff713057fca032160aa483818cc2ea64
7
+ data.tar.gz: 55dacf105324bce5117973c55f20533c329550ba7c8c3ec24fa1fc0744b2ad83bdebb9578051a22d6c14647bacbb674030bff0180c5dc8fb89fa8b35437c59c3
@@ -8,13 +8,15 @@ module Dapp
8
8
  path_descends = []
9
9
  cleanpath.descend {|d| path_descends << d}
10
10
 
11
- (path_descends & another_path_descends) == another_path_descends &&
12
- (path_descends - another_path_descends).any?
11
+ (path_descends & another_path_descends) == another_path_descends
13
12
  end
14
13
 
15
14
  def subpath_of(another_path)
16
- return unless subpath_of? another_path
17
- cleanpath.to_s.partition(::Pathname.new(another_path).cleanpath.to_s + '/').last
15
+ another_cleanpath = ::Pathname.new(another_path).cleanpath
16
+
17
+ return unless subpath_of? another_path
18
+ return '.' if cleanpath.to_s == another_cleanpath.to_s
19
+ cleanpath.to_s.partition(another_cleanpath.to_s + '/').last
18
20
  end
19
21
  end # Pathname
20
22
  end # CoreExt
@@ -165,7 +165,7 @@ module Dapp
165
165
  def host_docker_login(repo)
166
166
  return unless self.class.options_with_docker_credentials?
167
167
  username, password = self.class.docker_credentials
168
- shellout!("#{host_docker} login -u '#{username}' -p '#{password}' '#{repo}'")
168
+ shellout!("#{host_docker} login --username '#{username}' --password-stdin '#{repo}'", input: password)
169
169
  end
170
170
 
171
171
  class << self
@@ -1,4 +1,4 @@
1
1
  module Dapp
2
- VERSION = "0.28.6"
2
+ VERSION = "0.28.7"
3
3
  BUILD_CACHE_VERSION = 29
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.28.6
4
+ version: 0.28.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-05-15 00:00:00.000000000 Z
11
+ date: 2018-05-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout