cicd-builder 0.9.48 → 0.9.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efea1243d554e4bd293069c488335f978a95d8ef
-  data.tar.gz: c4039129628cefe72a3031486aff4513dcaf3321
+  metadata.gz: 812b59bab3245bb65e3da40f49e995d6d01faac3
+  data.tar.gz: c0067b69de71de70310fa48ca7e27dd03eb9f7c5
 SHA512:
-  metadata.gz: 14e82811801393c612a1f974b736df6e421f8d3ce23cf029f1cf5227ae454d5e52520b3d4be4ba20acc273d96241f4c75c44e9ff10ba49f1988a040a8b59b819
-  data.tar.gz: c907b107fbe092c5683dba750d95433d60b91ad2dd062db1c516357a61f88a42f6ab13485becc8085fee55b935310b98e500c00ef46d3c357085eed0415620ea
+  metadata.gz: f04f159999011737a30a0202b145d5e60ed7dcc1bf163c1931c597d4c925b4897b75751e61fbb49a6c9c8c428b03741249b1a4c36f6e605e72ac3cdc56bf879e
+  data.tar.gz: adb4d7f0a922036ae3e8ea04de849d3a6727ac9b25e6b8aa94ddc4a34dc5aef0e7fbae3bb73d8ce55ec3fc55500463d0d9b43f1e55bcace29cb55919c82b15ae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cicd-builder (0.9.48)
+    cicd-builder (0.9.50)
       artifactory (>= 2.2.1, < 2.3)
       awesome_print (>= 1.6, < 2.0)
       aws-sdk (>= 2.0, < 2.1)
@@ -10,6 +10,8 @@ PATH
       inifile (>= 3.0.0, < 3.1)
       json (>= 1.8.1, < 1.9)
       logging (>= 1.8.2, < 1.9)
+      parallel (>= 1.4.1, < 1.5)
+      ruby-progressbar (>= 1.7.5, < 2)
       semverse (>= 1.2.1, < 1.3)
       yajl-ruby (>= 1.2.1, < 1.3)
 
@@ -18,14 +20,14 @@ GEM
   specs:
     artifactory (2.2.1)
     awesome_print (1.6.1)
-    aws-sdk (2.0.39)
-      aws-sdk-resources (= 2.0.39)
-    aws-sdk-core (2.0.39)
+    aws-sdk (2.0.41)
+      aws-sdk-resources (= 2.0.41)
+    aws-sdk-core (2.0.41)
       builder (~> 3.0)
       jmespath (~> 1.0)
       multi_json (~> 1.0)
-    aws-sdk-resources (2.0.39)
-      aws-sdk-core (= 2.0.39)
+    aws-sdk-resources (2.0.41)
+      aws-sdk-core (= 2.0.41)
     builder (3.2.2)
     chef (12.0.3)
       chef-zero (~> 3.2)
@@ -78,7 +80,7 @@ GEM
       little-plugger (>= 1.1.3)
       multi_json (>= 1.8.4)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.5)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.5.0)
@@ -92,7 +94,7 @@ GEM
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    ohai (8.2.0)
+    ohai (8.3.0)
       ffi (~> 1.9)
       ffi-yajl (>= 1.1, < 3.0)
       ipaddress
