chefrepo-manifest-builder 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6614fe710b34fa6c6eb1ad8c84e176d0ccdf7597
-  data.tar.gz: eeeaa265dd63b57ceceeb4a112cbe443ca7bc961
+  metadata.gz: f1ab1c409fda52721444e07c6d0da3ae397f5043
+  data.tar.gz: fd22b9405ad60191433c9c5fb371fa48ef6ff538
 SHA512:
-  metadata.gz: eb1c809fd689e4518c6417e904ef88fef3d6ded7c07e59d14e92ad3c2d98ddb24302736f258135f8a9a8e284efb43ac6b4a04ba83e2bf8886741dba8b85065b3
-  data.tar.gz: 58549b5b6ecd798d1f68d259fa5b1c4d3bec951c7cfe786f2ed9fa869c8fac9672064857185966b83ae956ae1625448285be65257c1910be76c20df11e81a19f
+  metadata.gz: 44843ba2a9de7f1a54f05cbf9144f232cd7b9917f4b3867ec5865116221ffa12482d055d89018554cb1d239957702fa4d51cd3a49b7d28b207a7a478babfa9a1
+  data.tar.gz: 934b25c79017439604f539d32d5bd0af6076669510d7952f5bc343cc1b024162af7dbeeda056b5d8ad8154bfbc6d89751e173ae6d4ec6185d7318363c92bdada

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    chefrepo-manifest-builder (0.2.2)
+    chefrepo-manifest-builder (0.2.3)
       archive-tar-minitar (= 0.5.2)
       json (>= 1.8.1, < 1.9)
-      manifest-builder (>= 0.7.0, < 1.1)
+      manifest-builder (>= 0.7.2, < 1.1)
       s3etag (>= 0.0.1, < 0.1.0)
 
 PATH
@@ -34,7 +34,7 @@ PATH
 PATH
   remote: ../manifest-builder
   specs:
-    manifest-builder (0.7.1)
+    manifest-builder (0.7.2)
       archive-tar-minitar (= 0.5.2)
       chefrepo-builder (>= 0.9.41, < 1.1)
       json (>= 1.8.1, < 1.9)

data/chefrepo-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 'manifest-builder', '>= 0.7.0', '< 1.1'
+  gem.add_dependency 'manifest-builder', '>= 0.7.2', '< 1.1'
   gem.add_dependency 'json', '>= 1.8.1', '< 1.9'
   gem.add_dependency 's3etag', '>= 0.0.1', '< 0.1.0'
   gem.add_dependency 'archive-tar-minitar', '= 0.5.2'

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

@@ -25,6 +25,7 @@ module CiCd
                   @logger.error "Bad repo/inventory specified. s3://#{ENV['AWS_S3_BUCKET']}/#{key}"
                   @vars[:return_code] = Errors::PRUNE_BAD_REPO
                 else
+                  versrels = nil
                   if json['container'] and json['container']['variants']
                     # but does not have our variant ...
                     variants = json['container']['variants']
@@ -71,20 +72,20 @@ module CiCd
                         end
                         unless drawer
                           if branches.include?(@vars[:branch])
-                            survivors = builds.select{ |drawer|
-                              bra = @repo._getBranch(@vars, drawer)
+                            survivors = builds.select{ |dwr|
+                              bra = @repo._getBranch(@vars, dwr)
                               bra == @vars[:branch]
                             }
                             builds = survivors
                             if versions.include?(@vars[:version])
-                              survivors = builds.select{ |drawer|
-                                ver = @repo._getVersion(@vars, drawer)
+                              survivors = builds.select{ |draw|
+                                ver = @repo._getVersion(@vars, draw)
                                 ver == @vars[:version]
                               }
                               builds = survivors
-                              if versrels.include?("#{@vars[:version]}-#{@vars[:release]}")
-                                survivors = builds.select{ |drawer|
-                                  rel = @repo._getRelease(@vars, drawer)
+                              if versrels and versrels.include?("#{@vars[:version]}-#{@vars[:release]}")
+                                survivors = builds.select{ |draw|
+                                  rel = @repo._getRelease(@vars, draw)
                                   rel == @vars[:release]
                                 }
                                 builds = survivors

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

@@ -2,7 +2,7 @@ module CiCd
   module Builder
     module ChefRepoManifest
       # chefrepo-manifest-builder version
-      VERSION = '0.2.2'
+      VERSION = '0.2.3'
       MAJOR, MINOR, TINY = VERSION.split('.')
       PATCH = TINY
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chefrepo-manifest-builder
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: manifest-builder
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'