cicd-builder 0.9.27 → 0.9.28

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.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +20 -19
  3. data/cicd-builder.gemspec +3 -3
  4. data/lib/cicd/builder/mixlib/repo/S3.rb +11 -7
  5. data/lib/cicd/builder/version.rb +1 -1
  6. metadata +13 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fa7953fecede88c14d87ae392f9b76b22aa34187
4
- data.tar.gz: f09d13dedc8a18c24afdcf1bc0ee06f88e09896a
3
+ metadata.gz: f1292566262e8d37935da0cd8fa62469e6bc2ae2
4
+ data.tar.gz: 1f29f999a3157626139cee70fa91179c684ae8ed
5
5
  SHA512:
6
- metadata.gz: 94820a8c5887e8d3e09e56c2014e06cfb1a2a94984ad01ccd072426267ace427a5bb525b68e66d6f6b6cccce7e38a7092cdf1f19c34daa046e60eb4dfe93c066
7
- data.tar.gz: 0bc990f7d0140df5c6f0671eb9fbbbe6de80cce04464099e748a88854f3b0586a0aa66d814511a1ba304113deb2c7d82b466ebc651f72eac08c1149609d0029e
6
+ metadata.gz: ccfd4687b72ab03643ee139ad163558f9f27e5116c2a03a8c80a3ad8e1f68534f6c8178292aa4b6927222bd2fd533cd471104a1220fe9db0c5b8b264bdd51c06
7
+ data.tar.gz: c5975d2711a7e1a443c5ec19a790dca1f38aef1d9446e1ec86cfa41f62874cfbc6168200e3b6bcc1f69b11e95b49f8e28a2d58dc0e20a0968eb2a83d22522f4a
data/Gemfile.lock CHANGED
@@ -1,11 +1,11 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cicd-builder (0.9.27)
4
+ cicd-builder (0.9.28)
5
5
  artifactory (>= 2.2.1, < 2.3)
6
- awesome_print (>= 1.2.0, < 1.3)
6
+ awesome_print (>= 1.6, < 2.0)
7
7
  aws-sdk (>= 2.0, < 2.1)
8
- chef (>= 11.18.2, < 12)
8
+ chef (>= 12.0.3, < 12.1)
9
9
  git (>= 1.2.7, < 1.3)
10
10
  inifile (>= 3.0.0, < 3.1)
11
11
  json (>= 1.8.1, < 1.9)
@@ -17,7 +17,7 @@ GEM
17
17
  remote: http://rubygems.org/
18
18
  specs:
19
19
  artifactory (2.2.1)
20
- awesome_print (1.2.0)
20
+ awesome_print (1.6.1)
21
21
  aws-sdk (2.0.28)
22
22
  aws-sdk-resources (= 2.0.28)
23
23
  aws-sdk-core (2.0.28)
@@ -28,29 +28,28 @@ GEM
28
28
  aws-sdk-resources (2.0.28)
29
29
  aws-sdk-core (= 2.0.28)
30
30
  builder (3.2.2)
31
- chef (11.18.6)
32
- chef-zero (~> 2.2, >= 2.2.1)
31
+ chef (12.0.3)
32
+ chef-zero (~> 3.2)
33
33
  diff-lcs (~> 1.2, >= 1.2.4)
34
34
  erubis (~> 2.7)
35
35
  ffi-yajl (~> 1.2)
36
36
  highline (~> 1.6, >= 1.6.9)
37
- mime-types (~> 1.16)
38
37
  mixlib-authentication (~> 1.3)
39
38
  mixlib-cli (~> 1.4)
40
39
  mixlib-config (~> 2.0)
41
40
  mixlib-log (~> 1.3)
42
- mixlib-shellout (~> 1.4)
41
+ mixlib-shellout (>= 2.0.0.rc.0, < 3.0)
43
42
  net-ssh (~> 2.6)
44
43
  net-ssh-multi (~> 1.1)
45
- ohai (~> 7.4)
44
+ ohai (~> 8.0)
46
45
  plist (~> 3.1.0)
47
46
  pry (~> 0.9)
48
- rest-client (>= 1.0.4, <= 1.6.7)
49
- chef-zero (2.2.1)
47
+ chef-zero (3.2.1)
50
48
  ffi-yajl (~> 1.1)
51
49
  hashie (~> 2.0)
52
50
  mixlib-log (~> 1.3)
53
51
  rack
52
+ uuidtools (~> 2.1)
54
53
  coderay (1.1.0)
55
54
  cucumber (0.10.7)
56
55
  builder (>= 2.1.2)
@@ -80,30 +79,33 @@ GEM
80
79
  little-plugger (>= 1.1.3)
81
80
  multi_json (>= 1.8.4)
82
81
  method_source (0.8.2)
