cicd-builder 0.9.13 → 0.9.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGQxZGI3YjY3ZTcyM2I2Zjk2YTkzMjczMmRiMjhhYjNhNjU3OWYyZg==
+    ZGU0MDk0MjEzOTYxNWVhNjlhNDVlNjA5NjU0MTVmOGUwZjk4ODI1ZQ==
   data.tar.gz: !binary |-
-    NGI2MTQxOTk3ZjUxNDQzMTRhMTMwNzMzMjZjMDhiYzZmMmQ2MTk0ZA==
+    NjVhMGE4ZGZiNTcyNDgxOGJmOWVmZDY4MjM3MzBiYmQyY2JmMzRmYg==
 SHA512:
   metadata.gz: !binary |-
-    NDgyMzkwMTE1NTgyODI3ZjhhNTNjZWU0Mjg5YTdlMTExMWI4ZDgyOWUxMzBi
-    NWRhOTkwZmI3YjA2M2Y4MjI5ODcyZTdlYWQwN2QyNjJjMmFlZjcyNjUwZDZm
-    MDgyNmMxZGQ1ZDljNjIwY2YyNDE1MzhiZmUxMGY0ZjAzNzE0MzQ=
+    MjhjNDQ0OGJkY2JkZTg4NWY1YzdjYTkwNjQxNDYyMmNlNDAwYjMxN2M5OWVl
+    ZjkxM2JkNGZmYTdlNzQ2MzRkZWFmNmRiNTM0YTU4Y2U3MTdhYTRjZjIyNTc0
+    NGZmZDFjNGVmZDUzNWZjODljOGEwOGQ2Y2Y4MmU4MGIwYThhN2M=
   data.tar.gz: !binary |-
-    N2Y1ZjBhNzhlN2IxMDkzMTMxMWYxYTE4NGVhNzkwYjBlNTQ0MmUyODYxNWQ0
-    ZGVmMmU4OGQxNmE4NTdkMTMxNmY2YTFkYmU5ZGE1NzcwYmM0NmJjY2U1OTcz
-    NmEyMjliMTlhZjNjOTc2ZWE1YTM3ZTYwNmMwNjRmMDRjMWJkZWU=
+    MTFjNTdkNTRmNTk2NWVlN2NiMzE3N2VjMTMxNzFkNzI5NzlmMTVlMTA2NzBm
+    YzY2ZWQ4MDE2Yzg3ZGI1YmUzZWFhNjA3Y2QyNTAzZjMwZjE2YTE1ZjcwZmIz
+    ZmZkMjZjM2I0NzgzY2UyZjY2MzQzMDAzZWJjZDhjYTY0NDRlOTM=

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

@@ -31,13 +31,13 @@ module CiCd
     # ---------------------------------------------------------------------------------------------------------------
     def prepareBuild()
       meta = {}
-      %w[ WORKSPACE PROJECT_NAME VERSION RELEASE ].each do |e|
+      %w[ WORKSPACE PROJECT_NAME ].each do |e|
         unless ENV.has_key?(e)
           raise "#{e} environment variable is required"
         end
       end
-      meta[:Version] = ENV['VERSION']
-      meta[:Release] = ENV['RELEASE']
+      meta[:Version] = @vars[:version]
+      meta[:Release] = @vars[:release]
 
       place = ''
       begin

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

@@ -39,6 +39,18 @@ module CiCd
 
 			if ENV.has_key?('RELEASE')
 				@vars[:release] = ENV['RELEASE']
+      elsif File.exists?((version_file=File.join(ENV['REPO_DIR'], 'RELEASE')))
+        @vars[:release] = File.readlines(version_file).shift
+      else
+        raise "'RELEASE' was not provided in either environment or #{version_file} file"
+			end
+
+			if ENV.has_key?('VERSION')
+				@vars[:version] = ENV['VERSION']
+      elsif File.exists?((version_file=File.join(ENV['REPO_DIR'], 'VERSION')))
+        @vars[:version] = File.readlines(version_file).shift
+      else
+        raise "'VERSION' was not provided in either environment or #{version_file} file"
 			end
 
 			if ENV.has_key?('BUILD_STORE')

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