cicd-builder 0.9.52 → 0.9.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 558cd078f79866233e68634bf6b313c0fbc1500d
-  data.tar.gz: c34d02bf59614b844f48cd82968b47ade595a9ea
+  metadata.gz: 6cd62a29105d756c322af200c6db09a82e48d21f
+  data.tar.gz: 3991bcdb072641afc910612c6693e7b7185ccc97
 SHA512:
-  metadata.gz: e14b971a952c1deb8461599dbaa708db87884247b715af38ee6c70946e3fa5da6bf997ef806758fec311a40b3a23bfc03bdf382f58bfc6259aa6ddae3b68c44a
-  data.tar.gz: a38801d45ffd7d5143a9370b9e1a6654b8363a6ebd5c0e6da973a80c0bc5499e28ba0f04ba64219ed9cc346d6d699107a105a82109fb449ba19fb73e21436332
+  metadata.gz: 4c6c6a0842aa204d488c99da2b65e77838331d30360c3c6afff34d81f285253f622c79945fe854e834643aa49869e91e075316e9ae8f538d32fa6d9a9130bad6
+  data.tar.gz: 88452616373f9c9fd1ef51a339a7f7670957a4d894cd1a530b1b0ffd946e5ae5ff324aa1a3538b809be225457f2c72e504866f875a8d04681308224b51800559

data/Gemfile.lock

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

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

@@ -74,6 +74,7 @@ module CiCd
             @vars[:build_chk] = "#{@vars[:build_nmn]}.checksum"
             @vars[:build_mff] = "#{@vars[:build_nmn]}.manifest"
             @vars[:build_mdf] = "#{@vars[:build_nmn]}.meta"
+            @vars[:build_mvn] = "#{@vars[:build_ver]}-#{@vars[:build_num]}"
             @vars[:build_mdd] = meta.dup
             #noinspection RubyArgCount
             @vars[:build_mds] = Digest::SHA256.hexdigest(meta.to_s)

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

@@ -66,7 +66,7 @@ module CiCd
 			end
 
 			if ENV.has_key?('BRANCH')
-				@vars[:branch] = "#{ENV['BRANCH']}"
+				@vars[:branch] = "#{ENV['BRANCH'].gsub(%r'\/','.')}"
       end
 
 			if ENV.has_key?('VARIANT')

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

