manifest-builder 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ae0285265845a5371e419d63d76abbd675537b5
-  data.tar.gz: 47685004a747aa84b01cd59128a14abd544b38c7
+  metadata.gz: a766360163b33ceb57ef4b810f9ae432825fbb7c
+  data.tar.gz: b484221ccdb7630ece63244900d792b6e0bf2471
 SHA512:
-  metadata.gz: 7bf30365f817659e7557d1a1beb4f6990635080ec8b25e1e680315e32de2bc99944768146901396f0d19989124f2836a9d4df35bfb3df12c8d608867b53c3d3d
-  data.tar.gz: 2e1e9b6a61ba36a9a7ecb76dce8f15062d1180134efe8301dc6f0005ce43a25c4f2e085336c5f1973b53b895316fecc415a3a73f2a2fc49edc243c47502100b2
+  metadata.gz: 8c103fc253d1c67b2ff123c6a87b130a2bcdbf70c49b9f880499ba60b607e24683b98c06fba047e19de8aa1878c5cf8be9715cef6904b967b74770d884ae78be
+  data.tar.gz: c3a59d4c9426f8210cf62442a91428effac24b761b74f0d7d9cb8ef4cfa3ed68147a11ad018e1c0ef89e2ddbbf4a227f601d9f72adff1bc3cd13e799a626e612

data/Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    manifest-builder (0.5.13)
+    manifest-builder (0.5.14)
       archive-tar-minitar (= 0.5.2)
-      chefrepo-builder (>= 0.9.27, < 1.1)
-      cicd-builder (>= 0.9.43, < 1.1)
+      chefrepo-builder (>= 0.9.30, < 1.1)
+      cicd-builder (>= 0.9.46, < 1.1)
       json (>= 1.8.1, < 1.9)
       s3etag (>= 0.0.1, < 0.1.0)
 
 PATH
   remote: ../chefrepo-builder
   specs:
-    chefrepo-builder (0.9.27)
-      cicd-builder (>= 0.9.41, < 1.1)
+    chefrepo-builder (0.9.30)
+      cicd-builder (>= 0.9.46, < 1.1)
       json (= 1.8.1)
 
 PATH
   remote: ../cicd-builder
   specs:
-    cicd-builder (0.9.43)
+    cicd-builder (0.9.46)
       artifactory (>= 2.2.1, < 2.3)
       awesome_print (>= 1.6, < 2.0)
       aws-sdk (>= 2.0, < 2.1)
@@ -36,15 +36,14 @@ GEM
     archive-tar-minitar (0.5.2)
     artifactory (2.2.1)
     awesome_print (1.6.1)
-    aws-sdk (2.0.30)
-      aws-sdk-resources (= 2.0.30)
-    aws-sdk-core (2.0.30)
+    aws-sdk (2.0.38)
+      aws-sdk-resources (= 2.0.38)
+    aws-sdk-core (2.0.38)
       builder (~> 3.0)
       jmespath (~> 1.0)
       multi_json (~> 1.0)
-      multi_xml (~> 0.5)
-    aws-sdk-resources (2.0.30)
-      aws-sdk-core (= 2.0.30)
+    aws-sdk-resources (2.0.38)
+      aws-sdk-core (= 2.0.38)
     builder (3.2.2)
     chef (12.0.3)
       chef-zero (~> 3.2)
@@ -77,7 +76,7 @@ GEM
       term-ansicolor (>= 1.0.5)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    ffi (1.9.6)
+    ffi (1.9.8)
     ffi-yajl (1.4.0)
       ffi (~> 1.5)
       libyajl2 (~> 1.2)
@@ -105,24 +104,21 @@ GEM
     mixlib-log (1.6.0)
     mixlib-shellout (2.0.1)
     multi_json (1.11.0)
-    multi_xml (0.5.5)
-    net-dhcp (1.3.2)
     net-ssh (2.9.2)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.0)
+    net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    ohai (8.1.1)
+    ohai (8.2.0)
       ffi (~> 1.9)
-      ffi-yajl (~> 1.1)
+      ffi-yajl (>= 1.1, < 3.0)
       ipaddress
       mime-types (~> 2.0)
       mixlib-cli
       mixlib-config (~> 2.0)
       mixlib-log
       mixlib-shellout (~> 2.0)
-      net-dhcp
       rake (~> 10.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
@@ -145,7 +141,7 @@ GEM
     s3etag (0.0.1)
     semverse (1.2.1)
     slop (3.6.0)
-    systemu (2.6.4)
+    systemu (2.6.5)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     tins (1.3.5)

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

@@ -79,8 +79,25 @@ module CiCd
                   class_filter: '',
               }
             end
+
+            require 'chef/mixin/deep_merge'
+            old_projects = File.exists?(ENV['PROJECTS_FILE']) ? JSON.load(IO.read(ENV['PROJECTS_FILE'])) : {}
+            projects = Chef::Mixin::DeepMerge.deep_merge(projects, old_projects)
             @logger.info "Save PROJECTS_FILE: #{ENV['PROJECTS_FILE']}"
             IO.write(ENV['PROJECTS_FILE'], JSON.pretty_generate(projects, {indent: "\t", space: ' '}))
+            data = {
+                          name: 'projects-file',
+                        module: 'projects-file',
+                          file: ENV['PROJECTS_FILE'],
+                       version: @vars[:build_ver],
+                         build: @vars[:build_num],
+                    properties: @properties_matrix,
+                          temp: false,
+                          sha1: Digest::SHA1.file(ENV['PROJECTS_FILE']).hexdigest,
+                           md5: Digest::MD5.file(ENV['PROJECTS_FILE']).hexdigest,
+                   }
+
+            maybeUploadArtifactoryObject(data: data, artifact_module: data[:name], artifact_version: data[:version] || @vars[:version], file_name: '', file_ext: 'json')
           end
 
           def createSuperManifest(manifest)

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

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

data/manifest-builder.gemspec

@@ -17,8 +17,8 @@ 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.43', '< 1.1'
-  gem.add_dependency 'chefrepo-builder', '>= 0.9.27', '< 1.1'
+  gem.add_dependency 'cicd-builder', '>= 0.9.46', '< 1.1'
+  gem.add_dependency 'chefrepo-builder', '>= 0.9.30', '< 1.1'
   # gem.add_dependency 'ansiblerepo-builder', '>= 0.3.7', '< 0.5'
   gem.add_dependency 'json', '>= 1.8.1', '< 1.9'
   gem.add_dependency 's3etag', '>= 0.0.1', '< 0.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manifest-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-18 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.43
+        version: 0.9.46
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.43
+        version: 0.9.46
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.27
+        version: 0.9.30
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.27
+        version: 0.9.30
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'