cicd-builder 0.9.31 → 0.9.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24bff76362b4ac67712f58f1710c3f0c7f748ca8
-  data.tar.gz: 5fc9dbdb1884e2aeccca385bd746cef7f59f063c
+  metadata.gz: 3d5b439d8599dc11343c4a867ba4395425a5bc2f
+  data.tar.gz: c179de346efe4964da6bfa8a88f11eb03fa52fad
 SHA512:
-  metadata.gz: 0f9b75acf5625746f41aaceba8ac0f3899e372be988d4c44c63f50fe2d160eb3fdda1a156dcc20ef216153ecc5db8852153327350b757cbc1e3dd82f9032f4d9
-  data.tar.gz: a6bf510790117d49aac48cc81ef6dbe0ec26fecb26907f7f72785500e2d6da47950065070866c7abadf5cc688fd9877a56ab382a18c3263bce67546d83421d96
+  metadata.gz: 48e143c0e1d50ab196f574b0fd7981b53dfc95d6ad7f4bcb9df48ce591b706c3c13de2ae19e80609b4944d002977091696c79f89df585945ec76b27306adca46
+  data.tar.gz: a5e8d8f8482081068b22d2e2412730514b8930847657fca4f8d1d2ecbd6960d3feb0b3e4a9066494adaa8fca88055bf82c542a913db0f74c2c0b840eb2295c4d

data/Gemfile.lock

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

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

@@ -9,6 +9,8 @@ module CiCd
 
       i = 10
       ARTIFACT_UPLOAD_EXCEPTION   = i+=1
+      ARTIFACT_NOT_UPLOADED       = i+=1
+      ARTIFACT_NOT_COPIED         = i+=1
       MAKEBUILD_EXCEPTION         = i+=1
       MAKEBUILD_PREPARATION       = i+=1
       MISSING_ENV_VAR             = i+=1

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

@@ -75,17 +75,15 @@ module CiCd
           end
           # matrix = properties.map{|k,v| (v.nil? or v.empty?) ? nil : "#{k}=#{v}"}.join("\;").gsub(%r'^\;*(.*?)\;*$', '\1')
           # @client.endpoint += ";#{matrix}"
-          manifest = {}
+          @manifest = {}
           artifacts.each{|art|
             data = art[:data]
-            objects = maybeArtifactoryObject(data)
-            upload = false
             if data.has_key?(:data)
               tempArtifactFile("manifest-#{data[:name]}", data)
             end
             if data.has_key?(:file)
-              sha1 = Digest::SHA1.file(data[:file]).hexdigest
-              md5  = Digest::MD5.file(data[:file]).hexdigest
+              data[:sha1] = Digest::SHA1.file(data[:file]).hexdigest
+              data[:md5]  = Digest::MD5.file(data[:file]).hexdigest
             else
               raise 'Artifact does not have file or data?'
             end
@@ -103,91 +101,156 @@ module CiCd
             if file_name =~ %r'\.+'
               raise "Unable to parse out file name in #{data[:file]}"
             end
-            unless file_name.empty? or file_name.match(%r'^-')
-              file_name = "-#{file_name}"
+            unless file_name.empty?
+              file_name = '_'+file_name.gsub(%r'^(\.|-|)(\w)', '\2').gsub(%r'(\.|-)+', '_')
             end
-            artifact_name = "#{data[:name]}-#{data[:version]}#{file_name}-#{@vars[:variant]}.#{file_ext}" # -#{data[:build]}
-            artifact_path = "#{artifactory_org_path()}/#{data[:name]}/#{data[:version]}-#{@vars[:variant]}/#{artifact_name}"
-            manifest[data[:name]] = artifact_path
-            if objects.nil? or objects.size == 0
-              upload = true
-            else
-              @logger.info "#{artifactory_endpoint()}/#{artifactory_repo()}/#{artifact_path} exists - #{objects.size} results"
-              # Check the checksum of the artifact
-              matched = false
-              objects.each do |artifact|
-                @logger.debug "\tChecking: #{artifact.attributes.ai} for #{artifact_path}"
-                if artifact.uri.match(%r'#{artifact_path}$')
-                  matched = true
-                  @logger.info "\tMatched: #{artifact.attributes.select{|k,_| k != :client}.ai}"
-                  if artifact.md5 != md5 or artifact.sha1 != sha1
-                    upload = true
-                  end
-                end
-              end
-              upload ||= (not matched)
+            maybeUploadArtifactoryObject(data, data[:name], data[:version] || @vars[:version], file_ext, file_name) # -#{@vars[:variant]
+            break unless @vars[:return_code] == 0
+          }
+          if @vars[:return_code] == 0
+            manifest_data = ''
+            @manifest.each do |k,v|
+              manifest_data += "#{k}=#{v}\n"
             end
