cicd-builder 0.9.18 → 0.9.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmExNzcwMDhjMjYxYmJhNzkwYmY1ZDlhNDg4ZDNhNjkzOTUzOTBlYg==
+    NzlkMWRmMmY2ZjljMjRkMzU0Zjc2OWVlNzA1MWI3YjkxZTY5ZjlkNw==
   data.tar.gz: !binary |-
-    OGFmMTRkMmZlZjkzYmFmYWY4ZWQ5NGJmZWM0MjYxMWRmZDgyZDBiNw==
+    NjhkZDQyMzE4Mzg1NTFhMjExY2M0ZDY3MzkyMzEyMjk5NWQ5MjEzNg==
 SHA512:
   metadata.gz: !binary |-
-    YjNkMzlkYzgzZWEwNWVmNGYwMmIwM2JhNGI5YTQ3MjE2ZDE2M2NkZDBhOGY0
-    OTcyMzEzMjNkNGU3NTI0MzMwYTRmZjE1MWM5NjBkY2YwMWEzYzEyZjZkZTJl
-    YjQxNjFjYzg1YmQxYjE4YWRiMzZkMzU3NWY5Y2Q3YTAxZDNmZmU=
+    ZGRiNjUzZDVjNzMyMzJlNjNhMmQ3YTBhNWMzOTAzODViOGMwZmY2MGY3ODY0
+    ZTBhZWExOTE2NmJmZDA0ZTFmZTI0NmEwODhhMWVkNjIwZjY3ODlhNWQzNWMw
+    YjQ1ZGU0YjJmNTQ3M2NkYzNkN2MzZTU5ZmQ4MTVmMzk3YTMxNGU=
   data.tar.gz: !binary |-
-    OTA5NGJiN2M5OTFiZmE4OGRjMjc3NDhlZTFiZTdhYzk0YWYwMWNiYmM3NzZm
-    ZjYwMjJkNTg1ZDc1YjAxNDdkMzkzMDdjZWZjYjY0NjMyMzlhMWNmMTM3NDAz
-    OGU1MjQ1Yjg4YzgzYTZiMTBiNDVmYTBlNDhjOWQ2MTliOTcyMzE=
+    OTMwMmIxYThjMzJjNWNhM2E3ZDI4NjZlZDViMGFkMjg4YjMwNzQ1M2Y4OTgy
+    YTk3Y2Y4MWQ1MDU3ZjM1MDA1OTA4OWMwN2U1YTk4YjM0OTY5ZmIwYjRhYzQ5
+    Mzg1MDA0MTUwZGVhYjI1NWEwYmY1Mzg5MGU5NzEzZWEzZTk0OWY=

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

@@ -52,14 +52,15 @@ module CiCd
         place = 'git.current_branch'
         meta[:Branch] = git.current_branch
 
+        @vars[:build_ext] = 'tar.gz'
         @vars[:build_bra] = meta[:Branch].gsub(%r([/|]),'.')
         @vars[:build_ver] = "#{meta[:Version]}"
         @vars[:build_vrb] = "#{@vars[:build_ver]}-release-#{meta[:Release]}-#{@vars[:build_bra]}-#{@vars[:variant]}" #
         @vars[:build_nam] = "#{@vars[:project_name]}-#{@vars[:build_vrb]}"
         @vars[:build_rel] = "#{@vars[:build_nam]}-build-#{@vars[:build_num]}"
         @vars[:build_dir] = "#{ENV['WORKSPACE']}/#{@vars[:build_rel]}"
-        @vars[:latest_pkg]= "#{@vars[:build_store]}/#{@vars[:build_rel]}.tar.gz"
-        @vars[:build_pkg] = "#{@vars[:build_rel]}.tar.gz"
+        @vars[:latest_pkg]= "#{@vars[:build_store]}/#{@vars[:build_rel]}.#{@vars[:build_ext]}"
+        @vars[:build_pkg] = "#{@vars[:build_rel]}.#{@vars[:build_ext]}"
         @vars[:build_chk] = "#{@vars[:build_rel]}.checksum"
         @vars[:build_mff] = "#{@vars[:build_rel]}.manifest"
         @vars[:build_mdf] = "#{@vars[:build_rel]}.meta"

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

