dapp 0.35.14 → 0.35.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dapp/dimg/dapp/command/flush_local.rb +4 -11
- data/lib/dapp/dimg/dapp/command/flush_repo.rb +5 -10
- data/lib/dapp/dimg/dapp/command/mrproper.rb +4 -5
- data/lib/dapp/dimg/dapp/command/ruby2go_cleanup.rb +5 -5
- data/lib/dapp/dimg/dapp/command/stages/cleanup_local.rb +6 -6
- data/lib/dapp/dimg/dapp/command/stages/cleanup_repo.rb +11 -2
- data/lib/dapp/dimg/dapp/command/stages/flush_local.rb +5 -12
- data/lib/dapp/dimg/dapp/command/stages/flush_repo.rb +4 -9
- data/lib/dapp/dimg/dapp/dappfile.rb +1 -1
- data/lib/dapp/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a76a8e1160f0bf6bcff177579f7123ff532b5d786dbdd0ea09942bb430a31ef4
|
4
|
+
data.tar.gz: 573fcf1833ac0edb462d03de45faaaeea4e3eac39324d5765ed6103b97f18137
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 77c32211ccfc6af89e259efed8c6bbe10b4a6729c8e07b00a709e9c1fd97164ba558bcc135d2896303a7cc15ae47a8e62a48cf9a1d16c6c5e202ab0faa13f9df
|
7
|
+
data.tar.gz: 3ffe02529fdc005b85baeeb912b25d98c1ad06d790daf94729b4ffa81add2a53dd2a80565a294570fbea10b8f6d8b05f30729e6e271080eea9d8ce57cb003ecb
|
@@ -4,24 +4,17 @@ module Dapp
|
|
4
4
|
module Command
|
5
5
|
module FlushLocal
|
6
6
|
def flush_local
|
7
|
-
ruby2go_cleanup_command(:flush,
|
7
|
+
ruby2go_cleanup_command(:flush, ruby2go_cleanup_flush_local_options_dump)
|
8
8
|
end
|
9
9
|
|
10
|
-
def
|
11
|
-
|
12
|
-
common_project_options: {
|
13
|
-
project_name: name,
|
14
|
-
common_options: {
|
15
|
-
dry_run: dry_run?,
|
16
|
-
force: true
|
17
|
-
}
|
18
|
-
},
|
10
|
+
def ruby2go_cleanup_flush_local_options_dump
|
11
|
+
ruby2go_cleanup_common_project_options(force: true).merge(
|
19
12
|
mode: {
|
20
13
|
with_dimgs: true,
|
21
14
|
with_stages: with_stages?,
|
22
15
|
only_repo: false,
|
23
16
|
},
|
24
|
-
|
17
|
+
).tap do |json|
|
25
18
|
break JSON.dump(json)
|
26
19
|
end
|
27
20
|
end
|
@@ -4,22 +4,17 @@ module Dapp
|
|
4
4
|
module Command
|
5
5
|
module FlushRepo
|
6
6
|
def flush_repo
|
7
|
-
ruby2go_cleanup_command(:flush,
|
7
|
+
ruby2go_cleanup_command(:flush, ruby2go_cleanup_flush_repo_options_dump)
|
8
8
|
end
|
9
9
|
|
10
|
-
def
|
11
|
-
|
12
|
-
common_repo_options: {
|
13
|
-
repository: option_repo,
|
14
|
-
dimg_names: dimgs_names,
|
15
|
-
dry_run: dry_run?
|
16
|
-
},
|
10
|
+
def ruby2go_cleanup_flush_repo_options_dump
|
11
|
+
ruby2go_cleanup_common_repo_options.merge(
|
17
12
|
mode: {
|
18
13
|
with_dimgs: true,
|
19
14
|
with_stages: with_stages?,
|
20
15
|
only_repo: true,
|
21
|
-
}
|
22
|
-
|
16
|
+
}
|
17
|
+
).tap do |json|
|
23
18
|
break JSON.dump(json)
|
24
19
|
end
|
25
20
|
end
|
@@ -4,21 +4,20 @@ module Dapp
|
|
4
4
|
module Command
|
5
5
|
module Mrproper
|
6
6
|
def mrproper
|
7
|
-
ruby2go_cleanup_command(:reset,
|
7
|
+
ruby2go_cleanup_command(:reset, ruby2go_cleanup_reset_options_dump)
|
8
8
|
end
|
9
9
|
|
10
|
-
def
|
11
|
-
|
10
|
+
def ruby2go_cleanup_reset_options_dump
|
11
|
+
cleanup_repo_proper_cache_version_options.merge(
|
12
12
|
mode: {
|
13
13
|
all: !!options[:proper_all],
|
14
14
|
dev_mode_cache: !!options[:proper_dev_mode_cache],
|
15
15
|
cache_version: proper_cache_version?
|
16
16
|
},
|
17
|
-
cache_version: ::Dapp::BUILD_CACHE_VERSION.to_s,
|
18
17
|
common_options: {
|
19
18
|
dry_run: dry_run?
|
20
19
|
},
|
21
|
-
|
20
|
+
).tap do |json|
|
22
21
|
break JSON.dump(json)
|
23
22
|
end
|
24
23
|
end
|
@@ -15,29 +15,29 @@ module Dapp
|
|
15
15
|
end
|
16
16
|
end
|
17
17
|
|
18
|
-
def
|
18
|
+
def ruby2go_cleanup_common_project_options(force: false)
|
19
19
|
{
|
20
20
|
common_project_options: {
|
21
21
|
project_name: name,
|
22
22
|
common_options: {
|
23
23
|
dry_run: dry_run?,
|
24
|
-
force:
|
24
|
+
force: force
|
25
25
|
}
|
26
26
|
},
|
27
27
|
}
|
28
28
|
end
|
29
29
|
|
30
|
-
def
|
30
|
+
def ruby2go_cleanup_cache_version_options
|
31
31
|
{
|
32
32
|
cache_version: ::Dapp::BUILD_CACHE_VERSION.to_s
|
33
33
|
}
|
34
34
|
end
|
35
35
|
|
36
|
-
def
|
36
|
+
def ruby2go_cleanup_common_repo_options
|
37
37
|
{
|
38
38
|
common_repo_options: {
|
39
39
|
repository: option_repo,
|
40
|
-
|
40
|
+
dimgs_names: nameless_dimg? ? [] : dimgs_names,
|
41
41
|
dry_run: dry_run?
|
42
42
|
}
|
43
43
|
}
|
@@ -8,22 +8,22 @@ module Dapp
|
|
8
8
|
raise ::Dapp::Error::Command, code: :stages_cleanup_required_option unless stages_cleanup_option?
|
9
9
|
|
10
10
|
if proper_cache_version?
|
11
|
-
ruby2go_cleanup_command(:sync,
|
11
|
+
ruby2go_cleanup_command(:sync, cleanup_local_proper_cache_version_options_dump)
|
12
12
|
end
|
13
13
|
|
14
14
|
if proper_repo_cache?
|
15
|
-
ruby2go_cleanup_command(:sync,
|
15
|
+
ruby2go_cleanup_command(:sync, cleanup_local_proper_repo_cache_options_dump)
|
16
16
|
end
|
17
17
|
end
|
18
18
|
|
19
|
-
def
|
20
|
-
|
19
|
+
def cleanup_local_proper_cache_version_options_dump
|
20
|
+
ruby2go_cleanup_common_project_options.merge(ruby2go_cleanup_sync_cache_version_option).tap do |data|
|
21
21
|
break JSON.dump(data)
|
22
22
|
end
|
23
23
|
end
|
24
24
|
|
25
|
-
def
|
26
|
-
|
25
|
+
def cleanup_local_proper_repo_cache_options_dump
|
26
|
+
ruby2go_cleanup_common_project_options.merge(ruby2go_cleanup_common_repo_options).tap do |data|
|
27
27
|
break JSON.dump(data)
|
28
28
|
end
|
29
29
|
end
|
@@ -18,13 +18,22 @@ module Dapp
|
|
18
18
|
end
|
19
19
|
|
20
20
|
def cleanup_repo_proper_cache_version_options
|
21
|
-
|
21
|
+
ruby2go_cleanup_common_repo_options.merge(ruby2go_cleanup_cache_version_options).merge(
|
22
|
+
mode: {
|
23
|
+
sync_repo: true,
|
24
|
+
only_cache_version: true
|
25
|
+
}
|
26
|
+
).tap do |data|
|
22
27
|
break JSON.dump(data)
|
23
28
|
end
|
24
29
|
end
|
25
30
|
|
26
31
|
def cleanup_repo_proper_repo_cache_options
|
27
|
-
|
32
|
+
ruby2go_cleanup_common_repo_options.merge(
|
33
|
+
mode: {
|
34
|
+
sync_repo: true
|
35
|
+
}
|
36
|
+
).tap do |data|
|
28
37
|
break JSON.dump(data)
|
29
38
|
end
|
30
39
|
end
|
@@ -5,24 +5,17 @@ module Dapp
|
|
5
5
|
module Stages
|
6
6
|
module FlushLocal
|
7
7
|
def stages_flush_local
|
8
|
-
ruby2go_cleanup_command(:flush,
|
8
|
+
ruby2go_cleanup_command(:flush, ruby2go_cleanup_stages_flush_local_options_dump)
|
9
9
|
end
|
10
10
|
|
11
|
-
def
|
12
|
-
|
13
|
-
common_project_options: {
|
14
|
-
project_name: name,
|
15
|
-
common_options: {
|
16
|
-
dry_run: dry_run?,
|
17
|
-
force: true
|
18
|
-
}
|
19
|
-
},
|
11
|
+
def ruby2go_cleanup_stages_flush_local_options_dump
|
12
|
+
ruby2go_cleanup_common_project_options(force: true).merge(
|
20
13
|
mode: {
|
21
14
|
with_dimgs: false,
|
22
15
|
with_stages: true,
|
23
16
|
only_repo: false,
|
24
|
-
}
|
25
|
-
|
17
|
+
}
|
18
|
+
).tap do |json|
|
26
19
|
break JSON.dump(json)
|
27
20
|
end
|
28
21
|
end
|
@@ -5,22 +5,17 @@ module Dapp
|
|
5
5
|
module Stages
|
6
6
|
module FlushRepo
|
7
7
|
def stages_flush_repo
|
8
|
-
ruby2go_cleanup_command(:flush,
|
8
|
+
ruby2go_cleanup_command(:flush, ruby2go_cleanup_stages_flush_repo_options_dump)
|
9
9
|
end
|
10
10
|
|
11
|
-
def
|
12
|
-
|
13
|
-
common_repo_options: {
|
14
|
-
repository: option_repo,
|
15
|
-
dimg_names: dimgs_names,
|
16
|
-
dry_run: dry_run?
|
17
|
-
},
|
11
|
+
def ruby2go_cleanup_stages_flush_repo_options_dump
|
12
|
+
ruby2go_cleanup_common_repo_options.merge(
|
18
13
|
mode: {
|
19
14
|
with_dimgs: false,
|
20
15
|
with_stages: true,
|
21
16
|
only_repo: true,
|
22
17
|
},
|
23
|
-
|
18
|
+
).tap do |json|
|
24
19
|
break JSON.dump(json)
|
25
20
|
end
|
26
21
|
end
|
@@ -13,7 +13,7 @@ module Dapp
|
|
13
13
|
|
14
14
|
def one_dimg!
|
15
15
|
return if build_configs.one?
|
16
|
-
raise ::Dapp::Error::Command, code: :command_unexpected_dimgs_number, data: { dimgs_names:
|
16
|
+
raise ::Dapp::Error::Command, code: :command_unexpected_dimgs_number, data: { dimgs_names: dimgs_names.join('`, `') }
|
17
17
|
end
|
18
18
|
|
19
19
|
def dimgs_names
|
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.35.
|
4
|
+
version: 0.35.15
|
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-10-
|
11
|
+
date: 2018-10-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|