manifest-builder 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fca672bc384323782ececfc914b4aad61b66e6e
-  data.tar.gz: 361f062381aa0c5725298087193aefd0ec13a18e
+  metadata.gz: 95e147aba1f376b4b337040e53f40e87467c8a65
+  data.tar.gz: 8bbffe5a8e5a26d32b7fd69a5724d39b16bab530
 SHA512:
-  metadata.gz: df05492e33d0542fb90fd4b803735e7b3729cbabf0822ae5ec965993d012b679b9f3c9a8ce64f296fa32691c4a484094530a9174abbebff51396196fa9356c37
-  data.tar.gz: 992e851fe4f11a89b2a5794195e954313ecba00e07f1a7ba95dcb6e883cc414f41b84b88ba9e8ab05de3e10906e5534da2616b07c241deacf35541753768cea4
+  metadata.gz: 69b4123af234dba7578882ac48e563a59b72c86f450ac77f0c3db9e86df003fd9c66754ba0e605469c9d089cf8d4cd0fc9293c608a8a2adb67cf67bc861c24ad
+  data.tar.gz: 59ff919e6bb0c17aa29f8ce65921c536f4c138498a985de1a7d02c8d80c98e72548e4777d55aff9d174cbe0891e6ec218487a9e72acf04433cb41b4f1cf8df94

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    manifest-builder (0.5.6)
+    manifest-builder (0.5.7)
       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

@@ -67,16 +67,17 @@ module CiCd
                 @vars[:return_code] = Errors::NO_PROJECT_NAMES
               end
             end
+            exts = {}
             exts = Hash[@vars[:artifacts].map { |a| [a[:data][:name], File.basename(a[:data][:file]).match(CiCd::Builder::Manifest::Build::EXT_RGX)[1]] }]
-            @manifest.each do |mod, man|
-              man.each do |prod, build|
-                projects[prod] = {
-                    name: project_names[prod] || prod,
-                    module: mod,
-                    ext: exts[prod],
-                    class_filter: '',
-                }
-              end
+            @vars[:artifacts].each do |art|
+              prod = art[:data][:name]
+              mod  = art[:data][:module]
+              projects[prod] = {
+                  name: project_names[prod] || prod,
+                  module: mod,
+                  ext: exts[prod],
+                  class_filter: '',
+              }
             end
             @logger.info "Save PROJECTS_FILE: #{ENV['PROJECTS_FILE']}"
             IO.write(ENV['PROJECTS_FILE'], JSON.pretty_generate(projects, {indent: "\t", space: ' '}))
@@ -107,7 +108,7 @@ module CiCd
                                     key: amn,
                                    data: data.dup,
                                  }
-            manifest[amn]={ amn => "#{@vars[:build_ver]}-#{@vars[:build_num]}" }
+            # 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')
           end
@@ -137,7 +138,7 @@ module CiCd
                                       data: data.dup,
                                    }
               # noinspection RubyStringKeysInHashInspection
-              manifest["#{mod}-manifest"]={ "#{mod}-manifest" => "#{@vars[:build_ver]}-#{@vars[:build_num]}" }
+              # 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

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

@@ -2,7 +2,7 @@ module CiCd
   module Builder
     module Manifest
       # manifest-builder version
-      VERSION = '0.5.6'
+      VERSION = '0.5.7'
       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.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Christo De Lange