@@ -192,7 +192,7 @@ EC2 Instance profile
             unless varianth['builds'].map { |b| b['build_name'] }.include?(@vars[:build_nmn])
               # noinspection RubyStringKeysInHashInspection
               filing = _createFiling(json, {
-                                             'drawer'        => @vars[:build_nam],
+                                             'drawer'        => (@vars[:build_mvn] ? "#{@vars[:build_nam]}/#{@vars[:build_mvn]}" : @vars[:build_nam]),
                                              'build_name'    => @vars[:build_nmn],
                                              'build_number'  => @vars[:build_num],
                                              'release'       => @vars[:release],
@@ -809,26 +809,28 @@ EC2 Instance profile
               list.each do |obj|
                 @logger.debug "Inspect #{obj[:key]}"
                 delete = false
-                unless obj[:key].match(%r'#{key}$')
+                unless obj[:key].match(%r'#{key}$') # It is not INVENTORY.json
                   item = obj[:key].dup
-                  if item.match(%r'^#{@vars[:product]}')
+                  if item.match(%r'^#{@vars[:product]}') # Starts as ChefRepo/ for example
                     item.gsub!(%r'^#{@vars[:product]}/', '')
-                    matches = item.match(%r'^([^/]+)/')
+                    matches = item.match(%r'^([^/]+)/') # Next part should be variant i.e. SNAPSHOT
                     if matches
                       variant   = matches[1]
                       if variants.has_key?(variant)
                         varianth = variants[variant]
                         item.gsub!(%r'^#{variant}/', '')
-                        matches = item.match(%r'^([^/]+)/')
-                        if matches
-                          drawer = matches[1]
+                        #matches = item.match(%r'^([^/]+)/') # Match the drawer name ...
+                        drawer,item = File.split(item) # What remains is drawer name and artifact name
+                        #if matches
+                        if drawer and item
+                          # drawer = matches[1]
                           builds = varianth['builds'].select{ |bld|
                             bld['drawer'].eql?(drawer)
                           }
                           if builds.size > 0
-                            item.gsub!(%r'^#{drawer}/', '')
+                            # item.gsub!(%r'^#{drawer}/', '')
 
-                            if item.match(%r'^#{drawer}')
+                            if item.match(%r'^#{drawer.match('/') ? drawer.split('/')[0] : drawer}') # Artifact names which start with the drawer name ...
                               name = item.gsub(%r'\.(MANIFEST\.json|tar\.[bg]z2?|tgz|tbz2?|checksum)$', '')
                               ver = _getMatches(@vars, name, :version)
                               rel = _getMatches(@vars, name, :release)
@@ -915,25 +917,27 @@ EC2 Instance profile
 
             fileroom = {}
             list.each do |obj|
-              unless obj[:key].match(%r'#{key}$')
+              unless obj[:key].match(%r'#{key}$') # INVENTORY.json ?
                 item      = obj[:key].dup
-                if item.match(%r'^#{@vars[:product]}')
+                if item.match(%r'^#{@vars[:product]}') # ChefRepo/....
                   item.gsub!(%r'^#{@vars[:product]}/', '')
-                  matches = item.match(%r'^([^/]+)/')
+                  matches = item.match(%r'^([^/]+)/') # SNAPSHOT/...
                   if matches
                     variant   = matches[1]
                     fileroom[variant] ||= {}
                     cabinet = fileroom[variant]
                     item.gsub!(%r'^#{variant}/', '')
-                    matches = item.match(%r'^([^/]+)/')
-                    if matches
-                      drawer = matches[1]
-                      item.gsub!(%r'^#{drawer}/', '')
+                    #matches = item.match(%r'^([^/]+)/') # Match the drawer name ...
+                    drawer,item = File.split(item) # What remains is drawer name and artifact name
+                    #if matches
+                    if drawer and item
+                      # drawer = matches[1]
+                      # item.gsub!(%r'^#{drawer}/', '')
                       cabinet[drawer] ||= {}
                       tray = cabinet[drawer]
                       # tray['builds'] ||= {}
 
-                      if item.match(%r'^#{drawer}')
+                      if item.match(%r'^#{drawer.match('/') ? drawer.split('/')[0] : drawer}') # Artifacts which start with the drawer name
                         name = item.gsub(%r'\.(MANIFEST\.json|tar\.[bg]z2?|tgz|tbz2?|checksum)$', '')
                         ext  = item.gsub(%r'\.(tar\.[bg]z2?)$', '$1')
                         ext  = 'tar.bz2' if ext == item

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

@@ -22,7 +22,7 @@ module CiCd
 
         # ---------------------------------------------------------------------------------------------------------------
         def getKey
-          key = "#{@vars[:project_name]}/#{@vars[:variant]}/#{@vars[:build_nam]}/#{@vars[:build_nmn]}"
+          @builder.getKey # key = "#{@vars[:project_name]}/#{@vars[:variant]}/#{@vars[:build_nam]}/#{@vars[:build_mvn]}/#{@vars[:build_nmn]}"
         end
 
         # ---------------------------------------------------------------------------------------------------------------

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

@@ -23,9 +23,15 @@ module CiCd
 			down
 		end
 
+		# ---------------------------------------------------------------------------------------------------------------
+		def getKey
+			key = "#{@vars[:project_name]}/#{@vars[:variant]}/#{@vars[:build_nam]}/#{@vars[:build_mvn]}/#{@vars[:build_nmn]}"
+		end
+
     # ---------------------------------------------------------------------------------------------------------------
     def addArtifact(artifacts, script, prefix, opts = {})
-      key = "#{@vars[:project_name]}/#{@vars[:variant]}/#{@vars[:build_nam]}/#{script.gsub(%r|^#{prefix}|, '')}"
+      key = File.join(File.dirname(getKey()), script.gsub(%r|^#{prefix}|, ''))
+      # "#{@vars[:project_name]}/#{@vars[:variant]}/#{@vars[:build_nam]}/#{@vars[:build_mvn]}/#{script.gsub(%r|^#{prefix}|, '')}"
       # Store the artifact - be sure to inherit possible overrides in pkg name and ext but dictate the drawer!
       artifacts << {
           key: key,

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