cicd-builder 0.9.32 → 0.9.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d5b439d8599dc11343c4a867ba4395425a5bc2f
-  data.tar.gz: c179de346efe4964da6bfa8a88f11eb03fa52fad
+  metadata.gz: 75d36cb9025cf66cd01e307a37d1b8459a97a5cf
+  data.tar.gz: 9d82387d840c35215a7cd37102e4e84908ec78fc
 SHA512:
-  metadata.gz: 48e143c0e1d50ab196f574b0fd7981b53dfc95d6ad7f4bcb9df48ce591b706c3c13de2ae19e80609b4944d002977091696c79f89df585945ec76b27306adca46
-  data.tar.gz: a5e8d8f8482081068b22d2e2412730514b8930847657fca4f8d1d2ecbd6960d3feb0b3e4a9066494adaa8fca88055bf82c542a913db0f74c2c0b840eb2295c4d
+  metadata.gz: 0d77cf39a842a06f50dcc6c11b9e4c1a53ceb3e24a897bc8fea6db807427ef87d05563e8a3718d867148c0610f9b158fc67f1bd65c7057848759084bbbe0fc28
+  data.tar.gz: b7b47af6df74ee2ab3633e94fa93bb9b6d0849bb6b1bb1cb86c1cb46dbba6fe6ae45bad774f34461f2b55a1acc1e6d5002e6401f7f0985597c2168ec83c1e081

data/Gemfile.lock

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

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

@@ -51,7 +51,7 @@ module CiCd
 					# }
 					ini = IniFile.load(@options[:inifile])
 					ini['global'].each{ |key,value|
-						ENV[key]=value
+						ENV[key]=value.to_s
 					}
 					def _expand(k,v,regex,rerun)
 						matches = v.match(regex)

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

@@ -87,41 +87,63 @@ module CiCd
             else
               raise 'Artifact does not have file or data?'
             end
-            file_name    = File.basename(data[:file])
-            if file_name =~ %r'^#{data[:name]}'
-              file_name.gsub!(%r'^#{data[:name]}\.*','')
-            end
-            file_name.gsub!(%r'\.*-*#{data[:version]}','')
-            file_name.gsub!(%r'\.*-*#{data[:build]}-*','')
-            file_ext      = file_name.dup
-            file_ext.gsub!(%r'^.*?\.*(tar\.gz|tgz|tar\.bzip2|bzip2|tar\.bz2|bz2|jar|war|groovy)$','\1')
-            unless file_ext.empty?
-              file_name.gsub!(%r'\.*#{file_ext}$','')
-            end
+            file_name, file_ext = get_artifact_file_name_ext(data)
             if file_name =~ %r'\.+'
               raise "Unable to parse out file name in #{data[:file]}"
             end
             unless file_name.empty?
               file_name = '_'+file_name.gsub(%r'^(\.|-|)(\w)', '\2').gsub(%r'(\.|-)+', '_')
             end
-            maybeUploadArtifactoryObject(data, data[:name], data[:version] || @vars[:version], file_ext, file_name) # -#{@vars[:variant]
+            maybeUploadArtifactoryObject(data, data[:module], data[:version] || @vars[:version], file_ext, file_name) # -#{@vars[:variant]
             break unless @vars[:return_code] == 0
           }
           if @vars[:return_code] == 0
+            manifest = @manifest.dup
+            manifest.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)
+              data[:sha1] = Digest::SHA1.file(data[:file]).hexdigest
+              data[:md5 ] = Digest::MD5.file(data[:file]).hexdigest
+              data[:name] = "#{mod}-manifest"
+              maybeUploadArtifactoryObject(data, data[:name], data[:version] || @vars[:version], 'properties', '') # -#{@vars[:variant]}
+            end
             manifest_data = ''
-            @manifest.each do |k,v|
-              manifest_data += "#{k}=#{v}\n"
+            manifest.each do |mod,man|
+              man.each do |k,v|
+                manifest_data += "#{k}=#{v}\n"
+              end
             end
