cicd-builder 0.9.51 → 0.9.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 685d6547608f67a17c5918c20cc1f32b760b2a66
-  data.tar.gz: e91d3532794169e714c4d726f7472e404a64be89
+  metadata.gz: 558cd078f79866233e68634bf6b313c0fbc1500d
+  data.tar.gz: c34d02bf59614b844f48cd82968b47ade595a9ea
 SHA512:
-  metadata.gz: ca0e34205fdd3bdaad2c4ffb10fcf3f240a1079ba2cadf40c5fe12a1d3f1ed6094ff927128d877e7d4b221a0b29f9453b57d085c4a4b4cd996da32c9ae0cdaf3
-  data.tar.gz: 01af3be57403e3abb94e5d29c7e5c86b07b4368f60c7671dcbf2fc2ad60a58489b9b16d59d8839f5e6faa1799f325d1e479d467836f9d578ccb31049cbb6cea8
+  metadata.gz: e14b971a952c1deb8461599dbaa708db87884247b715af38ee6c70946e3fa5da6bf997ef806758fec311a40b3a23bfc03bdf382f58bfc6259aa6ddae3b68c44a
+  data.tar.gz: a38801d45ffd7d5143a9370b9e1a6654b8363a6ebd5c0e6da973a80c0bc5499e28ba0f04ba64219ed9cc346d6d699107a105a82109fb449ba19fb73e21436332

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cicd-builder (0.9.51)
+    cicd-builder (0.9.52)
       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

@@ -49,19 +49,20 @@ module CiCd
 
           place = ''
           begin
+            # Assuming we are in the workspace ...
+            place = "Git.open('#{ENV['WORKSPACE']}')"
             req = 'require "git"'
             eval req
 
-            # Assuming we are in the workspace ...
-            place = "Git.open('#{ENV['WORKSPACE']}')"
             git = Git.open(ENV['WORKSPACE'], :log => @logger)
             place = 'git.log'
             meta[:Commit] = git.log[0].sha
             place = 'git.current_branch'
             meta[:Branch] = git.current_branch
+            # meta[:Remotes] = git.remotes
 
             @vars[:build_ext] = 'tar.gz'
-            @vars[:build_bra] = meta[:Branch].gsub(%r([/|]),'.')
+            @vars[:build_bra] = @vars[:branch] || meta[:Branch].gsub(%r([/|]),'.')
             @vars[:build_ver] = "#{meta[:Version]}"
             @vars[:build_rel] = "#{meta[:Release]}"
             @vars[:build_vrb] = "#{@vars[:build_ver]}-release-#{meta[:Release]}-#{@vars[:build_bra]}-#{@vars[:variant]}" #

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

@@ -132,15 +132,18 @@ module CiCd
         # ---------------------------------------------------------------------------------------------------------------
         def uploadToRepo(artifacts)
           # Set a few build properties on the endpoint URL
-          @properties_matrix = {
-              :'build.name'   =>  @vars[:build_mdd][:Project],
-              :'build.number' =>  @vars[:build_mdd][:Build],
-              :'vcs.revision' =>  @vars[:build_mdd][:Commit]
-          }
+          @properties_matrix = {}
           @vars[:build_mdd].each do |k,v|
             @properties_matrix["build.#{k.downcase}"] = v
           end
-          # matrix = properties.map{|k,v| (v.nil? or v.empty?) ? nil : "#{k}=#{v}"}.join("\;").gsub(%r'^\;*(.*?)\;*$', '\1')
+          # noinspection RubyStringKeysInHashInspection
+          @properties_matrix.merge!({
+            'build.name'   =>  @vars[:build_mdd][:Project],
+            'build.number' =>  @vars[:build_mdd][:Build],
+            'build.branch' =>  @vars[:branch],
+            'vcs.revision' =>  @vars[:build_mdd][:Commit],
+            'vcs.branch'   =>  @vars[:build_mdd][:Branch],
+          })
           # @client.endpoint += ";#{matrix}"
           artifacts.each{|art|
             data = art[:data]

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