manifest-builder 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb7a10cea298c3e7dd6c62870a4e69a9c86c6ecd
-  data.tar.gz: 2630a89b347baaff18da7893e3c93670201ae310
+  metadata.gz: 60db236a806378564e531600878a0f8b04c7364c
+  data.tar.gz: 08cc016081a8f04a9a2fca6c0034aabe9591f0e9
 SHA512:
-  metadata.gz: 6fe600a91561d1eef1f90c240f18dfd73c84e5270f32ccf351eb07b39147c4728bfb2d8ae1d91ac6d35230954106fda7349ed7269d3501f5549ddedec8fd1520
-  data.tar.gz: 85ab2a8d2699e79e12b4b36cd7091ebdeb7749625629b62cd9253f417eb38770f68a5c06a1d7f09afeca5358527bdaac749e94a1e045c73e9945d461635b58cd
+  metadata.gz: 86e83f836a183772433dd1c63323fd0e4fdaa0465f0c4115929170815c7b4228ea1964c48bc491db0312f7b18a4f5e50b233c8adceadeb2eb563bca51b9f3956
+  data.tar.gz: 36731d0cc6942426305adee38cfadaddb23228f8ed004d6bd8adcccfb20d0ab60bea70f8cedf006e963c045f2ca8abb70117e689d70757a113feffa47ce7637d

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    manifest-builder (0.5.2)
+    manifest-builder (0.5.4)
       archive-tar-minitar (= 0.5.2)
       chefrepo-builder (>= 0.9.27, < 1.1)
-      cicd-builder (>= 0.9.36, < 1.1)
+      cicd-builder (>= 0.9.37, < 1.1)
       json (>= 1.8.1, < 1.9)
       s3etag (>= 0.0.1, < 0.1.0)
 
@@ -18,7 +18,7 @@ PATH
 PATH
   remote: ../cicd-builder
   specs:
-    cicd-builder (0.9.36)
+    cicd-builder (0.9.37)
       artifactory (>= 2.2.1, < 2.3)
       awesome_print (>= 1.6, < 2.0)
       aws-sdk (>= 2.0, < 2.1)

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

@@ -70,10 +70,11 @@ module CiCd
 
         VER_RGX = %r'^\d+\.\d+(\.?\d)*$'
         MMP_RGX = %r'^(\d+\.?){2,3}$'
+        EXT_RGX = %r'\.*(tar\.gz|tgz|tar.bzip2|bzip2|bz2|jar|war|[a-z]+)$'
         # ---------------------------------------------------------------------------------------------------------------
         def getVersionBuildFromName(artifact)
           version = artifact.dup
-          version.gsub!(%r'\.*(tar\.gz|tgz|bzip2|bz2|jar|war|[a-z]+)$', '')
+          version.gsub!(EXT_RGX, '')
           version.gsub!(%r'^[a-zA-Z\-._]+', '')
           build = ''
           if version.match(VER_RGX)

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

@@ -48,13 +48,13 @@ module CiCd
             unless ENV['PROJECT_NAMES'].nil?
               if File.exists?(ENV['PROJECT_NAMES'])
                 @logger.info "Load PROJECT_NAMES: #{ENV['PROJECT_NAMES']}"
-                project_names = JSON.load(IO.read(ENV['PROJECT_NAMES']))
+                project_names = JSON.load(IO.read(ENV['PROJECT_NAMES'])) || {}
               else
                 @logger.error "The PROJECT_NAMES file (#{ENV['PROJECT_NAMES']}) does not exist!"
                 @vars[:return_code] = Errors::NO_PROJECT_NAMES
               end
             end
-            exts = Hash[@vars[:artifacts].map { |a| [a[:data][:name], File.extname(File.basename(a[:data][:file])).gsub(%r'^\.', '')] }]
+            exts = Hash[@vars[:artifacts].map { |a| [a[:data][:name], File.basename(a[:data][:file]).match(CiCd::Builder::Manifest::Build::EXT_RGX)[1]] }]
             @manifest.each do |mod, man|
               man.each do |prod, build|
                 projects[prod] = {

data/lib/cicd/builder/manifest/version.rb

@@ -2,7 +2,7 @@ module CiCd
   module Builder
     module Manifest
       # manifest-builder version
-      VERSION = '0.5.2'
+      VERSION = '0.5.4'
       MAJOR, MINOR, TINY = VERSION.split('.')
       PATCH = TINY
     end

data/manifest-builder.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'cicd-builder', '>= 0.9.36', '< 1.1'
+  gem.add_dependency 'cicd-builder', '>= 0.9.37', '< 1.1'
   gem.add_dependency 'chefrepo-builder', '>= 0.9.27', '< 1.1'
   # gem.add_dependency 'ansiblerepo-builder', '>= 0.3.7', '< 0.5'
   gem.add_dependency 'json', '>= 1.8.1', '< 1.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manifest-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cicd-builder
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.36
+        version: 0.9.37
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.36
+        version: 0.9.37
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'