83
- mime-types (1.25.1)
82
+ mime-types (2.4.3)
84
83
  mixlib-authentication (1.3.0)
85
84
  mixlib-log
86
85
  mixlib-cli (1.5.0)
87
86
  mixlib-config (2.1.0)
88
87
  mixlib-log (1.6.0)
89
- mixlib-shellout (1.6.1)
88
+ mixlib-shellout (2.0.1)
90
89
  multi_json (1.10.1)
91
90
  multi_xml (0.5.5)
91
+ net-dhcp (1.3.2)
92
92
  net-ssh (2.9.2)
93
93
  net-ssh-gateway (1.2.0)
94
94
  net-ssh (>= 2.6.5)
95
95
  net-ssh-multi (1.2.0)
96
96
  net-ssh (>= 2.6.5)
97
97
  net-ssh-gateway (>= 1.2.0)
98
- ohai (7.4.1)
98
+ ohai (8.1.1)
99
99
  ffi (~> 1.9)
100
100
  ffi-yajl (~> 1.1)
101
101
  ipaddress
102
- mime-types (~> 1.16)
102
+ mime-types (~> 2.0)
103
103
  mixlib-cli
104
104
  mixlib-config (~> 2.0)
105
105
  mixlib-log
106
- mixlib-shellout (~> 1.2)
106
+ mixlib-shellout (~> 2.0)
107
+ net-dhcp
108
+ rake (~> 10.1)
107
109
  systemu (~> 2.6.4)
108
110
  wmi-lite (~> 1.0)
109
111
  plist (3.1.0)
@@ -113,8 +115,6 @@ GEM
113
115
  slop (~> 3.4)
114
116
  rack (1.6.0)
115
117
  rake (10.3.2)
116
- rest-client (1.6.7)
117
- mime-types (>= 1.16)
118
118
  rubygems-tasks (0.2.4)
119
119
  semverse (1.2.1)
120
120
  slop (3.6.0)
@@ -122,6 +122,7 @@ GEM
122
122
  term-ansicolor (1.3.0)
123
123
  tins (~> 1.0)
124
124
  tins (1.3.4)
125
+ uuidtools (2.1.5)
125
126
  wmi-lite (1.0.0)
126
127
  yajl-ruby (1.2.1)
127
128
 
@@ -129,7 +130,7 @@ PLATFORMS
129
130
  ruby
130
131
 
131
132
  DEPENDENCIES
132
- bundler (>= 1.6, < 1.7)
133
+ bundler (>= 1.7, < 1.8)
133
134
  cicd-builder!
134
135
  cucumber (>= 0.10.7, < 0.11)
135
136
  rake (>= 10.3, < 11)
data/cicd-builder.gemspec CHANGED
@@ -17,18 +17,18 @@ 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 'awesome_print', '>= 1.2.0', '< 1.3'
20
+ gem.add_dependency 'awesome_print', '>= 1.6', '< 2.0'
21
21
  gem.add_dependency 'inifile', '>= 3.0.0', '< 3.1'
22
22
  gem.add_dependency 'logging', '>= 1.8.2', '< 1.9'
23
23
  gem.add_dependency 'json', '>= 1.8.1', '< 1.9'
24
- gem.add_dependency 'chef', '>= 11.18.2', '< 12'
24
+ gem.add_dependency 'chef', '>= 12.0.3', '< 12.1'
25
25
  gem.add_dependency 'aws-sdk', '>= 2.0', '< 2.1'
26
26
  gem.add_dependency 'yajl-ruby', '>= 1.2.1', '< 1.3'
27
27
  gem.add_dependency 'git', '>= 1.2.7', '< 1.3'
28
28
  gem.add_dependency 'semverse', '>= 1.2.1', '< 1.3'
29
29
  gem.add_dependency 'artifactory', '>= 2.2.1', '< 2.3'
30
30
 
31
- gem.add_development_dependency 'bundler', '>= 1.6', '< 1.7'
31
+ gem.add_development_dependency 'bundler', '>= 1.7', '< 1.8'
32
32
  gem.add_development_dependency 'rake', '>= 10.3', '< 11'
33
33
  gem.add_development_dependency 'rubygems-tasks', '>= 0.2', '< 1.1'
34
34
  gem.add_development_dependency 'cucumber', '>= 0.10.7', '< 0.11'
data/lib/cicd/builder/mixlib/repo/S3.rb CHANGED
@@ -16,6 +16,7 @@ module CiCd
16
16
  def getS3()
17
17
  region = ENV['AWS_REGION'] || ::Aws.config[:region] || 'us-east-1'
18
18
  unless @s3
19
+ # noinspection RubyArgCount
19
20
  @s3 = ::Aws::S3::Client.new(region: region)
20
21
  end
21
22
  unless @s3 and ((@s3.config.access_key_id and @s3.config.secret_access_key) or @s3.config.credentials)
@@ -29,6 +30,7 @@ EC2 Instance profile
29
30
  @logger.info "Trying profile '#{ENV['AWS_PROFILE']}' explicitly"
30
31
  creds = Aws::SharedCredentials.new( path: File.expand_path('~/.aws/credentials'), profile: ENV['AWS_PROFILE'] )
31
32
  if creds.loadable?
33
+ # noinspection RubyArgCount
32
34
  @s3 = ::Aws::S3::Client.new(region: region, credentials: creds)
33
35
  end
34
36
  else
@@ -48,22 +50,24 @@ EC2 Instance profile
48
50
 
49
51
  s3_obj = maybeS3Object(art[:key], s3)
50
52
  upload = false
51
- md5 = nil
52
53
  if art[:data][:data]
53
54
  # md5 = Digest::MD5.hexdigest(art[:data][:data])
54
55
  tempArtifactFile('artifact', art[:data])
55
56
  end
56
57
  if s3_obj.nil?
57
58
  upload = true
59
+ etag = ''
58
60
  else
59
61
  @logger.info "s3://#{ENV['AWS_S3_BUCKET']}/#{art[:key]} exists"
60
62
  etag = s3_obj.etag.gsub(/"/, '')
61
- md5 = if art[:data].has_key?(:file)
62
- # md5 = Digest::MD5.file(art[:data][:file]).hexdigest
63
- calcLocalETag(etag, art[:data][:file])
64
- else
65
- raise "Internal error: No :file in #{art[:data].ai}"
66
- end
63
+ end
64
+ md5 = if art[:data].has_key?(:file)
65
+ # md5 = Digest::MD5.file(art[:data][:file]).hexdigest
66
+ calcLocalETag(etag, art[:data][:file])
67
+ else
68
+ raise "Internal error: No :file in #{art[:data].ai}"
69
+ end
70
+ unless s3_obj.nil?
67
71
  unless etag == md5
68
72
  checksum = s3_obj.metadata[:checksum]
69
73
  unless checksum and checksum == md5
data/lib/cicd/builder/version.rb CHANGED
@@ -4,7 +4,7 @@ module CiCd
4
4
  # file = File.expand_path("#{File.dirname(__FILE__)}/../../../VERSION")
5
5
  # lines = File.readlines(file)
6
6
  # version = lines[0]
7
- version = '0.9.27'
7
+ version = '0.9.28'
8
8
  VERSION = version unless const_defined?('VERSION')
9
9
  major, minor, tiny = VERSION.split('.')
10
10
  MAJOR = major unless const_defined?('MAJOR')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cicd-builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.27
4
+ version: 0.9.28
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christo De Lange
@@ -16,20 +16,20 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 1.2.0
19
+ version: '1.6'
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
- version: '1.3'
22
+ version: '2.0'
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- version: 1.2.0
29
+ version: '1.6'
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
- version: '1.3'
32
+ version: '2.0'
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: inifile
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -96,20 +96,20 @@ dependencies:
96
96
  requirements:
97
97
  - - ">="
98
98
  - !ruby/object:Gem::Version
99
- version: 11.18.2
99
+ version: 12.0.3
100
100
  - - "<"
101
101
  - !ruby/object:Gem::Version
102
- version: '12'
102
+ version: '12.1'
103
103
  type: :runtime
104
104
  prerelease: false
105
105
  version_requirements: !ruby/object:Gem::Requirement
106
106
  requirements:
107
107
  - - ">="
108
108
  - !ruby/object:Gem::Version
109
- version: 11.18.2
109
+ version: 12.0.3
110
110
  - - "<"
111
111
  - !ruby/object:Gem::Version
112
- version: '12'
112
+ version: '12.1'
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: aws-sdk
115
115
  requirement: !ruby/object:Gem::Requirement
@@ -216,20 +216,20 @@ dependencies:
216
216
  requirements:
217
217
  - - ">="
218
218
  - !ruby/object:Gem::Version
219
- version: '1.6'
219
+ version: '1.7'
220
220
  - - "<"
221
221
  - !ruby/object:Gem::Version
222
- version: '1.7'
222
+ version: '1.8'
223
223
  type: :development
224
224
  prerelease: false
225
225
  version_requirements: !ruby/object:Gem::Requirement
226
226
  requirements:
227
227
  - - ">="
228
228
  - !ruby/object:Gem::Version
229
- version: '1.6'
229
+ version: '1.7'
230
230
  - - "<"
231
231
  - !ruby/object:Gem::Version
232
- version: '1.7'
232
+ version: '1.8'
233
233
  - !ruby/object:Gem::Dependency
234
234
  name: rake
235
235
  requirement: !ruby/object:Gem::Requirement