cicd-builder 0.9.62 → 0.9.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9f762dfe4a6bf7cb39d6fe1dde6a0975fb27db3
-  data.tar.gz: 0b32e2b4a2eea3eb9b630e94e1dd643c0128321d
+  metadata.gz: cbcaaea56aeb6d58f0c6619e14c97ada2f896edb
+  data.tar.gz: 7155296c173631359b1fd1b9b52582af4dc5998c
 SHA512:
-  metadata.gz: 7c9a6463ebc0d75ff2498dbfa4f9a1e2702920e963ca2cc0a58853e0723b8827de16c67a27eb58c64fc8bff6ad57c324b672fe0a8c052237ee04bdb05a19a5f0
-  data.tar.gz: 4b5230a04e1781dac45f29fa60aa5beeff34ccf8e607801ca55ff96baeb59cbc566f59eb4b941bbfbac9dd40a9e24a612d4d53ab81db27f25f7d57f91a8da383
+  metadata.gz: fc2f8a8a8ee4e7252ba7f38cc2f8985f1a7d65ba1f0baafff162497b880bab4d2f09875f75bb2f1490c56ea2437329ac2c87bd2e248ad1143a88a8fd880e696b
+  data.tar.gz: 6ecc482d13efe1ff3b3459739de14a6939ab10a4b04ef2c5b106ff83eb238a793e7c26e8191387dae284fe822d3c3540e23b9a67dd3c965e3423095b6aeefa72

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   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)
@@ -20,14 +20,14 @@ GEM
   specs:
     artifactory (2.2.1)
     awesome_print (1.6.1)
-    aws-sdk (2.0.41)
-      aws-sdk-resources (= 2.0.41)
-    aws-sdk-core (2.0.41)
+    aws-sdk (2.0.42)
+      aws-sdk-resources (= 2.0.42)
+    aws-sdk-core (2.0.42)
       builder (~> 3.0)
       jmespath (~> 1.0)
       multi_json (~> 1.0)
-    aws-sdk-resources (2.0.41)
-      aws-sdk-core (= 2.0.41)
+    aws-sdk-resources (2.0.42)
+      aws-sdk-core (= 2.0.42)
     builder (3.2.2)
     chef (12.0.3)
       chef-zero (~> 3.2)
@@ -112,7 +112,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.0)
+    rack (1.6.1)
     rake (10.3.2)
     ruby-progressbar (1.7.5)
     rubygems-tasks (0.2.4)

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

@@ -209,14 +209,25 @@ module CiCd
             matched = matchArtifactoryObjects(artifact_path, data, objects)
             upload ||= (matched.size == 0)
           end
+          properties_matrix = {}
+          data.select{|k,_| not k.to_s.match(%r'^file')}.each do |k,v|
+            properties_matrix["product.#{k}"] = v
+          end
+          data[:properties] = properties_matrix.merge(@properties_matrix)
           if upload
-            properties_matrix = {}
-            data.select{|k,_| not k.to_s.eql?('file')}.each do |k,v|
-              properties_matrix["product.#{k}"] = v
-            end
-            data[:properties] = properties_matrix.merge(@properties_matrix)
             objects = uploadArtifact(artifact_module, artifact_version, artifact_path, data, args[:repo])
             matched = matchArtifactoryObjects(artifact_path, data, objects)
+            properties = matched.map{ |artifact|
+              artifact.properties
+            }
+            @logger.info "Matched artifacts properties: #{properties.ai}"
+            matched.each { |match|
+              artifact = ::Artifactory::Resource::Artifact.from_url(match.uri, client: @client)
+              unless artifact.uri =~ %r'#{data[:properties]['product.version']}/'
+                @logger.error "Artifact uploaded #{artifact_module}/#{artifact_version} to #{match.uri} does not contain #{data[:properties]['product.version']}/"
+                @vars[:return_code] = Errors::ARTIFACT_NOT_UPLOADED
+              end
+            }
           else
             @logger.info "Keep existing #{matched.map{|o| o.attributes[:uri]}.join("\t")}"
           end
@@ -238,13 +249,28 @@ module CiCd
             matched = matchArtifactoryObjects(artifact_path, data, copies)
             upload  = (matched.size == 0)
             if upload
+              copies = []
               objects.each do |artifact|
                 copied = copyArtifact(artifact_module, artifact_version, artifact_path, artifact, args[:repo])
                 unless copied.size > 0
                   @vars[:return_code] = Errors::ARTIFACT_NOT_COPIED
                   break
                 end
+                copies << copied
               end
+              copies.flatten!
+              matched = matchArtifactoryObjects(artifact_path, data, copies)
+              properties = matched.map{ |artifact|
+                artifact.properties
+              }
+              @logger.info "Matched artifacts properties: #{properties.ai}"
+              matched.each { |match|
+                artifact = ::Artifactory::Resource::Artifact.from_url(match.uri, client: @client)
+                unless artifact.uri =~ %r'#{data[:properties]['product.version']}-#{data[:properties]['product.build']}/'
+                  @logger.error "Artifact uploaded #{artifact_module}/#{artifact_version} to #{match.uri} does not contain #{data[:properties]['product.version']}-#{data[:properties]['product.version']}/"
+                  @vars[:return_code] = Errors::ARTIFACT_NOT_UPLOADED
+                end
+              }
             else
               @logger.info "Keep existing #{matched.map{|o| o.attributes[:uri]}.join("\t")}"
             end

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.62'
+		version = '0.9.63'
 		VERSION = version unless const_defined?('VERSION')
 		major, minor, tiny = VERSION.split('.')
 		MAJOR   = major unless const_defined?('MAJOR')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cicd-builder
 version: !ruby/object:Gem::Version
-  version: 0.9.62
+  version: 0.9.63
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print