cicd-builder 0.9.29 → 0.9.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 415377fd7d8dfce4e54220f50ba5d65099c746d0
-  data.tar.gz: 9e51456f4685596fd9362cf81832bfecd95d84a7
+  metadata.gz: 43b046d8964915ca088ec9c390dd871de1f7a1d0
+  data.tar.gz: a9b241bf89301f531bde18126ff8fd0920d4870c
 SHA512:
-  metadata.gz: 1b9e02aa90451bbcb104cfc0524de52298848d21977a14ef0cbc3fd1a72c9e29f7bd4feea07abd1da9145fd5a85c5d3fc836c7ccd5aa03a6f6dea0dce905962d
-  data.tar.gz: b4d532f9cbf491fd790130c166595a33dee3ebc7b1464a41962d2ed109711eb1716251f8a0a936dd9f1168c7debf4bd6ace23ff791d28cf6131c72ebe8d6e952
+  metadata.gz: 25df5d46329a2697d45f61bd84a54daaf4177a7c5ad841fc4c029f542fcb36b62a32c768e48f327da4159d43acb3b338e460dd9293fba5a6246dab4819088df4
+  data.tar.gz: 862aebbb48e63c7c7e13b90ccfc486862e25e55a709162f7908039a096a465ccb8387372704f9332f83f4ec8b38c02ec852dd3d0995d1c3485535cf01aad3080

data/Gemfile.lock

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

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

@@ -36,7 +36,7 @@ module CiCd
 
       unless @options[:inifile]
         if ENV.has_key?('INIFILE')
-          @vars[:inifile] = ENV['INIFILE']
+          @options[:inifile] = ENV['INIFILE']
         end
       end
 

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

@@ -6,12 +6,13 @@ module CiCd
     require 'cicd/builder/mixlib/repo/base'
     require 'cicd/builder/mixlib/repo/S3'
     # noinspection RubyResolve
-    if ENV.has_key?('REPO_TYPE') and (not ENV['REPO_TYPE'].capitalize.equal?('S3'))
+    if ENV.has_key?('REPO_TYPE') and (not ENV['REPO_TYPE'].capitalize.eql?('S3'))
       require "cicd/builder/mixlib/repo/#{ENV['REPO_TYPE'].downcase}"
     end
 
     # ---------------------------------------------------------------------------------------------------------------
 		def getRepoClass(type = nil)
+      @logger.info __method__.to_s
       if type.nil?
         type ||= 'S3'
         if ENV.has_key?('REPO_TYPE')
@@ -19,6 +20,7 @@ module CiCd
         end
       end
 
+      @logger.info "#{type} repo interface"
       clazz = Object.const_get("CiCd::Builder::Repo::#{type}")
       if block_given?
         if clazz.is_a?(Class) and not clazz.nil?

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

@@ -106,7 +106,7 @@ module CiCd
             unless file_name.empty? or file_name.match(%r'^-')
               file_name = "-#{file_name}"
             end
-            artifact_name = "#{data[:name]}-#{data[:version]}#{file_name}-#{@vars[:variant]}.#{file_ext}" # -#{data[:build]}
+            artifact_name = "#{data[:name]}-#{data[:version]}#{file_name}-#{data[:build]}.#{file_ext}" # -#{@vars[:variant]}
             artifact_path = "#{artifactory_org_path()}/#{data[:name]}/#{data[:version]}-#{@vars[:variant]}/#{artifact_name}"
             manifest[data[:name]] = artifact_path
             if objects.nil? or objects.size == 0

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