manifest-builder 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f64453fb19e30cbd7065f1b958724c4ba5ae1ba6
-  data.tar.gz: 6c5e2f18acbffd7f46b3b1cae785ce172c0422db
+  metadata.gz: 5fca672bc384323782ececfc914b4aad61b66e6e
+  data.tar.gz: 361f062381aa0c5725298087193aefd0ec13a18e
 SHA512:
-  metadata.gz: 742e68dcdf78eaac4efda5e1616d9702f99857bd8075b0366951d14f2ca7fa47cc85f24e8059d925064aab04052bd23d1cdadb7ef6d71d3deb31381b40753168
-  data.tar.gz: 89c2af981a892260f5126e64b9bd31e286cbe35c7414b06d719b4f7c3ac091c947a70e188b967a9c483625e5061d8a081b312c062e3b28ac0ad7a982a7c42453
+  metadata.gz: df05492e33d0542fb90fd4b803735e7b3729cbabf0822ae5ec965993d012b679b9f3c9a8ce64f296fa32691c4a484094530a9174abbebff51396196fa9356c37
+  data.tar.gz: 992e851fe4f11a89b2a5794195e954313ecba00e07f1a7ba95dcb6e883cc414f41b84b88ba9e8ab05de3e10906e5534da2616b07c241deacf35541753768cea4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    manifest-builder (0.5.5)
+    manifest-builder (0.5.6)
       archive-tar-minitar (= 0.5.2)
       chefrepo-builder (>= 0.9.27, < 1.1)
       cicd-builder (>= 0.9.38, < 1.1)

data/lib/cicd/builder/manifest/mixlib/repo/artifactory.rb

@@ -38,6 +38,18 @@ module CiCd
                 end
               end
             end
+            @vars[:artifacts].each do |art|
+              if art[:data][:temp].is_a?(FalseClass)
+                if File.exists?(art[:data][:file])
+                  File.unlink(art[:data][:file]) if File.exists?(art[:data][:file])
+                  art[:data].delete(:file)
+                  art[:data].delete(:temp)
+                else
+                  @logger.warn "Temporary file disappeared: #{data.ai}"
+                  @vars[:return_code] = Errors::TEMP_FILE_MISSING
+                end
+              end
+            end
             @vars[:return_code]
           end
 
@@ -87,16 +99,14 @@ module CiCd
               opts = perm
             end + '.properties'
             IO.write(data[:file], data[:data])
-
+            data[:temp] = false
             data[:sha1] = Digest::SHA1.file(data[:file]).hexdigest
-            data[:md5] = Digest::MD5.file(data[:file]).hexdigest
+            data[:md5]  = Digest::MD5.file(data[:file]).hexdigest
             data[:name] = amn
-            # data[:temp] = false
-            # @builder.addArtifact(@vars[:artifacts], local, local_dir, {module: comp[0], name: comp[0], build: build, version: version, file: local})
-            @vars[:artifacts].unshift({
-                                        key: amn,
-                                       data: data.dup,
-                                      })
+            @vars[:artifacts] << {
+                                    key: amn,
+                                   data: data.dup,
+                                 }
             manifest[amn]={ amn => "#{@vars[:build_ver]}-#{@vars[:build_num]}" }
 
             maybeUploadArtifactoryObject(data: data, artifact_module: amn, artifact_version: data[:version] || @vars[:version], file_name: '', file_ext: 'properties')
@@ -104,16 +114,31 @@ module CiCd
 
           # ---------------------------------------------------------------------------------------------------------------
           def createProductManifests(manifest)
-            manifest.each do |mod, man|
+            manifest.dup.each do |mod, man|
               manifest_data = ''
               man.each do |k, v|
                 manifest_data += "#{k}=#{v}\n"
               end
               data = {module: mod, data: manifest_data, version: @vars[:build_ver], build: @vars[:build_num], properties: @properties_matrix}
-              tempArtifactFile("#{mod}-manifest", data)
+              # tempArtifactFile("#{mod}-manifest", data)
+
+              data[:file] = Dir::Tmpname.create("#{mod}-manifest") do |tmpnam, n, opts|
+                mode = File::RDWR|File::CREAT|File::EXCL
+                perm = 0600
+                opts = perm
+              end + '.properties'
+              IO.write(data[:file], data[:data])
+              data[:temp] = false
               data[:sha1] = Digest::SHA1.file(data[:file]).hexdigest
-              data[:md5] = Digest::MD5.file(data[:file]).hexdigest
+              data[:md5]  = Digest::MD5.file(data[:file]).hexdigest
               data[:name] = "#{mod}-manifest"
+              @vars[:artifacts] << {
+                                       key: "#{mod}-manifest",
+                                      data: data.dup,
+                                   }
+              # noinspection RubyStringKeysInHashInspection
+              manifest["#{mod}-manifest"]={ "#{mod}-manifest" => "#{@vars[:build_ver]}-#{@vars[:build_num]}" }
+
               maybeUploadArtifactoryObject(data: data, artifact_module: data[:name], artifact_version: data[:version] || @vars[:version], file_name: '', file_ext: 'properties') # -#{@vars[:variant]}
             end
           end

data/lib/cicd/builder/manifest/version.rb

@@ -2,7 +2,7 @@ module CiCd
   module Builder
     module Manifest
       # manifest-builder version
-      VERSION = '0.5.5'
+      VERSION = '0.5.6'
       MAJOR, MINOR, TINY = VERSION.split('.')
       PATCH = TINY
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manifest-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Christo De Lange