vagrant-config_builder 0.5.0 → 0.6.0

data/CHANGELOG

@@ -1,6 +1,18 @@
 CHANGELOG
 =========
 
+0.6.0
+-----
+
+2013-10-17
+
+This is a backwards incompatible feature release.
+
+  * Loader::YAML#yamldir can now accept a list of directories to use for
+    configuration.
+
+Thanks to Charlie Sharpsteen for his help on this release.
+
 0.5.0
 -----
 

data/examples/Vagrantfile

@@ -0,0 +1 @@
+Vagrant.configure('2', &ConfigBuilder.load(:yaml, :yamldir, '/path/to/config'))

data/lib/config_builder/loader/yaml.rb

@@ -2,22 +2,28 @@ require 'yaml'
 
 class ConfigBuilder::Loader::YAML
 
-  # Load configuration from all files in a given directory
+  # Load configuration from YAML files in one or more directories
   #
-  # @param dir_path [String]
+  # @overload yamldir(path)
+  #   @param path [String] A directory path containing YAML files
+  # @overload yamldir(paths)
+  #   @param paths [Array<String>] A list of directory paths containing YAML files
   #
   # @return [Hash]
-  def yamldir(dir_path)
-    glob_path = File.join(dir_path, '*.{yml,yaml}')
+  def yamldir(input)
+    dirs = Array(input)
+
+    files = dirs.map do |dir|
+      pattern = File.join(dir, '*.{yml,yaml}')
+      Dir.glob(pattern)
+    end.flatten
 
     rv = {}
-    Dir.glob(glob_path).each do |file|
-      contents = ::YAML.load_file(file)
 
+    files.each do |file|
+      contents = ::YAML.load_file(file)
       if contents.is_a? Hash
         rv.merge! contents
-      else
-        # TODO warn on non-hash YAML
       end
     end
 

data/lib/config_builder/model/base.rb

@@ -72,6 +72,21 @@ class ConfigBuilder::Model::Base
   end
   private :attr
 
+  # Conditionally evaluate a block with a model attribute if it's defined
+  #
+  # @since 0.6.0
+  #
+  # @param identifier [Symbol] The attribute identifier
+  #
+  # @return [void]
+  def with_attr(identifier)
+    val = @attrs[identifier]
+    unless val.nil?
+      yield val
+    end
+  end
+  private :with_attr
+
   class << self
 
     # @param identifier [Symbol]

data/lib/config_builder/model/provider/virtualbox.rb

@@ -20,13 +20,13 @@ class ConfigBuilder::Model::Provider::Virtualbox < ConfigBuilder::Model::Base
   def to_proc
     Proc.new do |vm_config|
       vm_config.provider 'virtualbox' do |vb_config|
-        vb_config.name = attr(:name) if attr(:name)
+        with_attr(:name) { |val| vb_config.name = val }
 
         attr(:customize).each do |cmd|
           vb_config.customize cmd
         end
 
-        vb_config.gui = attr(:gui) if attr(:gui)
+        with_attr(:gui) { |val| vb_config.gui = val }
       end
     end
   end

data/lib/config_builder/model/provisioner/puppet.rb

@@ -24,11 +24,11 @@ class ConfigBuilder::Model::Provisioner::Puppet < ConfigBuilder::Model::Base
   def to_proc
     Proc.new do |vm_config|
       vm_config.provision :puppet do |puppet_config|
-        puppet_config.manifests_path = attr(:manifests_path) if attr(:manifests_path)
-        puppet_config.manifest_file  = attr(:manifest_file)  if attr(:manifest_file)
-        puppet_config.module_path    = attr(:module_path)    if attr(:module_path)
-        puppet_config.facter         = attr(:facter)         if attr(:facter)
-        puppet_config.options        = attr(:options)        if attr(:options)
+        with_attr(:manifests_path) { |val| puppet_config.manifests_path = val }
+        with_attr(:manifest_file)  { |val| puppet_config.manifest_file  = val }
+        with_attr(:module_path)    { |val| puppet_config.module_path    = val }
+        with_attr(:facter)         { |val| puppet_config.facter         = val }
+        with_attr(:options)        { |val| puppet_config.options        = val }
       end
     end
   end

data/lib/config_builder/model/provisioner/puppet_server.rb

@@ -16,9 +16,9 @@ class ConfigBuilder::Model::Provisioner::PuppetServer < ConfigBuilder::Model::Ba
   def to_proc
     Proc.new do |vm_config|
       vm_config.provision :puppet_server do |puppet_config|
-        puppet_config.puppet_server = attr(:puppet_server)  if attr(:puppet_server)
-        puppet_config.node_name     = attr(:node_name)      if attr(:node_name)
-        puppet_config.options       = attr(:options)        if attr(:options)
+        with_attr(:puppet_server) { |val| puppet_config.puppet_server = val }
+        with_attr(:node_name)     { |val| puppet_config.node_name     = val }
+        with_attr(:options)       { |val| puppet_config.options       = val }
       end
     end
   end

data/lib/config_builder/model/provisioner/shell.rb

@@ -16,9 +16,9 @@ class ConfigBuilder::Model::Provisioner::Shell < ConfigBuilder::Model::Base
   def to_proc
     Proc.new do |vm_config|
       vm_config.provision :shell do |shell_config|
-        shell_config.inline = attr(:inline) if attr(:inline)
-        shell_config.path   = attr(:path)   if attr(:path)
-        shell_config.args   = attr(:args)   if attr(:args)
+        with_attr(:inline) { |val| shell_config.inline = val }
+        with_attr(:path)   { |val| shell_config.path   = val }
+        with_attr(:args)   { |val| shell_config.args   = val }
       end
     end
   end

data/lib/config_builder/model/synced_folder.rb

@@ -34,9 +34,9 @@ class ConfigBuilder::Model::SyncedFolder < ConfigBuilder::Model::Base
 
   def folder_opts
     h = {}
-    h[:extra]    = attr(:extra)    if attr(:extra)
-    h[:disabled] = attr(:disabled) if attr(:disabled)
-    h[:nfs]      = attr(:nfs)      if attr(:nfs)
+    with_attr(:extra)   { |val| h[:extra]    = val }
+    with_attr(:disable) { |val| h[:disabled] = val }
+    with_attr(:nfs)     { |val| h[:nfs]      = val }
 
     h
   end

data/lib/config_builder/model/vm.rb

@@ -96,10 +96,10 @@ class ConfigBuilder::Model::VM < ConfigBuilder::Model::Base
       global_config.vm.define(attr(:name)) do |config|
         vm_config = config.vm
 
-        vm_config.box = attr(:box) if defined? attr(:box)
-        vm_config.box_url = attr(:box_url) if defined? attr(:box_url)
-        vm_config.hostname = attr(:hostname) if defined? attr(:hostname)
-        vm_config.guest = attr(:guest) if defined? attr(:guest)
+        with_attr(:box)      { |val| vm_config.box      = attr(:box)      }
+        with_attr(:box_url)  { |val| vm_config.box_url  = attr(:box_url)  }
+        with_attr(:hostname) { |val| vm_config.hostname = attr(:hostname) }
+        with_attr(:guest)    { |val| vm_config.guest    = attr(:guest)    }
 
         eval_models(vm_config)
       end

data/lib/config_builder/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-config_builder
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -37,6 +37,7 @@ files:
 - Gemfile
 - LICENSE
 - README.markdown
+- examples/Vagrantfile
 - examples/roles.yaml
 - examples/vms.yaml
 - lib/config_builder.rb