manifest-builder 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30bff789db9b1ab8316a02a4f0f12b807e9bd4c
-  data.tar.gz: 83b92f15ed2631a611dbac26aabf1836c9f8b8c0
+  metadata.gz: d7f35603ac6d0d6fb71733c6dc49a3c7e46e18c4
+  data.tar.gz: 3311cad15c989561e4fa4d4588f392383a3e0799
 SHA512:
-  metadata.gz: a954e56f8b88ddc4896cebeb21c378aafe0a1ef243ab74d0878cbf528e14025c9194cb9185be179d3d6be85a7b6aa023c099383919d90da163c757b3b8f83f17
-  data.tar.gz: 60047d01a82f690bc553df5b0bacd118eaa46c02a39f14a54fcfd4cedab35222e8f39a68f0c4ffde13cb9dce92a2e31c68f687a4cb4f0fd768f7fffcc39fe92e
+  metadata.gz: 866f1705ee32bc3e6d3f29926d198fdb3773cb113a190e7c97302b5a0da9f694762db2b99047d18b5f1428d5eed530102b3e861ab8b47be858bec9c1d1ed89b2
+  data.tar.gz: 53ace6f8c02f8d376db38cf046378655ddffe1397cdbc0c51db7b668e4e456270d3559585f7d0f714d80f2397aefa0ca7d380e0596c31feeb2db56dd42779ea6

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    manifest-builder (0.7.2)
+    manifest-builder (0.7.3)
       archive-tar-minitar (= 0.5.2)
-      chefrepo-builder (>= 0.9.41, < 1.1)
+      chefrepo-builder (>= 0.9.43, < 1.1)
       json (>= 1.8.1, < 1.9)
       s3etag (>= 0.0.1, < 0.1.0)
 
 PATH
   remote: ../chefrepo-builder
   specs:
-    chefrepo-builder (0.9.41)
-      cicd-builder (>= 0.9.62, < 1.1)
+    chefrepo-builder (0.9.43)
+      cicd-builder (>= 0.9.63, < 1.1)
       json (= 1.8.1)
 
 PATH
   remote: ../cicd-builder
   specs:
-    cicd-builder (0.9.62)
+    cicd-builder (0.9.63)
       artifactory (>= 2.2.1, < 2.3)
       awesome_print (>= 1.6, < 2.0)
       aws-sdk (>= 2.0, < 2.1)

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

@@ -261,7 +261,7 @@ module CiCd
                   end
                 end
                 if 0 == @vars[:return_code]
-                  local = getLocalArtifact(artifacts, changed, comp, local_dir, version)
+                  local = getLocalArtifact(artifacts, changed, comp, local_dir, version, build)
                   base = File.basename(local)
                   addArtifact(@vars[:artifacts], local, local_dir, {
                                                                        component: cname,
@@ -349,11 +349,11 @@ module CiCd
         end
 
         # ---------------------------------------------------------------------------------------------------------------
-        def getLocalArtifact(artifacts, changed, comp, local_dir, version)
+        def getLocalArtifact(artifacts, changed, comp, local_dir, version, build)
           cname,cdata = comp
           if artifacts.size > 1
             begin
-              file = File.join(local_dir, "#{cname}-#{version}.zip")
+              file = File.join(local_dir, "#{cname}-#{version}-#{build}.zip")
               if changed or not File.exists?(file)
                 zipped_files = artifacts.map { |f| f.gsub(%r'^#{local_dir}', '') }.join(' ')
                 Dir.chdir(local_dir) do

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

@@ -19,10 +19,12 @@ module CiCd
           def uploadToRepo(artifacts)
             @manifest = {}
             super
-            handleManifests()
-            # If we are asked to produce a PROJECTS_FILE then we do that from the manifest and components.
-            handleProjectsFile()
-            cleanupTempFiles()
+            if @vars[:return_code] == 0
+              handleManifests()
+              # If we are asked to produce a PROJECTS_FILE then we do that from the manifest and components.
+              handleProjectsFile()
+              cleanupTempFiles()
+            end
             @vars[:return_code]
           end
 

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

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

data/manifest-builder.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'chefrepo-builder', '>= 0.9.41', '< 1.1'
+  gem.add_dependency 'chefrepo-builder', '>= 0.9.43', '< 1.1'
   gem.add_dependency 'json', '>= 1.8.1', '< 1.9'
   gem.add_dependency 's3etag', '>= 0.0.1', '< 0.1.0'
   gem.add_dependency 'archive-tar-minitar', '= 0.5.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manifest-builder
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Christo De Lange
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.41
+        version: 0.9.43
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.41
+        version: 0.9.43
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'