manifest-builder 0.5.13 → 0.5.14
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/Gemfile.lock +16 -20
- data/lib/cicd/builder/manifest/mixlib/repo/artifactory.rb +17 -0
- data/lib/cicd/builder/manifest/version.rb +1 -1
- data/manifest-builder.gemspec +2 -2
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a766360163b33ceb57ef4b810f9ae432825fbb7c
|
|
4
|
+
data.tar.gz: b484221ccdb7630ece63244900d792b6e0bf2471
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8c103fc253d1c67b2ff123c6a87b130a2bcdbf70c49b9f880499ba60b607e24683b98c06fba047e19de8aa1878c5cf8be9715cef6904b967b74770d884ae78be
|
|
7
|
+
data.tar.gz: c3a59d4c9426f8210cf62442a91428effac24b761b74f0d7d9cb8ef4cfa3ed68147a11ad018e1c0ef89e2ddbbf4a227f601d9f72adff1bc3cd13e799a626e612
|
data/Gemfile.lock
CHANGED
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
manifest-builder (0.5.
|
|
4
|
+
manifest-builder (0.5.14)
|
|
5
5
|
archive-tar-minitar (= 0.5.2)
|
|
6
|
-
chefrepo-builder (>= 0.9.
|
|
7
|
-
cicd-builder (>= 0.9.
|
|
6
|
+
chefrepo-builder (>= 0.9.30, < 1.1)
|
|
7
|
+
cicd-builder (>= 0.9.46, < 1.1)
|
|
8
8
|
json (>= 1.8.1, < 1.9)
|
|
9
9
|
s3etag (>= 0.0.1, < 0.1.0)
|
|
10
10
|
|
|
11
11
|
PATH
|
|
12
12
|
remote: ../chefrepo-builder
|
|
13
13
|
specs:
|
|
14
|
-
chefrepo-builder (0.9.
|
|
15
|
-
cicd-builder (>= 0.9.
|
|
14
|
+
chefrepo-builder (0.9.30)
|
|
15
|
+
cicd-builder (>= 0.9.46, < 1.1)
|
|
16
16
|
json (= 1.8.1)
|
|
17
17
|
|
|
18
18
|
PATH
|
|
19
19
|
remote: ../cicd-builder
|
|
20
20
|
specs:
|
|
21
|
-
cicd-builder (0.9.
|
|
21
|
+
cicd-builder (0.9.46)
|
|
22
22
|
artifactory (>= 2.2.1, < 2.3)
|
|
23
23
|
awesome_print (>= 1.6, < 2.0)
|
|
24
24
|
aws-sdk (>= 2.0, < 2.1)
|
|
@@ -36,15 +36,14 @@ GEM
|
|
|
36
36
|
archive-tar-minitar (0.5.2)
|
|
37
37
|
artifactory (2.2.1)
|
|
38
38
|
awesome_print (1.6.1)
|
|
39
|
-
aws-sdk (2.0.
|
|
40
|
-
aws-sdk-resources (= 2.0.
|
|
41
|
-
aws-sdk-core (2.0.
|
|
39
|
+
aws-sdk (2.0.38)
|
|
40
|
+
aws-sdk-resources (= 2.0.38)
|
|
41
|
+
aws-sdk-core (2.0.38)
|
|
42
42
|
builder (~> 3.0)
|
|
43
43
|
jmespath (~> 1.0)
|
|
44
44
|
multi_json (~> 1.0)
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
aws-sdk-core (= 2.0.30)
|
|
45
|
+
aws-sdk-resources (2.0.38)
|
|
46
|
+
aws-sdk-core (= 2.0.38)
|
|
48
47
|
builder (3.2.2)
|
|
49
48
|
chef (12.0.3)
|
|
50
49
|
chef-zero (~> 3.2)
|
|
@@ -77,7 +76,7 @@ GEM
|
|
|
77
76
|
term-ansicolor (>= 1.0.5)
|
|
78
77
|
diff-lcs (1.2.5)
|
|
79
78
|
erubis (2.7.0)
|
|
80
|
-
ffi (1.9.
|
|
79
|
+
ffi (1.9.8)
|
|
81
80
|
ffi-yajl (1.4.0)
|
|
82
81
|
ffi (~> 1.5)
|
|
83
82
|
libyajl2 (~> 1.2)
|
|
@@ -105,24 +104,21 @@ GEM
|
|
|
105
104
|
mixlib-log (1.6.0)
|
|
106
105
|
mixlib-shellout (2.0.1)
|
|
107
106
|
multi_json (1.11.0)
|
|
108
|
-
multi_xml (0.5.5)
|
|
109
|
-
net-dhcp (1.3.2)
|
|
110
107
|
net-ssh (2.9.2)
|
|
111
108
|
net-ssh-gateway (1.2.0)
|
|
112
109
|
net-ssh (>= 2.6.5)
|
|
113
|
-
net-ssh-multi (1.2.
|
|
110
|
+
net-ssh-multi (1.2.1)
|
|
114
111
|
net-ssh (>= 2.6.5)
|
|
115
112
|
net-ssh-gateway (>= 1.2.0)
|
|
116
|
-
ohai (8.
|
|
113
|
+
ohai (8.2.0)
|
|
117
114
|
ffi (~> 1.9)
|
|
118
|
-
ffi-yajl (
|
|
115
|
+
ffi-yajl (>= 1.1, < 3.0)
|
|
119
116
|
ipaddress
|
|
120
117
|
mime-types (~> 2.0)
|
|
121
118
|
mixlib-cli
|
|
122
119
|
mixlib-config (~> 2.0)
|
|
123
120
|
mixlib-log
|
|
124
121
|
mixlib-shellout (~> 2.0)
|
|
125
|
-
net-dhcp
|
|
126
122
|
rake (~> 10.1)
|
|
127
123
|
systemu (~> 2.6.4)
|
|
128
124
|
wmi-lite (~> 1.0)
|
|
@@ -145,7 +141,7 @@ GEM
|
|
|
145
141
|
s3etag (0.0.1)
|
|
146
142
|
semverse (1.2.1)
|
|
147
143
|
slop (3.6.0)
|
|
148
|
-
systemu (2.6.
|
|
144
|
+
systemu (2.6.5)
|
|
149
145
|
term-ansicolor (1.3.0)
|
|
150
146
|
tins (~> 1.0)
|
|
151
147
|
tins (1.3.5)
|
|
@@ -79,8 +79,25 @@ module CiCd
|
|
|
79
79
|
class_filter: '',
|
|
80
80
|
}
|
|
81
81
|
end
|
|
82
|
+
|
|
83
|
+
require 'chef/mixin/deep_merge'
|
|
84
|
+
old_projects = File.exists?(ENV['PROJECTS_FILE']) ? JSON.load(IO.read(ENV['PROJECTS_FILE'])) : {}
|
|
85
|
+
projects = Chef::Mixin::DeepMerge.deep_merge(projects, old_projects)
|
|
82
86
|
@logger.info "Save PROJECTS_FILE: #{ENV['PROJECTS_FILE']}"
|
|
83
87
|
IO.write(ENV['PROJECTS_FILE'], JSON.pretty_generate(projects, {indent: "\t", space: ' '}))
|
|
88
|
+
data = {
|
|
89
|
+
name: 'projects-file',
|
|
90
|
+
module: 'projects-file',
|
|
91
|
+
file: ENV['PROJECTS_FILE'],
|
|
92
|
+
version: @vars[:build_ver],
|
|
93
|
+
build: @vars[:build_num],
|
|
94
|
+
properties: @properties_matrix,
|
|
95
|
+
temp: false,
|
|
96
|
+
sha1: Digest::SHA1.file(ENV['PROJECTS_FILE']).hexdigest,
|
|
97
|
+
md5: Digest::MD5.file(ENV['PROJECTS_FILE']).hexdigest,
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
maybeUploadArtifactoryObject(data: data, artifact_module: data[:name], artifact_version: data[:version] || @vars[:version], file_name: '', file_ext: 'json')
|
|
84
101
|
end
|
|
85
102
|
|
|
86
103
|
def createSuperManifest(manifest)
|
data/manifest-builder.gemspec
CHANGED
|
@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
|
|
|
17
17
|
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
|
|
18
18
|
gem.require_paths = ['lib']
|
|
19
19
|
|
|
20
|
-
gem.add_dependency 'cicd-builder', '>= 0.9.
|
|
21
|
-
gem.add_dependency 'chefrepo-builder', '>= 0.9.
|
|
20
|
+
gem.add_dependency 'cicd-builder', '>= 0.9.46', '< 1.1'
|
|
21
|
+
gem.add_dependency 'chefrepo-builder', '>= 0.9.30', '< 1.1'
|
|
22
22
|
# gem.add_dependency 'ansiblerepo-builder', '>= 0.3.7', '< 0.5'
|
|
23
23
|
gem.add_dependency 'json', '>= 1.8.1', '< 1.9'
|
|
24
24
|
gem.add_dependency 's3etag', '>= 0.0.1', '< 0.1.0'
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: manifest-builder
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.5.
|
|
4
|
+
version: 0.5.14
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Christo De Lange
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-04-
|
|
11
|
+
date: 2015-04-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: cicd-builder
|
|
@@ -16,7 +16,7 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - ">="
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 0.9.
|
|
19
|
+
version: 0.9.46
|
|
20
20
|
- - "<"
|
|
21
21
|
- !ruby/object:Gem::Version
|
|
22
22
|
version: '1.1'
|
|
@@ -26,7 +26,7 @@ dependencies:
|
|
|
26
26
|
requirements:
|
|
27
27
|
- - ">="
|
|
28
28
|
- !ruby/object:Gem::Version
|
|
29
|
-
version: 0.9.
|
|
29
|
+
version: 0.9.46
|
|
30
30
|
- - "<"
|
|
31
31
|
- !ruby/object:Gem::Version
|
|
32
32
|
version: '1.1'
|
|
@@ -36,7 +36,7 @@ dependencies:
|
|
|
36
36
|
requirements:
|
|
37
37
|
- - ">="
|
|
38
38
|
- !ruby/object:Gem::Version
|
|
39
|
-
version: 0.9.
|
|
39
|
+
version: 0.9.30
|
|
40
40
|
- - "<"
|
|
41
41
|
- !ruby/object:Gem::Version
|
|
42
42
|
version: '1.1'
|
|
@@ -46,7 +46,7 @@ dependencies:
|
|
|
46
46
|
requirements:
|
|
47
47
|
- - ">="
|
|
48
48
|
- !ruby/object:Gem::Version
|
|
49
|
-
version: 0.9.
|
|
49
|
+
version: 0.9.30
|
|
50
50
|
- - "<"
|
|
51
51
|
- !ruby/object:Gem::Version
|
|
52
52
|
version: '1.1'
|