manifest-builder 0.5.15 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50212867c1d7f1bfa1a2898d7c7c4b1beccd80db
-  data.tar.gz: 28e55efb3736f02f9bab4a9d3b6912930317299f
+  metadata.gz: ffd8bef49ca4e0886fd5532da54da27c4b6bfbd7
+  data.tar.gz: 50f0f52111d62b9850957f4e498f181edb3e80c6
 SHA512:
-  metadata.gz: 683549674e7679d134bfbf7f08a5cd2b48d9d8bc5f72b61c6eb77ae15f4749175abbcbf5e09fc7103a90cd182753dd174083c79c03d135cafafc04f37fd66998
-  data.tar.gz: 73f2c1e912c8ffddd69bc1b4da5feeccd56fc892e3453e4a02cfd4743263e52ef7b36cd2b645aeebab3c7ea686e164afd6e58a19d9f7fce5aa1632375fda5e41
+  metadata.gz: e29f04b796c242f71f6feced462cf3d3a2f09228578b0ecfe0293967d984d09cc835687f7c96511fb5ec28843fc86f6861b3208bff13be9698009f3c008fe660
+  data.tar.gz: 5a9d3cfc3e4eeffd30f9204850ff60f0aefdab23b9381fb426a60e7e9e0d5a3c69cd53a0239bd50ff1bf0871358ae96abf2f5b2b8d06584321841fbf721051b7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    manifest-builder (0.5.15)
+    manifest-builder (0.6.0)
       archive-tar-minitar (= 0.5.2)
       chefrepo-builder (>= 0.9.31, < 1.1)
       cicd-builder (>= 0.9.47, < 1.1)

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

@@ -80,11 +80,13 @@ module CiCd
               }
             end
 
+            require 'chef/mash'
             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)
+            old_projects = Chef::Mash.new(File.exists?(ENV['PROJECTS_FILE']) ? JSON.load(IO.read(ENV['PROJECTS_FILE'])) : {})
+            projects = Chef::Mash.new(projects)
+            projects = Chef::Mash.new(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: ' '}))
+            IO.write(ENV['PROJECTS_FILE'], JSON.pretty_generate(projects.to_hash, {indent: "\t", space: ' '}))
             data = {
                           name: 'projects-file',
                         module: 'projects-file',

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manifest-builder
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.6.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cicd-builder