vagrant-config_builder 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODkzZWVlNDVkOGVjNWZjN2I0OWU0Zjg4OTllMTJjNmFhMGM5Y2Y0Zg==
+  data.tar.gz: !binary |-
+    Mzc0NzNmZmZhNzE5MzMwMWI1NzgzYTRjOTY5N2I1NzcwNzYzOWZhNQ==
+SHA512:
+  metadata.gz: !binary |-
+    M2YzNjQ2NzNkY2M3ZjQyYTlkMTdiYWQ4YWU1YTNhZGRkNDE0NjAyMWY0NDM5
+    ZjU2NWQxYWQyNmU3MWUzYjkyZDllYWVhODU1MTM4MTk3YjVkMDVmMjUwNmVl
+    NDA1NTczNjhiMDM3ZmVjMTIxZjY1Yzg5OGE1MjE5M2VkMThlYmQ=
+  data.tar.gz: !binary |-
+    YjViZjQ1MDU0MmU3MTlkMzY3YzQ1YzlkMjlmMmI0NDQ2NmJiZGRjMGIyNjQz
+    YTc0OTI3NzFiNGQ1ZDBkZTZkNGNiZWEyMTlhZTIwMTA0N2VjMzA0YWU1NDY0
+    N2M5YzkxZGQyYTVlYmY2ZGNkMjUzMWYzYThmMDJlNjk1MmZhM2Y=

data/CHANGELOG

@@ -1,6 +1,18 @@
 CHANGELOG
 =========
 
+0.7.0
+-----
+
+2014-03-19
+
+This is a backwards compatible feature release.
+
+  * (GH-15) Deep merge data when loading configurations. This allows
+    individual top level keys to be split up between files.
+
+Thanks to Charlie Sharpsteen creating this release.
+
 0.6.0
 -----
 

data/Gemfile

@@ -8,3 +8,7 @@ group :development do
   # Vagrant environment itself using `vagrant plugin`.
   gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
 end
+
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
+end

data/lib/config_builder/loader/yaml.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'deep_merge'
 
 class ConfigBuilder::Loader::YAML
 
@@ -23,7 +24,7 @@ class ConfigBuilder::Loader::YAML
     files.each do |file|
       contents = ::YAML.load_file(file)
       if contents.is_a? Hash
-        rv.merge! contents
+        rv.deep_merge! contents
       end
     end
 

data/lib/config_builder/version.rb

@@ -1,3 +1,3 @@
 module ConfigBuilder
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/config_builder/loader/yaml_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe ConfigBuilder::Loader::YAML do
+  describe '#yamldir' do
+
+    before :each do
+      # Simulate directories of YAML files for the loader.
+      allow(File).to receive(:join).with('tst_dir_a', anything()).and_return('tst_dir_a')
+      allow(File).to receive(:join).with('tst_dir_b', anything()).and_return('tst_dir_b')
+
+      allow(Dir).to receive(:glob).with('tst_dir_a').and_return(['a/boxes.yaml', 'a/roles.yaml'])
+      allow(Dir).to receive(:glob).with('tst_dir_b').and_return(['b/boxes.yaml', 'b/roles.yaml'])
+
+      allow(::YAML).to receive(:load_file).with('a/boxes.yaml').and_return(::YAML.load <<-EOF)
+---
+boxes:
+  'box-a': 'http://puppet-vagrant-boxes.puppetlabs.com/'
+      EOF
+
+      allow(::YAML).to receive(:load_file).with('a/roles.yaml').and_return(::YAML.load <<-EOF)
+---
+roles:
+  base:
+    private_networks:
+      - {ip: '0.0.0.0', auto_network: true}
+      EOF
+
+      allow(::YAML).to receive(:load_file).with('b/boxes.yaml').and_return(::YAML.load <<-EOF)
+---
+boxes:
+  'box-b': 'http://puppet-vagrant-boxes.puppetlabs.com/'
+      EOF
+
+      allow(::YAML).to receive(:load_file).with('b/roles.yaml').and_return(::YAML.load <<-EOF)
+---
+roles:
+  base:
+    private_networks:
+      - {ip: '10.0.0.1'}
+      EOF
+    end
+
+
+    it 'loads from single directories' do
+      subject.yamldir('tst_dir_a')
+
+      expect(::YAML).to have_received(:load_file).exactly(2).times
+    end
+
+    it 'loads from multiple directories' do
+      subject.yamldir(['tst_dir_a', 'tst_dir_b'])
+
+      expect(::YAML).to have_received(:load_file).exactly(4).times
+    end
+
+    it 'merges separate hashes' do
+      config = subject.yamldir('tst_dir_a')
+
+      expect(config).to have_key('boxes')
+      expect(config).to have_key('roles')
+    end
+
+    describe 'when merging overlapping configs' do
+      let(:config) { subject.yamldir(['tst_dir_a', 'tst_dir_b']) }
+
+      it 'merges subhashes' do
+        expect(config['boxes']).to have_key('box-a')
+        expect(config['boxes']).to have_key('box-b')
+      end
+
+      it 'concatenates subarrays' do
+        expect(config['roles']['base']['private_networks']).to have(2).items
+      end
+    end
+  end
+end

data/vagrant-config_builder.gemspec

@@ -17,5 +17,7 @@ Gem::Specification.new do |gem|
   gem.files        = %x{git ls-files -z}.split("\0")
   gem.require_path = 'lib'
 
+  gem.add_runtime_dependency 'deep_merge', '~> 1.0.0'
+
   gem.add_development_dependency 'rspec', '~> 2.14.0'
 end

metadata

@@ -1,20 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-config_builder
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,33 +80,33 @@ files:
 - lib/vagrant-config_builder.rb
 - spec/config_builder/filter/boxes_spec.rb
 - spec/config_builder/filter/roles_spec.rb
+- spec/config_builder/loader/yaml_spec.rb
 - spec/spec_helper.rb
 - templates/locales/en.yml
 - vagrant-config_builder.gemspec
 homepage: https://github.com/adrienthebo/vagrant-config_builder
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate Vagrant configurations from arbitrary data
 test_files: []
 has_rdoc: true