@@ -104,6 +106,7 @@ GEM
       rake (~> 10.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
+    parallel (1.4.1)
     plist (3.1.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -111,6 +114,7 @@ GEM
       slop (~> 3.4)
     rack (1.6.0)
     rake (10.3.2)
+    ruby-progressbar (1.7.5)
     rubygems-tasks (0.2.4)
     semverse (1.2.1)
     slop (3.6.0)

data/cicd-builder.gemspec

@@ -27,6 +27,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'git', '>= 1.2.7', '< 1.3'
   gem.add_dependency 'semverse', '>= 1.2.1', '< 1.3'
   gem.add_dependency 'artifactory', '>= 2.2.1', '< 2.3'
+  gem.add_dependency 'parallel', '>= 1.4.1', '< 1.5'
+  gem.add_dependency 'ruby-progressbar', '>= 1.7.5', '< 2'
 
   gem.add_development_dependency 'bundler', '>= 1.7', '< 1.8'
   gem.add_development_dependency 'rake', '>= 10.3', '< 11'

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

@@ -5,7 +5,7 @@ module CiCd
 
 		# ---------------------------------------------------------------------------------------------------------------
 		def cleanupBuild()
-      @logger.step __method__.to_s
+      @logger.info CLASS+'::'+__method__.to_s
       [ :build_pkg, :build_chk, :build_mdf, :build_mff ].each do |fil|
         if File.exists?(@vars[fil])
           begin
@@ -31,7 +31,7 @@ module CiCd
 
     # ---------------------------------------------------------------------------------------------------------------
     def prepareBuild()
-      @logger.step __method__.to_s
+      @logger.step CLASS+'::'+__method__.to_s
       meta = {}
       @vars[:return_code] = 0
       %w[ WORKSPACE PROJECT_NAME ].each do |e|
@@ -105,7 +105,7 @@ module CiCd
 
     # ---------------------------------------------------------------------------------------------------------------
     def makeBuild()
-      @logger.step __method__.to_s
+      @logger.step CLASS+'::'+__method__.to_s
       if @vars.has_key?(:build_dir) and @vars.has_key?(:build_pkg)
         begin
           do_build = false
@@ -208,7 +208,7 @@ module CiCd
 
     # ---------------------------------------------------------------------------------------------------------------
 		def packageBuild()
-      @logger.step __method__.to_s
+      @logger.info CLASS+'::'+__method__.to_s
 			excludes=%w(*.iml *.txt *.sh *.md .gitignore .editorconfig .jshintrc *.deprecated adminer doc)
 			excludes = excludes.map{ |e| "--exclude=#{@vars[:build_nam]}/#{e}" }.join(' ')
 			cmd = %(cd #{ENV['WORKSPACE']}; tar zcvf #{@vars[:build_pkg]} #{excludes} #{@vars[:build_nam]} 1>#{@vars[:build_pkg]}.manifest)
@@ -222,7 +222,7 @@ module CiCd
 
     # ---------------------------------------------------------------------------------------------------------------
     def createMetaData()
-      @logger.step __method__.to_s
+      @logger.info CLASS+'::'+__method__.to_s
       @vars[:build_mdd].merge!({
                                 :Generation => @options[:gen],
                                 :Project => @vars[:project_name],

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

@@ -1,10 +1,11 @@
 module CiCd
 	module Builder
     require 'awesome_print'
+    CLASS = 'CiCd::Builder'
 
 		# ---------------------------------------------------------------------------------------------------------------
 		def checkEnvironment()
-      @logger.step __method__.to_s
+      @logger.step CLASS+'::'+__method__.to_s
 			# [2013-12-30 Christo] Detect CI ...
 			unless ENV.has_key?('JENKINS_HOME')
 				@logger.error "Sorry, your CI environment is not supported at this time (2013-12-30) ... Christo De Lange\n"+
@@ -31,7 +32,7 @@ module CiCd
 
 		# ---------------------------------------------------------------------------------------------------------------
 		def getVars()
-      @logger.step __method__.to_s
+      @logger.step CLASS+'::'+__method__.to_s
 			@vars               ||= {}
 			@vars[:release]     = 'latest'
 			@vars[:build_store] = '/tmp'
@@ -142,7 +143,7 @@ module CiCd
 
     # ---------------------------------------------------------------------------------------------------------------
 		def saveEnvironment(ignored=ENV_IGNORED)
-      @logger.step __method__.to_s
+      @logger.info CLASS+'::'+__method__.to_s
 			@logger.info "Save environment to #{@vars[:vars_fil]}"
 			vstr = ['[global]']
 			ENV.to_hash.sort.each{|k,v|
@@ -155,7 +156,7 @@ module CiCd
 
     # ---------------------------------------------------------------------------------------------------------------
     def saveBuild()
-      @logger.step __method__.to_s
+      @logger.step CLASS+'::'+__method__.to_s
       begin
         raise 'ERROR: Checksum not read'       unless @vars.has_key?(:latest_sha)
         raise 'ERROR: Checksum not calculated' unless @vars.has_key?(:build_sha)

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

@@ -34,6 +34,7 @@ module CiCd
       BAD_ARTIFACTS               = i+=1
       ARTIFACT_NOT_FOUND          = i+=1
       ARTIFACT_CHECKSUM_BAD       = i+=1
+      ARTIFACT_MULTI_MATCH        = i+=1
       SAVE_LATEST_VARS            = i+=1
       SAVE_ENVIRONMENT_VARS       = i+=1
       NO_ARTIFACTS                = i+=1
@@ -44,7 +45,7 @@ module CiCd
       PRUNE_NO_TREE               = i+=1
       PRUNE_NO_VARIANT            = i+=1
       PRUNE_NO_PRUNER             = i+=1
-      PRUNE_TOO_OLD               = i+=1
+      REPO_TOO_OLD                = i+=1
       PRUNE_VARIANT_MIA           = i+=1
       PRUNE_BAD_BRANCH            = i+=1
       PRUNE_BAD_VERSION           = i+=1
@@ -53,6 +54,12 @@ module CiCd
       SYNC_BAD_PRODUCT            = i+=1
       SYNC_NO_VARIANT             = i+=1
       SYNC_NO_DRAWER              = i+=1
+      REPO_NO_VARIANT             = i+=1
+      REPO_BAD_VERSION            = i+=1
+      REPO_BAD_BRANCH             = i+=1
+      REPO_NO_BUILD               = i+=1
+
+      PRUNE_TOO_OLD               = REPO_TOO_OLD
 
       require 'awesome_print'
 

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

@@ -12,12 +12,9 @@ module CiCd
 
     # ---------------------------------------------------------------------------------------------------------------
 		def getRepoClass(type = nil)
-      @logger.info __method__.to_s
+      @logger.info CLASS+'::'+__method__.to_s
       if type.nil?
         type ||= 'S3'
-        if ENV.has_key?('REPO_TYPE')
-          type = ENV['REPO_TYPE']
-        end
       end
 
       @logger.info "#{type} repo interface"
@@ -32,15 +29,33 @@ module CiCd
     end
 
     # ---------------------------------------------------------------------------------------------------------------
-    def performOnRepoInstance(verb)
-      @logger.step __method__.to_s + ' ' + verb
-      clazz = getRepoClass()
+    def getRepoInstance(type = nil)
+      @logger.info CLASS+'::'+__method__.to_s
+      if type.nil?
+        type ||= 'S3'
+        if ENV.has_key?('REPO_TYPE')
+          type = ENV['REPO_TYPE']
+        end
+      end
+      clazz = getRepoClass(type)
       if clazz.is_a?(Class) and not clazz.nil?
         @repo = clazz.new(self)
+      else
+        @logger.error "#{clazz.name.to_s} is not a valid repo class"
+        @vars[:return_code] = Errors::BUILDER_REPO_TYPE
+      end
+      @vars[:return_code]
+    end
+
+    # ---------------------------------------------------------------------------------------------------------------
+    def performOnRepoInstance(verb)
+      @logger.info CLASS+'::'+__method__.to_s
+      getRepoInstance()
+      if 0 == @vars[:return_code]
         method = @repo.method(verb)
         if @repo.respond_to?(verb)
-          unless method.owner == clazz
-            @logger.warn "#{clazz.name.to_s} does not override action #{verb}"
+          unless method.owner == @repo.class
+            @logger.warn "#{@repo.class.name} does not override action #{verb}"
           # else
           #   @logger.error "#{clazz.name.to_s} does not implement action #{verb}"
           #   @vars[:return_code] = Errors::BUILDER_REPO_ACTION
@@ -50,45 +65,43 @@ module CiCd
           @logger.fatal "'#{verb}' not implemented!"
           @vars[:return_code] = Errors::BUILDER_REPO_ACTION
         end
-      else
-        @logger.error "#{clazz.name.to_s} is not a valid repo class"
-        @vars[:return_code] = Errors::BUILDER_REPO_TYPE
       end
       @vars[:return_code]
     end
 
     # ---------------------------------------------------------------------------------------------------------------
     def uploadBuildArtifacts()
-      @logger.step __method__.to_s
+      @logger.step CLASS+'::'+__method__.to_s
       performOnRepoInstance(__method__.to_s)
     end
 
     # ---------------------------------------------------------------------------------------------------------------
     def analyzeInventory()
-      @logger.step __method__.to_s
+      @logger.step CLASS+'::'+__method__.to_s
 			performOnRepoInstance(__method__.to_s)
     end
 
     # ---------------------------------------------------------------------------------------------------------------
     def pruneInventory()
-      @logger.step __method__.to_s
+      @logger.step CLASS+'::'+__method__.to_s
 			performOnRepoInstance(__method__.to_s)
     end
 
     # ---------------------------------------------------------------------------------------------------------------
     def syncInventory()
-      @logger.step __method__.to_s
+      @logger.step CLASS+'::'+__method__.to_s
 			performOnRepoInstance(__method__.to_s)
     end
 
     # ---------------------------------------------------------------------------------------------------------------
     def syncRepo()
-      @logger.step __method__.to_s
+      @logger.step CLASS+'::'+__method__.to_s
 			performOnRepoInstance(__method__.to_s)
     end
 
     # ---------------------------------------------------------------------------------------------------------------
 		def manifestMetadata
+      @logger.info CLASS+'::'+__method__.to_s
 			manifest = @vars[:build_mdd].dup
 
 			manifest[:manifest] = getBuilderVersion

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

@@ -339,9 +339,9 @@ EC2 Instance profile
         end
 
         # ---------------------------------------------------------------------------------------------------------------
-        def pullInventory()
+        def pullInventory(product=nil)
           json = nil
-          key, s3_obj = checkForInventory()
+          key, s3_obj = checkForInventory(product)
           # If the inventory has started then add to it else create a new one
           if s3_obj.nil?
             # Start a new inventory
@@ -370,8 +370,11 @@ EC2 Instance profile
         end
 
         # ---------------------------------------------------------------------------------------------------------------
-        def checkForInventory
-          key = "#{@vars[:project_name]}/INVENTORY.json"
+        def checkForInventory(product=nil)
+          if product.nil?
+            product = @vars[:project_name]
+          end
+          key = "#{product}/INVENTORY.json"
           s3_obj = maybeS3Object(key)
           return key, s3_obj
         end
@@ -406,7 +409,7 @@ EC2 Instance profile
 
         # ---------------------------------------------------------------------------------------------------------------
         def uploadBuildArtifacts()
-          @logger.step __method__.to_s
+          @logger.step CLASS+'::'+__method__.to_s
           if @vars.has_key?(:build_dir) and @vars.has_key?(:build_pkg)
             artifacts = @vars[:artifacts] rescue []
 
@@ -623,29 +626,7 @@ EC2 Instance profile
                         puts "\t#{varianth['builds'].size} builds"
                         puts "\t#{varianth['branches'].size} branches:\n#{varianth['branches'].ai}"
                         # puts "\t#{varianth['versions'].size} versions:\n#{varianth['versions'].ai}"
-                        versions = {}
-                        releases = {}
-                        versrels = {}
-                        bmin = -1
-                        bmax = -1
-                        varianth['builds'].each do |bld|
-                          releases[bld['release']] ||= 0
-                          releases[bld['release']] += 1
-                          unless bld['build_number'].nil?
-                            bnum = bld['build_number'].to_i
-                            if bmin < 0 or bnum < bmin
-                              bmin = bnum
-                            end
-                            if bnum > bmax
-                              bmax = bnum
-                            end
-                          end
-                          ver = _getMatches(@vars, bld['build_name'], :version)
-                          versions[ver] ||= 0
-                          versions[ver] += 1
-                          versrels["#{ver}-#{bld['release']}"] ||= 0
-                          versrels["#{ver}-#{bld['release']}"] += 1
-                        end
+                        bmax, bmin, releases, versions, versrels = getVariantVersionsAndReleases(varianth)
                         puts "\t#{versions.size} versions:\n#{versions.ai}"
                         puts "\t#{releases.size} releases:\n#{releases.ai}"
                         puts "\t#{versrels.size} version-releases:\n#{versrels.ai}"
@@ -677,6 +658,34 @@ EC2 Instance profile
           @vars[:return_code]
         end
 
+        # ---------------------------------------------------------------------------------------------------------------
+        def getVariantVersionsAndReleases(varianth)
+          versions = {}
+          releases = {}
+          versrels = {}
+          bmin = -1
+          bmax = -1
+          varianth['builds'].each do |bld|
+            releases[bld['release']] ||= 0
+            releases[bld['release']] += 1
+            unless bld['build_number'].nil?
+              bnum = bld['build_number'].to_i
+              if bmin < 0 or bnum < bmin
+                bmin = bnum
+              end
+              if bnum > bmax
+                bmax = bnum
+              end
+            end
+            ver = _getMatches(@vars, bld['build_name'], :version)
+            versions[ver] ||= 0
+            versions[ver] += 1
+            versrels["#{ver}-#{bld['release']}"] ||= 0
+            versrels["#{ver}-#{bld['release']}"] += 1
+          end
+          return bmax, bmin, releases, versions, versrels
+        end
+
         # ---------------------------------------------------------------------------------------------------------------
         def pruneInventory()
           @logger.step __method__.to_s
@@ -1060,7 +1069,7 @@ EC2 Instance profile
           varianth['branches'] = Hash[branches.map.with_index.to_a].keys
         end
 
-        private :_update, :checkForInventory, :pullInventory, :_update, :_updateBranches, :_updateLatest, :_updateVersions
+        protected :_update, :_update, :_updateBranches, :_updateLatest, :_updateVersions
 
       end
     end

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

@@ -1,4 +1,61 @@
 require 'artifactory'
+require 'artifactory/version'
+require 'parallel'
+require 'ruby-progressbar'
+
+raise "Need to check compatibility of monkey patch for Artifactory.VERSION == #{::Artifactory::VERSION}" unless ::Artifactory::VERSION == '2.2.1'
+module Artifactory
+  module Defaults
+    class << self
+      #
+      # Reset all configuration options to their default values.
+      #
+      # @example Reset all settings
+      #   Artifactory.reset!
+      #
+      # @return [self]
+      #
+      def reset!
+        @_options = nil
+        options
+      end
+      alias_method :setup, :reset!
+      #
+      # Number of seconds to wait for a response from Artifactory
+      #
+      # @return [Integer, nil]
+      #
+      def read_timeout
+        ENV['ARTIFACTORY_READ_TIMEOUT'].to_s.to_i || 120
+      end
+    end
+  end
+end
+
+module Artifactory
+  #
+  # A re-usable class containing configuration information for the {Client}. See
+  # {Defaults} for a list of default values.
+  #
+  module Configurable
+    #
+    # Reset all configuration options to their default values.
+    #
+    # @example Reset all settings
+    #   Artifactory.reset!
+    #
+    # @return [self]
+    #
+    def reset!
+      Defaults.reset!
+      Artifactory::Configurable.keys.each do |key|
+        instance_variable_set(:"@#{key}", Defaults.options[key])
+      end
+      self
+    end
+    alias_method :setup, :reset!
+  end
+end
 
 module CiCd
 	module Builder
@@ -48,6 +105,16 @@ module CiCd
           #   # config.proxy_address  = 'my.proxy.server'
           #   # config.proxy_port     = '8080'
           # end
+          if ENV['ARTIFACTORY_READ_TIMEOUT']
+            # [2015-04-29 Christo] Sometimes you just have to shake your head ...
+            # a) The Artifactory object does it's setup and read ENV variables during require phase ...
+            # b) They do not check if the passed value is valid ( in range or even a number at all ) and they don't convert it to an int
+            # c) ENV does not allow one to do this: ENV['ARTIFACTORY_READ_TIMEOUT'] = ENV['ARTIFACTORY_READ_TIMEOUT'].to_s.to_i
+            # d) ::Artifactory.setup and ::Artifactory.reset! does not reread those options!!!! OMG!
+            # Only resort: Open ::Artifactory class and override the method with the code it should have had ... %)
+            ::Artifactory.setup
+          end
+
           @client = ::Artifactory::Client.new()
         end
 
@@ -86,7 +153,7 @@ module CiCd
             else
               raise 'Artifact does not have file or data?'
             end
-            file_name, file_ext = get_artifact_file_name_ext(data)
+            file_name, file_ext = (data[:file_name] and data[:file_ext]) ? [data[:file_name], data[:file_ext]] : get_artifact_file_name_ext(data)
             if file_name =~ %r'\.+'
               raise "Unable to parse out file name in #{data[:file]}"
             end
@@ -210,22 +277,61 @@ module CiCd
         def maybeArtifactoryObject(artifact_name,artifact_version,wide=true)
           begin
             # Get a list of matching artifacts in this repository
-            result = @client.artifact_gavc_search(group: artifactory_org_path(), name: artifact_name, version: "#{artifact_version}", repos: [artifactory_repo()])
-            if result.size > 0
-              @logger.info "Artifactory gavc_search match g=#{artifactory_org_path()},a=#{artifact_name},v=#{artifact_version},r=#{artifactory_repo()}: #{result}"
-              # raise "GAVC started working: #{result.ai}"
+            @logger.info "Artifactory gavc_search g=#{artifactory_org_path()},a=#{artifact_name},v=#{artifact_version},r=#{artifactory_repo()}"
+            @arti_search_result     = []
+            # results = ::Parallel.map([:search,:progress], preserve_results: true, in_threads: 2) { |task|
+            #   if task == :search
+            #     @logger.debug 'searching ... '
+            #     @arti_search_result = @client.artifact_gavc_search(group: artifactory_org_path(), name: artifact_name, version: "#{artifact_version}", repos: [artifactory_repo()])
+            #     @logger.debug 'searching complete!'
+            #     raise ::Parallel::Kill
+            #     # raise ::Parallel::Break # -> stops after all current items are finished
+            #   else
+            #     progressbar = ::ProgressBar.create(:title => 'artifact_gavc_search', progress_mark: '=', length: 30, remainder_mark: '.')
+            #     30.times { |i|
+            #       @logger.debug i
+            #       sleep 1
+            #       progressbar.increment
+            #     }
+            #     raise ::Parallel::Kill
+            #   end
+            # }
+            monitor(30, 'artifact_gavc_search'){
+              @arti_search_result = @client.artifact_gavc_search(group: artifactory_org_path(), name: artifact_name, version: "#{artifact_version}", repos: [artifactory_repo()])
+            }
+            # noinspection RubyScope
+            if @arti_search_result.size > 0
+              @logger.info "\tresult: #{@arti_search_result}"
             elsif wide
               @logger.warn 'GAVC search came up empty!'
-              result = @client.artifact_search(name: artifact_name, repos: [artifactory_repo()])
-              @logger.info "Artifactory search match a=#{artifact_name},r=#{artifactory_repo()}: #{result}"
+              @arti_search_result = @client.artifact_search(name: artifact_name, repos: [artifactory_repo()])
+              @logger.info "Artifactory search match a=#{artifact_name},r=#{artifactory_repo()}: #{@arti_search_result}"
             end
-            result
+            @arti_search_result
           rescue Exception => e
             @logger.error "Artifactory error: #{e.class.name} #{e.message}"
             raise e
           end
         end
 
+        def monitor(limit,title='Progress')
+          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})
+          limit.times do
+            res = thread.join(1)
+            progressbar.increment
+            progressbar.total = limit
+            unless thread.alive? #or thread.stop?
+              puts ''
+              break
+            end
+          end
+          thread.kill if thread.alive? or thread.stop?
+        end
+
         def uploadArtifact(artifact_module, artifact_version, artifact_path, data)
           data[:size] = File.size(data[:file])
           artifact = ::Artifactory::Resource::Artifact.new(local_path: data[:file], client: @client)
@@ -236,10 +342,38 @@ 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"
-          result = artifact.upload(artifactory_repo(), "#{artifact_path}", data[:properties] || {})
-          @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Uploaded: #{result.attributes.select { |k, _| k != :client }.ai}"
-          artifact.upload_checksum(artifactory_repo(), "#{artifact_path}", :sha1, data[:sha1])
-          artifact.upload_checksum(artifactory_repo(), "#{artifact_path}", :md5,  data[:md5])
+          monitor(30, 'upload') {
+            @arti_upload_result = artifact.upload(artifactory_repo(), "#{artifact_path}", data[:properties] || {})
+          }
+          @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') {
+              begin
+                artifact.upload_checksum(artifactory_repo(), "#{artifact_path}", :sha1, data[:sha1])
+                @arti_upload_checksum = true
+              rescue Exception => e
+                @logger.fatal "Failed to upload #{artifact_path}: #{e.class.name} #{e.message}"
+                raise e
+              end
+            }
+            break if @arti_upload_checksum
+          }
+          raise "Failed to upload SHA1 for #{artifact_path}" unless @arti_upload_checksum
+          3.times{
+            @arti_upload_checksum = false
+            monitor(30, 'upload_checksum') {
+              begin
+                artifact.upload_checksum(artifactory_repo(), "#{artifact_path}", :md5,  data[:md5])
+                @arti_upload_checksum = true
+              rescue Exception => e
+                @logger.fatal "Failed to upload #{artifact_path}: #{e.class.name} #{e.message}"
+                raise e
+              end
+            }
+            break if @arti_upload_checksum
+          }
+          raise "Failed to upload MD5 for #{artifact_path}" unless @arti_upload_checksum
           attempt = 0
           objects = []
           while attempt < 3
@@ -258,8 +392,17 @@ module CiCd
               @logger.info "Not copying (identical artifact): #{artifact_path}"
             else
               @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Start copy #{artifact_path} = #{artifact.attributes[:size]} bytes"
-              result = artifact.copy("#{artifactory_repo()}/#{artifact_path}")
-              @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Copied: #{result.ai}"
+              copied = false
+              3.times{
+                copied = false
+                monitor(30){
+                  result = artifact.copy("#{artifactory_repo()}/#{artifact_path}")
+                  @logger.info "[#{Time.now.strftime('%Y-%m-%d %H:%M:%S %z')}] Copied: #{result.ai}"
+                  copied = true
+                }
+                break if copied
+              }
+              raise "Failed to copy #{artifact_path}" unless copied
             end
             objects = maybeArtifactoryObject(artifact_module, artifact_version, false)
             unless objects.size > 0
@@ -276,7 +419,7 @@ module CiCd
 
         # ---------------------------------------------------------------------------------------------------------------
         def uploadBuildArtifacts()
-          @logger.step __method__.to_s
+          @logger.step CLASS+'::'+__method__.to_s
           if @vars.has_key?(:build_dir) and @vars.has_key?(:build_pkg)
             begin
               artifacts = @vars[:artifacts] rescue []
@@ -314,6 +457,22 @@ module CiCd
           @vars[:return_code]
         end
 
+        # ---------------------------------------------------------------------------------------------------------------
+        def cleanupTempFiles
+          @vars[:artifacts].each do |art|
+            if art[:data][:temp].is_a?(FalseClass)
+              if File.exists?(art[:data][:file])
+                File.unlink(art[:data][:file]) if File.exists?(art[:data][:file])
+                art[:data].delete(:file)
+                art[:data].delete(:temp)
+              else
+                @logger.warn "Temporary file disappeared: #{data.ai}"
+                @vars[:return_code] = Errors::TEMP_FILE_MISSING
+              end
+            end
+          end
+        end
+
       end
     end
   end

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.48'
+		version = '0.9.50'
 		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.48
+  version: 0.9.50
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -210,6 +210,46 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement