cicd-builder 0.9.61 → 0.9.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 246f9b00a120827355ddb4302ff2591b87b0c2ce
-  data.tar.gz: f5d332f8fee9bcbfc3ba0f6b34836e1ecdd349f9
+  metadata.gz: f9f762dfe4a6bf7cb39d6fe1dde6a0975fb27db3
+  data.tar.gz: 0b32e2b4a2eea3eb9b630e94e1dd643c0128321d
 SHA512:
-  metadata.gz: 6a5bbed39584e9ce71a8ca73c48f4fda0739f70d1c64f27a6b77504040f46891c45034ddaefb18c778ae4d9adb20dd5633743108df15f1f53106d3ca69d42c8b
-  data.tar.gz: 0901978e2fb0bb255892c832bcc9e21291e09e9746c1aa2c311f29ef8afb93fc286b42fb7d676be38abae2e37ee65573dd3e6e7578f86edb385ea53d6247c4ea
+  metadata.gz: 7c9a6463ebc0d75ff2498dbfa4f9a1e2702920e963ca2cc0a58853e0723b8827de16c67a27eb58c64fc8bff6ad57c324b672fe0a8c052237ee04bdb05a19a5f0
+  data.tar.gz: 4b5230a04e1781dac45f29fa60aa5beeff34ccf8e607801ca55ff96baeb59cbc566f59eb4b941bbfbac9dd40a9e24a612d4d53ab81db27f25f7d57f91a8da383

data/Gemfile.lock

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

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

@@ -38,10 +38,11 @@ module CiCd
 
       @logger.info "Unused ENV vars: #{@default_options[:env_unused].ai}" if @default_options[:env_unused].size > 0
 
-			@vars               ||= {}
-			@vars[:release]     = 'latest'
-			@vars[:build_store] = '/tmp'
-			@vars[:variant]     = 'SNAPSHOT'
+			@vars                ||= {}
+			@vars[:release]      = 'latest'
+			@vars[:build_store]  = '/tmp'
+			@vars[:variant]      = 'SNAPSHOT'
+      @vars[:upload_timer] = ENV.has_key?('ARTIFACT_UPLOAD_TIMER') ? ENV['ARTIFACTORY_UPLOAD_TIMER'].to_i : 300
 
 			if ENV.has_key?('PROJECT_NAME')
         @vars[:product] =

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

@@ -285,7 +285,7 @@ module CiCd
             # Get a list of matching artifacts in this repository
             @logger.info "Artifactory gavc_search g=#{artifactory_org_path()},a=#{artifact_name},v=#{artifact_version},r=#{repo || artifactory_repo()}"
             @arti_search_result     = []
-            monitor(30, 'artifact_gavc_search'){
+            monitor(@vars[:upload_timer], 'artifact_gavc_search'){
               @arti_search_result = @client.artifact_gavc_search(group: artifactory_org_path(), name: artifact_name, version: "#{artifact_version}", repos: [repo || artifactory_repo()])
             }
             # noinspection RubyScope
@@ -309,7 +309,7 @@ module CiCd
             # Get a list of matching artifacts in this repository
             @logger.info "Artifactory latest_version g=#{artifactory_org_path()},a=#{artifact_name},r=#{repo || artifactory_repo()}"
             @arti_search_result     = []
-            monitor(30, 'artifact_latest_version'){
+            monitor(@vars[:upload_timer], 'artifact_latest_version'){
               @arti_search_result = ::Artifactory::Resource::Artifact.latest_version(client: @client, group: artifactory_org_path(), name: artifact_name, repos: [repo || artifactory_repo()])
             }
             # noinspection RubyScope
@@ -323,17 +323,20 @@ module CiCd
           end
         end
 
-        def monitor(limit,title='Progress')
+        def monitor(limit,title='Time consumed')
           raise 'Must have a block' unless block_given?
           thread = Thread.new(){
             yield
           }
-          progressbar = ::ProgressBar.create({title: title, progress_mark: '=', starting_at: 0, total: limit, remainder_mark: '.', throttle_rate: 0.5}) if @logger.info?
-          limit.times do
+          progressbar = ::ProgressBar.create({title: title, format: '%a <%B> %p%% %t', progress_mark: '=', starting_at: 0, total: limit, remainder_mark: '.'}) if @logger.info?
+          # progressbar = ::ProgressBar.create({title: title, format: '%a <%B> %p%% %t', progress_mark: '=', starting_at: 0, total: limit, length: limit, remainder_mark: '.', throttle_rate: 0.5}) if @logger.info?
+          #progressbar = ::ProgressBar.create({title: title, format: '%a %bᗧ%i %p%%', progress_mark: ' ', remainder_mark: '=', starting_at: 0, throttle_rate: 0.5}) if @logger.info?
+          limit.times do |i|
             res = thread.join(1)
             if @logger.info?
               progressbar.increment
-              progressbar.total = limit
+              # progressbar.total = limit
+              # progressbar.log i
             end
             unless thread.alive? #or thread.stop?
               puts '' if @logger.info?
@@ -353,13 +356,14 @@ module CiCd
                                 }
           artifact.size = data[:size]
           @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Start upload #{artifact_path} = #{data[:size]} bytes"
-          monitor(30, 'upload') {
+          monitor(@vars[:upload_timer], 'upload') {
             @arti_upload_result = artifact.upload(repo || artifactory_repo(), "#{artifact_path}", data[:properties] || {})
           }
+          raise "Failed to upload artifact for #{artifact_path}" unless @arti_upload_result
           @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Uploaded: #{@arti_upload_result.attributes.select { |k, _| k != :client }.ai}"
           3.times{
             @arti_upload_checksum = false
-            monitor(30, 'upload_checksum') {
+            monitor(@vars[:upload_timer], 'upload_checksum') {
               begin
                 artifact.upload_checksum(repo || artifactory_repo(), "#{artifact_path}", :sha1, data[:sha1])
                 @arti_upload_checksum = true
@@ -373,7 +377,7 @@ module CiCd
           raise "Failed to upload SHA1 for #{artifact_path}" unless @arti_upload_checksum
           3.times{
             @arti_upload_checksum = false
-            monitor(30, 'upload_checksum') {
+            monitor(@vars[:upload_timer], 'upload_checksum') {
               begin
                 artifact.upload_checksum(repo || artifactory_repo(), "#{artifact_path}", :md5,  data[:md5])
                 @arti_upload_checksum = true

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.61'
+		version = '0.9.62'
 		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.61
+  version: 0.9.62
 platform: ruby
 authors:
 - Christo De Lange