cicd-builder 0.9.30 → 0.9.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43b046d8964915ca088ec9c390dd871de1f7a1d0
-  data.tar.gz: a9b241bf89301f531bde18126ff8fd0920d4870c
+  metadata.gz: 24bff76362b4ac67712f58f1710c3f0c7f748ca8
+  data.tar.gz: 5fc9dbdb1884e2aeccca385bd746cef7f59f063c
 SHA512:
-  metadata.gz: 25df5d46329a2697d45f61bd84a54daaf4177a7c5ad841fc4c029f542fcb36b62a32c768e48f327da4159d43acb3b338e460dd9293fba5a6246dab4819088df4
-  data.tar.gz: 862aebbb48e63c7c7e13b90ccfc486862e25e55a709162f7908039a096a465ccb8387372704f9332f83f4ec8b38c02ec852dd3d0995d1c3485535cf01aad3080
+  metadata.gz: 0f9b75acf5625746f41aaceba8ac0f3899e372be988d4c44c63f50fe2d160eb3fdda1a156dcc20ef216153ecc5db8852153327350b757cbc1e3dd82f9032f4d9
+  data.tar.gz: a6bf510790117d49aac48cc81ef6dbe0ec26fecb26907f7f72785500e2d6da47950065070866c7abadf5cc688fd9877a56ab382a18c3263bce67546d83421d96

data/Gemfile.lock

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

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

@@ -106,7 +106,7 @@ module CiCd
             unless file_name.empty? or file_name.match(%r'^-')
               file_name = "-#{file_name}"
             end
-            artifact_name = "#{data[:name]}-#{data[:version]}#{file_name}-#{data[:build]}.#{file_ext}" # -#{@vars[:variant]}
+            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
@@ -146,7 +146,7 @@ module CiCd
           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[:build]}.properties"
+          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]

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.30'
+		version = '0.9.31'
 		VERSION = version unless const_defined?('VERSION')
 		major, minor, tiny = VERSION.split('.')
 		MAJOR   = major unless const_defined?('MAJOR')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cicd-builder
 version: !ruby/object:Gem::Version
-  version: 0.9.30
+  version: 0.9.31
 platform: ruby
 authors:
 - Christo De Lange