cicd-builder 0.9.15 → 0.9.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzlmOTAzYWNiZWVhZmVhNjk2ZDc2OWE2YzI3NzdiNjY3ZTE4ZGY2MA==
+    ZTBhYzk0OWI1ZWViMjJjZGI2ZWQ5OTViN2JhZDg1NjRiNjZkZTU4Mg==
   data.tar.gz: !binary |-
-    MGJiMWJmNTc0OTFjNjFkZTVjN2ViMjc3MGE2YmZhMjBmMmQyMmJmNw==
+    OTczNzEyMGUwMzhhNzdmZThlMTg4ZGJjZGZjZjk5MWVjNDFjOGEwYg==
 SHA512:
   metadata.gz: !binary |-
-    MGVjZjczM2FjYjZlMTAyMmY0YzdjMTEzNDhkZGNkZWFmNjMxZGYyYzFhOGUz
-    YTliODAzZGFjZGEyZTk3NmQyZTM0NDNmZTZjZDJjZGRjMDBlMjNmZjdkNGIz
-    ODVjMzI3OTA0Y2Q1YTEwZDJiMmRjYmQ1ZmYwOGY2ZWY5YzQwYzM=
+    MjIwMGU2NzNhZDQyNzYzYjI4OGUzZWExYjk4MzgzZjkzMjRmYzM1NjIxZWE2
+    ZGZiNDhmMjA5OWI2M2M4MWUxMTIxNWMyZmEyNjNmOGFhOWMxZjA0MjQyNTE5
+    NmU4MjYxOGM4NmUzOGExNTE2MjMyY2FiYWVmODZjOGY3ODRiYmI=
   data.tar.gz: !binary |-
-    NjY2ZmE4NjQwMzUzNTRkZGI0ZWQyZjFjYmEwZmQwNGQzMmE0YmNmNTdiMDg5
-    ODFlOTI3MmU5M2VkMDJjYzRmODQxYWQ4MmU1ODYxMGIyODZjYWMyNWQzZjA2
-    NjkyM2M2ZmI0YThmOWQ2YjlmOTI0ZjNlMDgwMWFhNzJhMWUwZTU=
+    YjdmNDUxMGQzYmRiOTU2NmJiNmZkYTA3MjdhYmZjN2RkNGI0ZWY3Y2M0MTZj
+    ZDIwNmQ1NDQ1ZmI1M2EyNjQ1MWJhZTRhMDlhMzZiZGYxZjJhZmFjNzlmMDVi
+    MmMzZGUxOTRkNmFmNWRlYzUzODBjZWMyZWI2MDU4MDNjOTlmOTk=

data/lib/cicd/builder.rb

@@ -2,6 +2,8 @@ require 'cicd/builder/version'
 module CiCd
 	module Builder
 
+    ENV_IGNORED = %w(LS_COLORS AWS_ACCESS_KEY AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SECRET_KEY)
+
 		require 'awesome_print'
 		require 'optparse'
 		require 'inifile'

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

@@ -91,7 +91,7 @@ module CiCd
     end
 
     # ---------------------------------------------------------------------------------------------------------------
-		def saveEnvironment(ignored=['LS_COLORS','AWS_ACCESS_KEY_ID','AWS_SECRET_ACCESS_KEY'])
+		def saveEnvironment(ignored=ENV_IGNORED)
 			@logger.info "Save environment to #{@vars[:vars_fil]}"
 			vstr = ['[global]']
 			ENV.to_hash.sort.each{|k,v|
@@ -136,7 +136,7 @@ module CiCd
           end
           @logger.info "Save latest build info to #{@vars[:latest_fil]}"
           IO.write(@vars[:latest_fil], "#{@vars[:build_ver]}\n#{@vars[:build_sha]}")
-          saveEnvironment(['LS_COLORS','AWS_ACCESS_KEY_ID','AWS_SECRET_ACCESS_KEY'])
+          saveEnvironment(ENV_IGNORED)
           # NOTE the '.note'!
           @logger.note "CHANGE: #{ENV['JOB_NAME']} (#{@vars[:build_ver]}[#{@vars[:build_sha]}])"
 
@@ -162,7 +162,7 @@ module CiCd
     end
 
 		# ---------------------------------------------------------------------------------------------------------------
-		def reportStatus(ignored=['AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY'])
+		def reportStatus(ignored=ENV_IGNORED)
       # [2013-12-30 Christo] Report status,environment, etc.
 
 			if @logger.level < ::Logging::LEVELS['warn']

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

@@ -409,15 +409,15 @@ module CiCd
 			# manifest.delete(:api)
 			# manifest.delete(:core)
 			manifest[:vars] = {}
-			@vars.each { |k, v|
+			@vars.sort.each { |k, v|
 				unless %w(build_mdd build_txt).include?(k.to_s)
 					manifest[:vars][k.to_s] = v
 				end
 			}
 			manifest = downcaseHashKeys(manifest)
 			manifest[:env] = {}
-			ENV.each { |k, v|
-				unless %w(LS_COLORS AWS_ACCESS_KEY AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SECRET_KEY).include?(k.to_s)
+			ENV.to_hash.sort.each { |k, v|
+				unless ENV_IGNORED.include?(k.to_s)
 					manifest[:env][k.to_s] = v
 				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.15'
+		version = '0.9.16'
 		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.15
+  version: 0.9.16
 platform: ruby
 authors:
 - Christo De Lange