+            data = { data: manifest_data, version: @vars[:build_ver], build: @vars[:build_num], properties: @properties_matrix }
+            tempArtifactFile('manifest', data)
+            data[:sha1] = Digest::SHA1.file(data[:file]).hexdigest
+            data[:md5 ] = Digest::MD5.file(data[:file]).hexdigest
+            data[:name] = artifactory_manifest_name
+            maybeUploadArtifactoryObject(data, artifactory_manifest_name, data[:version] || @vars[:version], 'properties', '') # -#{@vars[:variant]}
+          end
+          @vars[:return_code]
+        end
 
-            if upload
-              data[:properties] = @properties_matrix
-              uploadArtifact(artifact_path, data, md5, sha1)
-            else
-              @logger.info "Keep existing #{artifactory_endpoint()}/#{artifact_path}"
-            end
-            if data[:temp]
-              File.unlink(data[:file])
+        def maybeUploadArtifactoryObject(data, artifact_module, artifact_version, file_ext, file_name)
+          artifact_name = getArtifactName(data[:name], file_name, artifact_version, file_ext) # artifact_path = "#{artifactory_org_path()}/#{data[:name]}/#{data[:version]}-#{@vars[:variant]}/#{artifact_name}"
+          artifact_path = getArtifactPath(artifact_module, artifact_version, artifact_name)
+          objects = maybeArtifactoryObject(artifact_module, artifact_version, false)
+          upload = false
+          matched = []
+          if objects.nil? or objects.size == 0
+            upload = true
+          else
+            @logger.info "#{artifactory_endpoint()}/#{artifactory_repo()}/#{artifact_path} exists - #{objects.size} results"
+            @logger.info "\t#{objects.map{|o| o.attributes[:uri]}.join("\t")}"
+            matched = matchArtifactoryObjects(artifact_path, data, objects)
+            upload ||= (matched.size == 0)
+          end
+          if upload
+            properties_matrix = {}
+            data.select{|k,_| not k.to_s.eql?('file')}.each do |k,v|
+              properties_matrix["product.#{k}"] = v
             end
-          }
-          manifest_data = ''
-          manifest.each do |k,v|
-            manifest_data += "#{k}=#{v}\n"
+            data[:properties] = properties_matrix.merge(@properties_matrix)
+            objects = uploadArtifact(artifact_module, artifact_version, artifact_path, data)
+            matched = matchArtifactoryObjects(artifact_path, data, objects)
+          else
+            @logger.info "Keep existing #{matched.map{|o| o.attributes[:uri]}.join("\t")}"
           end
-          data = { data: manifest_data, version: @vars[:build_ver], build: @vars[:build_num], properties: @properties_matrix }
-          tempArtifactFile('manifest', data)
-          sha1 = Digest::SHA1.file(data[:file]).hexdigest
-          md5  = Digest::MD5.file(data[:file]).hexdigest
-          artifact_name = "#{artifactory_manifest_name}-#{data[:version]}-#{data[:variant]}.properties"
-          artifact_path = "#{artifactory_org_path()}/#{artifactory_manifest_module}/#{data[:version]}-#{@vars[:variant]}/#{artifact_name}"
-          uploadArtifact(artifact_path, data, md5, sha1)
           if data[:temp]
             File.unlink(data[:file])
           end
-          0
+          @vars[:return_code] = Errors::ARTIFACT_NOT_UPLOADED unless matched.size > 0
+          if @vars[:return_code] == 0
+            artifact_version += "-#{data[:build] || @vars[:build_num]}"
+            artifact_name = getArtifactName(artifact_module, file_name, artifact_version, file_ext, )
+            artifact_path = getArtifactPath(artifact_module, artifact_version, artifact_name)
+            copies  = maybeArtifactoryObject(artifact_module, artifact_version, false)
+            matched = matchArtifactoryObjects(artifact_path, data, copies)
+            upload  = (matched.size == 0)
+            if upload
+              objects.each do |artifact|
+                copied = copyArtifact(artifact_module, artifact_version, artifact_path, artifact)
+                unless copied.size > 0
+                  @vars[:return_code] = Errors::ARTIFACT_NOT_COPIED
+                  break
+                end
+              end
+            else
+              @logger.info "Keep existing #{matched.map{|o| o.attributes[:uri]}.join("\t")}"
+            end
+            @manifest[data[:name]] = artifact_version
+          end
+
+          @vars[:return_code]
+        end
+
+        def matchArtifactoryObjects(artifact_path, data, objects)
+          # matched = false
+          objects.select do |artifact|
+            @logger.debug "\tChecking: #{artifact.attributes.ai} for #{artifact_path}"
+            # if artifact.uri.match(%r'#{artifact_path}$')
+            #   @logger.info "\tMatched: #{artifact.attributes.select { |k, _| k != :client }.ai}"
+            # end
+            matched = (artifact.md5.eql?(data[:md5]) or artifact.sha1.eql?(data[:sha1]))
+            matched
+          end
+        end
+
+        def getArtifactPath(artifact_module, artifact_version, artifact_name)
+          artifact_path = "#{artifactory_org_path()}/#{artifact_module}/#{artifact_version}/#{artifact_name}"
         end
 