-            data = { data: manifest_data, version: @vars[:build_ver], build: @vars[:build_num], properties: @properties_matrix }
-            tempArtifactFile('manifest', data)
+            amn = artifactory_manifest_name # Just using a local iso invoking method_missing repeatedly ... ;)
+            data = { module: amn, data: manifest_data, version: @vars[:build_ver], build: @vars[:build_num], properties: @properties_matrix }
+            tempArtifactFile(amn, 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]}
+            data[:name] = amn
+            maybeUploadArtifactoryObject(data, amn, data[:version] || @vars[:version], 'properties', '') # -#{@vars[:variant]}
+            @manifest = manifest
           end
           @vars[:return_code]
         end
 
+        def get_artifact_file_name_ext(data)
+          file_name = File.basename(data[:file])
+          if file_name =~ %r'^#{data[:name]}'
+            file_name.gsub!(%r'^#{data[:name]}\.*', '')
+          end
+          file_name.gsub!(%r'\.*-*#{data[:version]}', '')
+          file_name.gsub!(%r'\.*-*#{data[:build]}-*', '')
+          file_ext = file_name.dup
+          file_ext.gsub!(%r'^.*?\.*(tar\.gz|tgz|tar\.bzip2|bzip2|tar\.bz2|bz2|zip|jar|war|groovy)$', '\1')
+          unless file_ext.empty?
+            file_name.gsub!(%r'\.*#{file_ext}$', '')
+          end
+          return file_name, file_ext
+        end
+
         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)
@@ -132,7 +154,7 @@ module CiCd
             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")}"
+            @logger.info "\t#{objects.map{|o| o.attributes[:uri]}.join("\n\t")}"
             matched = matchArtifactoryObjects(artifact_path, data, objects)
             upload ||= (matched.size == 0)
           end
@@ -148,12 +170,16 @@ module CiCd
             @logger.info "Keep existing #{matched.map{|o| o.attributes[:uri]}.join("\t")}"
           end
           if data[:temp]
-            File.unlink(data[:file])
+            if File.exists?(data[:file])
+              File.unlink(data[:file]) if File.exists?(data[:file])
+            else
+              @logger.warn "Temporary file disappeared: #{data.ai}"
+            end
           end
           @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_name = getArtifactName(data[:name], 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)
@@ -169,7 +195,18 @@ module CiCd
             else
               @logger.info "Keep existing #{matched.map{|o| o.attributes[:uri]}.join("\t")}"
             end
-            @manifest[data[:name]] = artifact_version
+            if @manifest[artifact_module].nil?
+              @manifest[artifact_module] = {}
+              file_name = artifact_module
+            else
+              file_name, _ = get_artifact_file_name_ext(data)
+              if file_name.empty?
+                file_name = artifact_module
+              else
+                file_name = "#{artifact_module}#{file_name}"
+              end
+            end
+            @manifest[artifact_module][file_name] = artifact_version
           end
 
           @vars[:return_code]
@@ -229,9 +266,13 @@ module CiCd
           @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, 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)
+          attempt = 0
+          objects = []
+          while attempt < 3
+            objects = maybeArtifactoryObject(artifact_module, artifact_version, false)
+            break if objects.size > 0
+            sleep 2
+            attempt += 1
           end
           raise "Failed to upload '#{artifact_path}'" unless objects.size > 0
           objects
@@ -247,7 +288,11 @@ module CiCd
               @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Copied: #{result.ai}"
             end
             objects = maybeArtifactoryObject(artifact_module, artifact_version, false)
-            raise "Failed to copy '#{artifact_path}'" unless objects.size > 0
+            unless objects.size > 0
+              sleep 10
+              objects = maybeArtifactoryObject(artifact_module, artifact_version, false)
+              raise "Failed to copy '#{artifact_path}'" unless objects.size > 0
+            end
             objects
           rescue Exception => e
             @logger.error "Failed to copy #{artifact_path}: #{e.class.name} #{e.message}"

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.32'
+		version = '0.9.33'
 		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.32
+  version: 0.9.33
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print