dapp 0.35.24 → 0.35.26
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/lib/dapp/dapp.rb +0 -9
- data/lib/dapp/dapp/git_artifact.rb +0 -6
- data/lib/dapp/dimg/git_artifact.rb +2 -20
- data/lib/dapp/dimg/git_repo/own.rb +0 -4
- data/lib/dapp/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: be91f5ed8804390c36e42190d1187d8734fc1c00
|
4
|
+
data.tar.gz: fa9afd09e2928cfb0d1e1db4a48d6ba1e325aba5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 345886195ffe42765837dc13b75f09f43be525336463c0cedbe9db5f85ee155512ed4c258a5697e21ffb768cae0ff6a18ab42193a84c198ce16d7f80f76fd0c7
|
7
|
+
data.tar.gz: eecaec48962bf79fc4aa59f00ecbff8baa561c310ed7765a8d58f87ab674a3366c7dc0f7b6d2d2ee85aea409827b7445f0cd414347bd135a664b03195ade1390
|
data/lib/dapp/dapp.rb
CHANGED
@@ -143,15 +143,6 @@ module Dapp
|
|
143
143
|
make_path(build_dir, *path)
|
144
144
|
end
|
145
145
|
|
146
|
-
def local_git_artifact_exclude_paths(&blk)
|
147
|
-
super do |exclude_paths|
|
148
|
-
build_path_relpath = Pathname.new(build_path).subpath_of(File.dirname(git_own_repo.path))
|
149
|
-
exclude_paths << build_path_relpath.to_s if build_path_relpath
|
150
|
-
|
151
|
-
yield exclude_paths if block_given?
|
152
|
-
end
|
153
|
-
end
|
154
|
-
|
155
146
|
def stage_cache
|
156
147
|
"dimgstage-#{name}"
|
157
148
|
end
|
@@ -1,12 +1,6 @@
|
|
1
1
|
module Dapp
|
2
2
|
class Dapp
|
3
3
|
module GitArtifact
|
4
|
-
def local_git_artifact_exclude_paths(&blk)
|
5
|
-
@local_git_artifact_exclude_paths ||= [].tap do |exclude_paths|
|
6
|
-
yield exclude_paths if block_given?
|
7
|
-
end
|
8
|
-
end
|
9
|
-
|
10
4
|
def dimgstage_g_a_commit_label(paramshash)
|
11
5
|
"dapp-git-#{paramshash}-commit"
|
12
6
|
end
|
@@ -32,28 +32,10 @@ module Dapp
|
|
32
32
|
@owner = owner
|
33
33
|
@group = group
|
34
34
|
@as = as
|
35
|
-
|
36
35
|
@stages_dependencies = stages_dependencies
|
37
|
-
|
38
|
-
|
39
|
-
@all_include_paths = base_paths(@include_paths, true)
|
40
|
-
@all_exclude_paths = repo.exclude_paths + base_paths(@exclude_paths, true)
|
41
36
|
end
|
42
37
|
# rubocop:enable Metrics/ParameterLists
|
43
38
|
|
44
|
-
def base_paths(paths, with_cwd = false)
|
45
|
-
[paths].flatten.compact.map do |path|
|
46
|
-
if with_cwd && !cwd.empty?
|
47
|
-
File.join(cwd, path)
|
48
|
-
else
|
49
|
-
path
|
50
|
-
end
|
51
|
-
.chomp('/')
|
52
|
-
.reverse.chomp('/')
|
53
|
-
.reverse
|
54
|
-
end
|
55
|
-
end
|
56
|
-
|
57
39
|
def apply_archive_command(stage)
|
58
40
|
res = repo.dapp.ruby2go_git_artifact(
|
59
41
|
"GitArtifact" => JSON.dump(get_ruby2go_state_hash),
|
@@ -144,8 +126,8 @@ module Dapp
|
|
144
126
|
"RepoPath" => File.join("/", @cwd.to_s),
|
145
127
|
"Owner" => @owner.to_s,
|
146
128
|
"Group" => @group.to_s,
|
147
|
-
"IncludePaths" => @
|
148
|
-
"ExcludePaths" => @
|
129
|
+
"IncludePaths" => @include_paths,
|
130
|
+
"ExcludePaths" => @exclude_paths,
|
149
131
|
"StagesDependencies" => @stages_dependencies.map {|k, v| [_stages_map[k], Array(v).map(&:to_s)]}.to_h,
|
150
132
|
"PatchesDir" => dimg.tmp_path('patches'),
|
151
133
|
"ContainerPatchesDir" => dimg.container_tmp_path('patches'),
|
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.26
|
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-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|
@@ -742,7 +742,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
742
742
|
version: 2.5.0
|
743
743
|
requirements: []
|
744
744
|
rubyforge_project:
|
745
|
-
rubygems_version: 2.
|
745
|
+
rubygems_version: 2.5.1
|
746
746
|
signing_key:
|
747
747
|
specification_version: 4
|
748
748
|
summary: Build docker packaged apps using chef or shell
|