-        def uploadArtifact(artifact_path, data, md5, sha1)
+        def getArtifactName(name, file_name, artifact_version, file_ext)
+          artifact_name = "#{name}#{artifact_version.empty? ? '' : "-#{artifact_version}"}.#{file_ext}" # #{file_name}
+        end
+
+        # ---------------------------------------------------------------------------------------------------------------
+        def maybeArtifactoryObject(artifact_name,artifact_version,wide=true)
+          begin
+            # Get a list of matching artifacts in this repository
+            result = @client.artifact_gavc_search(group: artifactory_org_path(), name: artifact_name, version: "#{artifact_version}", repos: [artifactory_repo()])
+            if result.size > 0
+              @logger.info "Artifactory gavc_search match g=#{artifactory_org_path()},a=#{artifact_name},v=#{artifact_version},r=#{artifactory_repo()}: #{result}"
+              # raise "GAVC started working: #{result.ai}"
+            elsif wide
+              @logger.warn 'GAVC search came up empty!'
+              result = @client.artifact_search(name: artifact_name, repos: [artifactory_repo()])
+              @logger.info "Artifactory search match a=#{artifact_name},r=#{artifactory_repo()}: #{result}"
+            end
+            result
+          rescue Exception => e
+            @logger.error "Artifactory error: #{e.class.name} #{e.message}"
+            raise e
+          end
+        end
+
+        def uploadArtifact(artifact_module, artifact_version, artifact_path, data)
           data[:size] = File.size(data[:file])
-          @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Start upload #{artifact_path} = #{data[:size]} bytes"
           artifact = ::Artifactory::Resource::Artifact.new(local_path: data[:file], client: @client)
           # noinspection RubyStringKeysInHashInspection
           artifact.checksums =  {
-                                'md5'   => md5,
-                                'sha1'  => sha1
+                                'md5'   => data[:md5],
+                                'sha1'  => data[:sha1],
                                 }
           artifact.size = data[:size]
+          @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Start upload #{artifact_path} = #{data[:size]} bytes"
           result = artifact.upload(artifactory_repo(), "#{artifact_path}", data[:properties] || {})
           @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Uploaded: #{result.attributes.select { |k, _| k != :client }.ai}"
-          artifact.upload_checksum(artifactory_repo(), "#{artifact_path}", :sha1, sha1)
-          artifact.upload_checksum(artifactory_repo(), "#{artifact_path}", :md5, md5)
-          objects = maybeArtifactoryObject(data, false)
+          artifact.upload_checksum(artifactory_repo(), "#{artifact_path}", :sha1, data[:sha1])
+          artifact.upload_checksum(artifactory_repo(), "#{artifact_path}", :md5,  data[:md5])
+          objects = maybeArtifactoryObject(artifact_module, artifact_version, false)
+          unless objects.size > 0
+            objects = maybeArtifactoryObject(artifact_module, artifact_version, true)
+          end
           raise "Failed to upload '#{artifact_path}'" unless objects.size > 0
+          objects
         end
 
-        def maybeArtifactoryObject(data,wide=true)
+        def copyArtifact(artifact_module, artifact_version, artifact_path, artifact)
           begin
-            # Get a list of matching artifacts in this repository
-            result = @client.artifact_gavc_search(group: artifactory_org_path(), name: data[:name], version: "#{data[:version]}-#{@vars[:variant]}", repos: [artifactory_repo()])
-            if result.size > 0
-              @logger.info "Artifactory gavc_search match g=#{artifactory_org_path()},a=#{data[:name]},v=#{data[:version]}-#{@vars[:variant]},r=#{artifactory_repo()}: #{result}"
-              # raise "GAVC started working: #{result.ai}"
-            elsif wide
-              @logger.warn 'GAVC search came up empty!'
-              result = @client.artifact_search(name: data[:name], repos: [artifactory_repo()])
-              @logger.info "Artifactory search match a=#{data[:name]},r=#{artifactory_repo()}: #{result}"
+            if artifact.attributes[:uri].eql?(File.join(artifactory_endpoint, artifactory_repo, artifact_path))
+              @logger.info "Not copying (identical artifact): #{artifact_path}"
+            else
+              @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Start copy #{artifact_path} = #{artifact.attributes[:size]} bytes"
+              result = artifact.copy("#{artifactory_repo()}/#{artifact_path}")
+              @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Copied: #{result.ai}"
             end
-            result
+            objects = maybeArtifactoryObject(artifact_module, artifact_version, false)
+            raise "Failed to copy '#{artifact_path}'" unless objects.size > 0
+            objects
           rescue Exception => e
-            @logger.error "Artifactory error: #{e.class.name} #{e.message}"
+            @logger.error "Failed to copy #{artifact_path}: #{e.class.name} #{e.message}"
             raise e
           end
         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.31'
+		version = '0.9.32'
 		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.31
+  version: 0.9.32
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print