dapp 0.7.34 → 0.7.35
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 +4 -4
- data/lib/dapp/build/stage/artifact_default.rb +9 -2
- data/lib/dapp/git_artifact.rb +1 -2
- data/lib/dapp/version.rb +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b6665d179aa8fd446c4a406ad4cae8665d490e83
|
|
4
|
+
data.tar.gz: 12871613932b5a1460fce21bd6246ed235c472e6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 87333a0f027c07530a0c51a66c11f45c0aff51204e7cb3fd807916f58dd0818c5f4a80f902e56426e7eb3b0db56d214e96debc00a323d6aead4af3612b88a88f
|
|
7
|
+
data.tar.gz: 8e2c64a0ad3df10aa11200f29dc875064d899bee2d29924ef9ce6a6e980c2f39ea7ce0ab9b10e82ebcc2b05373469ab1ba64a776ebb77521206299df3247653b
|
|
@@ -47,12 +47,19 @@ module Dapp
|
|
|
47
47
|
end
|
|
48
48
|
|
|
49
49
|
include_paths.each do |p|
|
|
50
|
+
target_path = File.join(from, p)
|
|
51
|
+
|
|
52
|
+
# Генерируем разрешающее правило для каждого элемента пути
|
|
53
|
+
Pathname.new(target_path).descend do |path_part|
|
|
54
|
+
cmd << " --filter='+/ #{path_part}'"
|
|
55
|
+
end
|
|
56
|
+
|
|
50
57
|
# * На данный момент не знаем директорию или файл имел в виду пользователь,
|
|
51
58
|
# поэтому подставляем фильтры для обоих возможных случаев.
|
|
52
59
|
# * Автоматом подставляем паттерн ** для включения файлов, содержащихся в
|
|
53
60
|
# директории, которую пользователь указал в include_paths.
|
|
54
|
-
cmd << " --filter='+/ #{
|
|
55
|
-
cmd << " --filter='+/ #{File.join(
|
|
61
|
+
cmd << " --filter='+/ #{target_path}'"
|
|
62
|
+
cmd << " --filter='+/ #{File.join(target_path, '**')}'"
|
|
56
63
|
end
|
|
57
64
|
|
|
58
65
|
# Все что не подошло по include — исключается
|
data/lib/dapp/git_artifact.rb
CHANGED
|
@@ -14,8 +14,7 @@ module Dapp
|
|
|
14
14
|
@commit = commit
|
|
15
15
|
|
|
16
16
|
@to = to
|
|
17
|
-
cwd = File.expand_path(File.join('/', cwd))[1..-1]
|
|
18
|
-
@cwd = cwd
|
|
17
|
+
@cwd = (cwd.nil? || cwd.empty? || cwd == '/') ? '' : File.expand_path(File.join('/', cwd, '/'))[1..-1]
|
|
19
18
|
@include_paths = include_paths
|
|
20
19
|
@exclude_paths = exclude_paths
|
|
21
20
|
@owner = owner
|
data/lib/dapp/version.rb
CHANGED
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.7.
|
|
4
|
+
version: 0.7.35
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dmitry Stolyarov
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-05-
|
|
11
|
+
date: 2017-05-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: mixlib-shellout
|