vagrant-yaml 0.0.5 → 0.0.6

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/lib/vagrant-yaml/commands/yaml_init.rb

@@ -17,43 +17,62 @@ module VagrantYaml
         argv = parse_options(opts)
         return if !argv
 
-        # Create our Vagrantfile
+        create_vagrantfile
+        create_directories
+        create_default_yaml(argv[0], argv[1])
+        create_local_default_yaml
+        create_symlinks
+
+        @env.ui.info(I18n.t("vagrant.plugins.yaml.commands.init.success"),
+                     :prefix => false)
+        # Success, exit status 0
+        0
+      end
+
+      def create_vagrantfile
         save_path = @env.cwd.join("Vagrantfile")
         raise Errors::VagrantfileExistsError if save_path.exist?
 
         template_path = ::VagrantYaml.source_root.join("templates/Vagrantfile")
-        contents = Vagrant::Util::TemplateRenderer.render(template_path,
-                                                          :box_name => argv[0] || "base",
-                                                          :box_url => argv[1])
+        contents = Vagrant::Util::TemplateRenderer.render(template_path)
         save_path.open("w+") do |f|
           f.write(contents)
         end
+      end
 
-        # Create our directories
+      def create_directories
         Dir.mkdir('vms-available')
         Dir.mkdir('vms-enabled')
+        Dir.mkdir('local.d')
+      end
 
-        # Create default.yml
+      def create_default_yaml(box_name=nil, box_url=nil)
         save_path = @env.cwd.join("vms-available/default.yaml")
         raise Errors::VagrantfileExistsError if save_path.exist?
 
         template_path = ::VagrantYaml.source_root.join("templates/default.yaml")
         contents = Vagrant::Util::TemplateRenderer.render(template_path,
-                                                          :box_name => argv[0] || "base",
-                                                          :box_url => argv[1])
+                                                          :box_name => box_name,
+                                                          :box_url => box_url)
         save_path.open("w+") do |f|
           f.write(contents)
         end
+      end
 
-        # Create symlink
-        File.symlink("../vms-available/default.yaml", "vms-enabled/default.yaml")
+      def create_local_default_yaml
+        save_path = @env.cwd.join("local.d/default.yaml")
+        raise Errors::VagrantfileExistsError if save_path.exist?
+        template_path = ::VagrantYaml.source_root.join("templates/local.default.yaml")
+        contents = Vagrant::Util::TemplateRenderer.render(template_path)
+        save_path.open("w+") do |f|
+          f.write(contents)
+        end
+      end
 
-        @env.ui.info(I18n.t("vagrant.plugins.yaml.commands.init.success"),
-                     :prefix => false)
+      def create_symlinks
+        File.symlink("../vms-available/default.yaml", "vms-enabled/default.yaml")
+      end
 
-        # Success, exit status 0
-        0
-       end
     end
   end
 end

data/lib/vagrant-yaml/version.rb

@@ -1,3 +1,3 @@
 module VagrantYaml
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/locales/en.yml

@@ -6,14 +6,15 @@ en:
           init:
             success: |-
               A `Vagrantfile` has been placed in this directory, a default Yaml VM config file
-              has been placed in /vms-available, and a symlink to it, placed in /vms-enabled.
-              Unlike a regular Vagrantfile, this one parses and applies the configuration in
-              the Yaml files it finds in /vms-enabled. You are now ready to `vagrant up` your
-              first virtual environment! Please read the comments in the default Yaml VM
-              config file to see how it works.
+              has been placed in vms-available/, and a symlink to it, placed in vms-enabled/.
+              Finally, a file to contain local overrides was placed in local.d/. Unlike a
+              regular Vagrantfile, this one parses and applies the configuration in the Yaml
+              files it finds in vms-enabled/. You are now ready to `vagrant up` your first
+              virtual environment! Please read the comments in the default Yaml VM config
+              file to see how it works.
           update:
             success: |-
-              Vagrantfile updated using the latesy one from vagrant-yaml.
+              Vagrantfile updated using the latest one from vagrant-yaml.
             confirmation: |-
               This operation will overwrite the Vagrantfile in this project with the one in the
               vagrant-yaml gem. Do you want to proceed?

data/templates/Vagrantfile.erb

@@ -24,6 +24,14 @@ Vagrant::Config.run do |config|
 
     yml = YAML.load_file "#{current_dir}/vms-enabled/#{config_file}"
 
+    # Allow local overrides
+    if File.exists?("#{current_dir}/local.d/#{config_file}")
+      local = YAML.load_file "#{current_dir}/local.d/#{config_file}"
+      if local.is_a?(Hash)
+        yml.merge!(local)
+      end
+    end
+
     def apply_settings(vm,yml)
       yml.each do |key0,value0|
         if !value0.is_a?(Hash)                           # If it's a setting,

data/templates/default.yaml.erb

@@ -4,19 +4,23 @@
 # allows you to have a library of config files that could, for example, be
 # updated by an external application.
 
-# To see what you can do with Yaml can do, check out this handy reference card:
+# Also, any Yaml config file in local.d/ named the same as one in vms-enabled/
+# will allow the selective override of individual configuration settings. See
+# local.d/default.yaml for an example.
+
+# To see what you can do with Yaml, check out this handy reference card:
 # http://www.yaml.org/refcard.html. To see how Yaml is interpreted in Ruby, see
 # this guide: http://yaml.org/YAML_for_ruby.html. For further details, refer to
 # the full Yaml specification: http://www.yaml.org/spec/1.2/spec.html
 
 # For all available Vagrant options, see the docs on Vagrantfile settings:
 # http://vagrantup.com/v1/docs/vagrantfile.html. While we've provided some
-# example below, it's far from exhaustive. If you can't figure out how to apply
-# a particular setting, please file a support request at:
+# examples below, it's far from exhaustive. If you can't figure out how to
+# apply a particular setting, please file a support request at:
 # https://github.com/ergonlogic/vagrant-yaml. Also, feel free to post to the
 # project's wiki, or submit pull requests.
 
-box: "<%= box_name %>"
+box: "<%= box_name || "base" %>"
 <% if box_url.nil? %># <% end %>box_url: "<%= box_url || "http://domain.com/path/to/above.box" %>"
 # host_name: &id001 vagrant.local
 # network:

data/templates/local.default.yaml.erb

@@ -0,0 +1,6 @@
+# Any Yaml config file in local.d/ named the same as one in vms-enabled/ will
+# allow the selective override of individual configuration settings. Uncommen-
+# ting the setting below would override the 'host_name' set by Vagrant in the
+# VM.
+
+# host_name: something.else

data/vagrant-yaml.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
+  s.add_dependency "i18n", "~> 0.6.0"
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-yaml
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
-dependencies: []
+date: 2013-02-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: A Vagrant plugin that provides a Vagrantfile that looks in YAML files
   for project and VM settings
 email:
@@ -19,6 +35,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -33,6 +50,7 @@ files:
 - locales/en.yml
 - templates/Vagrantfile.erb
 - templates/default.yaml.erb
+- templates/local.default.yaml.erb
 - vagrant-yaml.gemspec
 homepage: https://github.com/ergonlogic/vagrant-yaml
 licenses: