cicd-builder 0.9.39 → 0.9.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 427d7e067931f7a957d202d109adda34eefc9174
-  data.tar.gz: b2066706ce2657e5c63e196e6728b65ddcd43487
+  metadata.gz: 18260696b0b012ac7829365baf9563565d756772
+  data.tar.gz: 3f62a59b205626956a73875be89bd1ef52b5ba2e
 SHA512:
-  metadata.gz: f6cabfe0f0da509dd798ca359d4591182be418617d8cc8e2e5d8f6e43de2035063eca7a30f25a324109bc5e5412d8ea16fc8a7c179caad6dd8eaeaa76788238a
-  data.tar.gz: 63fcbf4b39d8fdb15decfef21322d9e7946a257e22160bb91ba455dcedc25b719727dbdb91c9f918d230ea5c9a08228a532496ba57855b2e15a87efa6bfff27f
+  metadata.gz: 35e767175775594fa15a1156b54e6d33fa521ab23d2002ed97b1de252a4d171a5f5caf428f39c8f5809b52b008d81c3aaf43ee2775104a9d979ad6934ef6e7d4
+  data.tar.gz: 3257f84bf9bbd4a24346cc6d106f3a602815a039d380b5d4cff0a1f2cb88d64abe5c48ce6204b12a32f8cf596f504cac54508f9fd2679051f4ce6742b973a804

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cicd-builder (0.9.39)
+    cicd-builder (0.9.40)
       artifactory (>= 2.2.1, < 2.3)
       awesome_print (>= 1.6, < 2.0)
       aws-sdk (>= 2.0, < 2.1)

data/lib/cicd/builder/mixlib/build.rb

@@ -180,6 +180,7 @@ module CiCd
         stat = File.stat(local)
         size = stat.size
       end
+      @logger.debug "Calculate etag to match #{etag}"
       match = etag.match(%r'-(\d+)$')
       check = if match
                 require 's3etag'
@@ -189,13 +190,16 @@ module CiCd
                 part_size = mbs * 1024 * 1024
                 chkit = S3Etag.calc(file: local, threshold: part_size, min_part_size: part_size, max_parts: parts)
                 @logger.debug "S3Etag Calculated #{chkit} : (#{size} / #{part_size}) <= #{parts}"
-                while chkit != etag and (size / part_size) <= parts
+                chunks = size / part_size
+                while chkit != etag and chunks <= parts and chunks > 0 and (size > part_size)
                   # Go one larger if a modulus remains and we have the right number of parts
                   mbs += 1
                   part_size = mbs * 1024 * 1024
+                  chunks = size.to_f / part_size
                   chkit = S3Etag.calc(file: local, threshold: part_size, min_part_size: part_size, max_parts: parts)
                   @logger.debug "S3Etag Calculated #{chkit} : (#{size} / #{part_size}) <= #{parts}"
                 end
+                raise "Unable to match etag #{etag}!" if chkit != etag
                 chkit
               else
                 Digest::MD5.file(local).hexdigest

data/lib/cicd/builder/version.rb

@@ -4,7 +4,7 @@ module CiCd
 		# file    = File.expand_path("#{File.dirname(__FILE__)}/../../../VERSION")
 		# lines   = File.readlines(file)
 		# version = lines[0]
-		version = '0.9.39'
+		version = '0.9.40'
 		VERSION = version unless const_defined?('VERSION')
 		major, minor, tiny = VERSION.split('.')
 		MAJOR   = major unless const_defined?('MAJOR')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cicd-builder
 version: !ruby/object:Gem::Version
-  version: 0.9.39
+  version: 0.9.40
 platform: ruby
 authors:
 - Christo De Lange