cicd-builder 0.9.60 → 0.9.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc6b99c352bfeae879e2017c262df849b8ef1ed6
-  data.tar.gz: 77ad2b0ec613e1fd1051b59ca8f81f09e645ca30
+  metadata.gz: 246f9b00a120827355ddb4302ff2591b87b0c2ce
+  data.tar.gz: f5d332f8fee9bcbfc3ba0f6b34836e1ecdd349f9
 SHA512:
-  metadata.gz: 3c3db68a4f94b1a4637009859cc12bc665f610e43cce67052828cf85d7b3dd51245bfe8995d840837b217d5cfecf65a0d72bb976fc180e61353344ccb8ed6c99
-  data.tar.gz: a512f0fa9ddfae2a09c86273b2779e62d3215da0634fd00b316799aeb016ea72cbb856ee15b85849c244feb072cb35ce6945510edaa00c6b8fd2de8563e644ea
+  metadata.gz: 6a5bbed39584e9ce71a8ca73c48f4fda0739f70d1c64f27a6b77504040f46891c45034ddaefb18c778ae4d9adb20dd5633743108df15f1f53106d3ca69d42c8b
+  data.tar.gz: 0901978e2fb0bb255892c832bcc9e21291e09e9746c1aa2c311f29ef8afb93fc286b42fb7d676be38abae2e37ee65573dd3e6e7578f86edb385ea53d6247c4ea

data/Gemfile.lock

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

@@ -26,13 +26,18 @@ module CiCd
 				#raise Exception.new("Need these environment variables: #{missing}")
 				puts("Need these environment variables: #{missing.ai}")
         return 1
-			end
-			0
+      end
+      @default_options[:env_unused] = @default_options[:env_keys].select{|k| k !~ /^(WORKSPACE|JENKINS|BUILD_|JOB_|VERSION|RELEASE|VARIANT|BRANCH|GIT_|PROJECT_|REPO_)/}
+      @default_options[:env_unused] = @default_options[:env_unused].select{|k| k if ENV.has_key?(k) and ENV[k] != 'faked' }
+      0
 		end
 
 		# ---------------------------------------------------------------------------------------------------------------
 		def getVars()
       @logger.step CLASS+'::'+__method__.to_s
+
+      @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'

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

@@ -45,6 +45,7 @@ EC2 Instance profile
 
         # ---------------------------------------------------------------------------------------------------------------
         def uploadToRepo(artifacts)
+          @logger.info CLASS+'::'+__method__.to_s
           s3 = getS3()
           artifacts.each{|art|
 
@@ -150,6 +151,7 @@ EC2 Instance profile
 
         # ---------------------------------------------------------------------------------------------------------------
         def takeInventory()
+          @logger.info CLASS+'::'+__method__.to_s
           varianth  = nil
           # Read and parse in JSON
           key, json, over = pullInventory()
@@ -245,6 +247,7 @@ EC2 Instance profile
         end
 
         def pushInventory(json_s, key)
+          @logger.info CLASS+'::'+__method__.to_s
           begin
             md5 = Digest::MD5.hexdigest(json_s)
             # [:'x-amz-meta-digest'] = "md5=#{md5}"

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

@@ -313,7 +313,7 @@ module CiCd
               @arti_search_result = ::Artifactory::Resource::Artifact.latest_version(client: @client, group: artifactory_org_path(), name: artifact_name, repos: [repo || artifactory_repo()])
             }
             # noinspection RubyScope
-            if @arti_search_result.size > 0
+            if @arti_search_result and @arti_search_result.size > 0
               @logger.info "\tresult: #{@arti_search_result}"
             end
             @arti_search_result

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