manifest-builder 0.5.15 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/lib/cicd/builder/manifest/mixlib/repo/artifactory.rb +5 -3
  4. data/lib/cicd/builder/manifest/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 50212867c1d7f1bfa1a2898d7c7c4b1beccd80db
4
- data.tar.gz: 28e55efb3736f02f9bab4a9d3b6912930317299f
3
+ metadata.gz: ffd8bef49ca4e0886fd5532da54da27c4b6bfbd7
4
+ data.tar.gz: 50f0f52111d62b9850957f4e498f181edb3e80c6
5
5
  SHA512:
6
- metadata.gz: 683549674e7679d134bfbf7f08a5cd2b48d9d8bc5f72b61c6eb77ae15f4749175abbcbf5e09fc7103a90cd182753dd174083c79c03d135cafafc04f37fd66998
7
- data.tar.gz: 73f2c1e912c8ffddd69bc1b4da5feeccd56fc892e3453e4a02cfd4743263e52ef7b36cd2b645aeebab3c7ea686e164afd6e58a19d9f7fce5aa1632375fda5e41
6
+ metadata.gz: e29f04b796c242f71f6feced462cf3d3a2f09228578b0ecfe0293967d984d09cc835687f7c96511fb5ec28843fc86f6861b3208bff13be9698009f3c008fe660
7
+ data.tar.gz: 5a9d3cfc3e4eeffd30f9204850ff60f0aefdab23b9381fb426a60e7e9e0d5a3c69cd53a0239bd50ff1bf0871358ae96abf2f5b2b8d06584321841fbf721051b7
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- manifest-builder (0.5.15)
4
+ manifest-builder (0.6.0)
5
5
  archive-tar-minitar (= 0.5.2)
6
6
  chefrepo-builder (>= 0.9.31, < 1.1)
7
7
  cicd-builder (>= 0.9.47, < 1.1)
data/lib/cicd/builder/manifest/mixlib/repo/artifactory.rb CHANGED
@@ -80,11 +80,13 @@ module CiCd
80
80
  }
81
81
  end
82
82
 
83
+ require 'chef/mash'
83
84
  require 'chef/mixin/deep_merge'
84
- old_projects = File.exists?(ENV['PROJECTS_FILE']) ? JSON.load(IO.read(ENV['PROJECTS_FILE'])) : {}
85
- projects = Chef::Mixin::DeepMerge.deep_merge(projects, old_projects)
85
+ old_projects = Chef::Mash.new(File.exists?(ENV['PROJECTS_FILE']) ? JSON.load(IO.read(ENV['PROJECTS_FILE'])) : {})
86
+ projects = Chef::Mash.new(projects)
87
+ projects = Chef::Mash.new(Chef::Mixin::DeepMerge.deep_merge(projects, old_projects))
86
88
  @logger.info "Save PROJECTS_FILE: #{ENV['PROJECTS_FILE']}"
87
- IO.write(ENV['PROJECTS_FILE'], JSON.pretty_generate(projects, {indent: "\t", space: ' '}))
89
+ IO.write(ENV['PROJECTS_FILE'], JSON.pretty_generate(projects.to_hash, {indent: "\t", space: ' '}))
88
90
  data = {
89
91
  name: 'projects-file',
90
92
  module: 'projects-file',
data/lib/cicd/builder/manifest/version.rb CHANGED
@@ -2,7 +2,7 @@ module CiCd
2
2
  module Builder
3
3
  module Manifest
4
4
  # manifest-builder version
5
- VERSION = '0.5.15'
5
+ VERSION = '0.6.0'
6
6
  MAJOR, MINOR, TINY = VERSION.split('.')
7
7
  PATCH = TINY
8
8
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: manifest-builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.15
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christo De Lange
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-20 00:00:00.000000000 Z
11
+ date: 2015-04-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cicd-builder