cicd-builder 0.9.33 → 0.9.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75d36cb9025cf66cd01e307a37d1b8459a97a5cf
-  data.tar.gz: 9d82387d840c35215a7cd37102e4e84908ec78fc
+  metadata.gz: 0275855a5cc4233aa1bf72a8092e773ceb71faa9
+  data.tar.gz: 3c0c67c3e9a8c493d410af11236eb8611666bdc8
 SHA512:
-  metadata.gz: 0d77cf39a842a06f50dcc6c11b9e4c1a53ceb3e24a897bc8fea6db807427ef87d05563e8a3718d867148c0610f9b158fc67f1bd65c7057848759084bbbe0fc28
-  data.tar.gz: b7b47af6df74ee2ab3633e94fa93bb9b6d0849bb6b1bb1cb86c1cb46dbba6fe6ae45bad774f34461f2b55a1acc1e6d5002e6401f7f0985597c2168ec83c1e081
+  metadata.gz: c85c6478bf10a199d0401777194fb4900155bb6c3e06fa8d6468466aeaab58e2181d927da227ec17ad4b8f74378478afff5f1c0a6df170e1e99293712508fa5a
+  data.tar.gz: 4511c916fdef1e8f83a8fbabfd4b45d4901c1f654147e94fced3b7191e695cc3d7aeff615b7f8563c10d689542093bfff863f19ae425b64002b9e51d5b8b5775

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cicd-builder (0.9.33)
+    cicd-builder (0.9.35)
       artifactory (>= 2.2.1, < 2.3)
       awesome_print (>= 1.6, < 2.0)
       aws-sdk (>= 2.0, < 2.1)
@@ -18,15 +18,15 @@ GEM
   specs:
     artifactory (2.2.1)
     awesome_print (1.6.1)
-    aws-sdk (2.0.28)
-      aws-sdk-resources (= 2.0.28)
-    aws-sdk-core (2.0.28)
+    aws-sdk (2.0.30)
+      aws-sdk-resources (= 2.0.30)
+    aws-sdk-core (2.0.30)
       builder (~> 3.0)
       jmespath (~> 1.0)
       multi_json (~> 1.0)
       multi_xml (~> 0.5)
-    aws-sdk-resources (2.0.28)
-      aws-sdk-core (= 2.0.28)
+    aws-sdk-resources (2.0.30)
+      aws-sdk-core (= 2.0.30)
     builder (3.2.2)
     chef (12.0.3)
       chef-zero (~> 3.2)
@@ -86,7 +86,7 @@ GEM
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
     mixlib-shellout (2.0.1)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     net-dhcp (1.3.2)
     net-ssh (2.9.2)

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

@@ -36,6 +36,8 @@ module CiCd
       SAVE_LATEST_VARS            = i+=1
       SAVE_ENVIRONMENT_VARS       = i+=1
       NO_ARTIFACTS                = i+=1
+      NO_PROJECT_NAMES            = i+=1
+      NO_PROJECTS_PATH            = i+=1
 
       require 'awesome_print'
 

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

@@ -37,7 +37,6 @@ module CiCd
       if clazz.is_a?(Class) and not clazz.nil?
         @repo = clazz.new(self)
         @vars[:return_code] = @repo.uploadBuildArtifacts()
-        @vars[:return_code]
       else
         @logger.error "CiCd::Builder::Repo::#{type} is not a valid repo class"
         @vars[:return_code] = Errors::BUILDER_REPO_TYPE

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

@@ -75,11 +75,10 @@ module CiCd
           end
           # matrix = properties.map{|k,v| (v.nil? or v.empty?) ? nil : "#{k}=#{v}"}.join("\;").gsub(%r'^\;*(.*?)\;*$', '\1')
           # @client.endpoint += ";#{matrix}"
-          @manifest = {}
           artifacts.each{|art|
             data = art[:data]
             if data.has_key?(:data)
-              tempArtifactFile("manifest-#{data[:name]}", data)
+              tempArtifactFile(data[:name], data)
             end
             if data.has_key?(:file)
               data[:sha1] = Digest::SHA1.file(data[:file]).hexdigest
@@ -94,38 +93,9 @@ module CiCd
             unless file_name.empty?
               file_name = '_'+file_name.gsub(%r'^(\.|-|)(\w)', '\2').gsub(%r'(\.|-)+', '_')
             end
-            maybeUploadArtifactoryObject(data, data[:module], data[:version] || @vars[:version], file_ext, file_name) # -#{@vars[:variant]
+            maybeUploadArtifactoryObject(data: data, artifact_module: data[:module], artifact_version: data[:version] || @vars[:version], file_name: file_name, file_ext: file_ext) # -#{@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 |mod,man|
-              man.each do |k,v|
-                manifest_data += "#{k}=#{v}\n"
-              end
-            end
-            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] = amn
-            maybeUploadArtifactoryObject(data, amn, data[:version] || @vars[:version], 'properties', '') # -#{@vars[:variant]}
-            @manifest = manifest
-          end
           @vars[:return_code]
         end
 
@@ -144,7 +114,14 @@ module CiCd
           return file_name, file_ext
         end
 
-        def maybeUploadArtifactoryObject(data, artifact_module, artifact_version, file_ext, file_name)
+        # ---------------------------------------------------------------------------------------------------------------
+        def maybeUploadArtifactoryObject(args)
+          data             = args[:data]
+          artifact_module  = args[:artifact_module]
+          artifact_version = args[:artifact_version]
+          file_ext         = args[:file_ext]
+          file_name        = args[: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)
@@ -172,6 +149,8 @@ module CiCd
           if data[:temp]
             if File.exists?(data[:file])
               File.unlink(data[:file]) if File.exists?(data[:file])
+              data.delete(:file)
+              data.delete(:temp)
             else
               @logger.warn "Temporary file disappeared: #{data.ai}"
             end
@@ -195,19 +174,12 @@ module CiCd
             else
               @logger.info "Keep existing #{matched.map{|o| o.attributes[:uri]}.join("\t")}"
             end
-            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
+          args[:data]             = data
+          args[:artifact_module]  = artifact_module
+          args[:artifact_version] = artifact_version
+          args[:file_ext]         = file_ext
+          args[:file_name]        = file_name
 
           @vars[:return_code]
         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.33'
+		version = '0.9.35'
 		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.33
+  version: 0.9.35
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print