@@ -75,8 +75,15 @@ module CiCd
       @vars[:latest_ver] = ''
       @vars[:latest_sha] = ''
       @vars[:latest_pkg] = ''
+      @vars[:latest_ext] = @vars[:build_ext]
       if @vars[:build_nam]
-        @vars[:latest_pkg]= "#{@vars[:build_store]}/#{@vars[:build_nam]}.tar.gz"
+        @vars[:latest_pkg] = "#{@vars[:build_store]}/#{@vars[:build_nam]}.#{@vars[:latest_ext]}"
+        unless File.exists?(@vars[:latest_pkg])
+          if File.exists?("#{@vars[:build_store]}/#{@vars[:build_nam]}.tar.gz")
+            @vars[:latest_ext] = 'tar.gz'
+            @vars[:latest_pkg] = "#{@vars[:build_store]}/#{@vars[:build_nam]}.#{@vars[:latest_ext]}"
+          end
+        end
       end
       if File.exists?(@vars[:latest_fil])
         @vars[:latest_ver] = IO.readlines(@vars[:latest_fil])

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

@@ -50,6 +50,7 @@ module CiCd
 						size = art[:data][:data].length
           end
           art[:data][:metadata] = {checksum: md5}
+          art[:data][:'x-amz-meta-digest'] = "md5=#{md5}"
 					s3_obj.write(art[:data])
 					if art.has_key?(:public_url)
 						@vars[art[:public_url]] = s3_obj.public_url
@@ -242,13 +243,21 @@ module CiCd
 				# Add the new build if we don't have it
 				unless varianth['builds'].map { |b| b['build_name'] }.include?(@vars[:build_rel])
 					#noinspection RubyStringKeysInHashInspection
-					varianth['builds'] <<
-						{
-							'drawer'        => @vars[:build_nam],
-							'build_name'    => @vars[:build_rel],
-              'build_number'  => @vars[:build_num],
-              'release'       => @vars[:release],
-						}
+					filing = {
+                      'drawer'        => @vars[:build_nam],
+                      'build_name'    => @vars[:build_rel],
+                      'build_number'  => @vars[:build_num],
+                      'release'       => @vars[:release],
+                    }
+          assembly = json['container']['assembly'] or raise("Expected an 'assembly'")
+          if assembly['extension'] != !vars[:build_ext]
+            # noinspection RubyStringKeysInHashInspection
+            filing['assembly'] = {
+                'extension' => @vars[:build_ext],
+                'type'      => 'tarbzip2'
+            }
+          end
+          varianth['builds'] << filing
 				end
 				build_lst = (varianth['builds'].size-1)
         build_rel = build_lst
@@ -280,7 +289,12 @@ module CiCd
 				json_s = JSON.pretty_generate( json, { indent: "\t", space: ' '})
 			end
 			begin
-				resp = s3_obj.write(:data => json_s)
+        md5 = Digest::MD5.hexdigest(json_s)
+				resp = s3_obj.write({
+                                :data                 => json_s,
+                                :'x-amz-meta-digest'  => "md5=#{md5}",
+                                :metadata             => { checksum: md5 },
+                            })
 
         @logger.info "Inventory URL: #{s3_obj.url_for(:read)}"
 
@@ -331,9 +345,9 @@ module CiCd
 						artifacts = []
 
 						key    = "#{@vars[:project_name]}/#{@vars[:variant]}/#{@vars[:build_nam]}/#{@vars[:build_rel]}"
-						# Store the assembly
+						# Store the assembly - be sure to inherit possible overrides in pkg name and ext but dictate the drawer!
 						artifacts << {
-							key:        "#{key}.tar.gz",
+							key:        "#{File.join(File.dirname(key),File.basename(@vars[:build_pkg]))}",
 							data:       {:file => @vars[:build_pkg]},
 							public_url: :build_url,
 							label:      'Package URL'

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.18'
+		version = '0.9.19'
 		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.18
+  version: 0.9.19
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print