vagrant-yaml 0.0.3 → 0.0.4

data/Readme.md

@@ -0,0 +1,92 @@
+Vagrant-Yaml
+============
+
+Installation
+------------
+
+To install this gem, use the Vagrant 'gem' command:
+
+```
+vagrant gem install vagrant-yaml
+```
+
+This will keep it isolated from system-wide and other gems.
+
+
+Usage
+-----
+
+To initialize a new project:
+
+```
+vagrant yaml init [box-name] [box-url]
+```
+
+To update an existing project with the latest Vagrantfile that Vagrant-Yaml
+provides:
+
+```
+vagrant yaml update
+```
+
+
+Vagrantfile
+-----------
+
+Vagrant-Yaml provides a custom Vagrantfile. This Vagrantfile parses the Yaml
+config files in the 'vms-enabled' directory, and applies any settings found
+there. The Vagrant name for the VM is the name of the file (without the '.yaml'
+extension, obviously). Multi-VM environments are supported by adding additional
+Yaml config files.
+
+As with a standard Vagrantfile, the one this gem provides can be altered to
+suit the needs of your project. However, be aware that running the 'vagrant
+yaml update' command will overwrite any changes you make. Of course, this
+should not be a problem, since you are keeping your project directory under
+some form of version control, right?
+
+
+Config files
+------------
+
+All Vagrant VM configuration can be done from Yaml config files. Only config
+files in the 'vms-enabled' directory are interpreted. You can copy from, or
+symlink to, files in the 'vms-available' directory. This allows you to have a
+library of config files that could, for example, be updated by an external
+application.
+
+
+Yaml
+----
+
+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
+
+
+Vagrant Options
+---------------
+
+For all available Vagrant options, see the docs on Vagrantfile settings:
+http://vagrantup.com/v1/docs/vagrantfile.html. While we have provided some
+example below, it is far from exhaustive. If you cannot figure out how to apply
+a particular setting, please file a support request at:
+https://github.com/ergonlogic/vagrant-yaml.
+
+
+Free Software
+-------------
+
+This gem is published under the GNU GPLv3 (General Public License, Version 3),
+and as such is, and will always remain, free software. Engagement in the
+development process by users and other developers is strongly encouraged. So,
+please feel free to post to the project wiki, and submit feature and pull
+requests.
+
+
+CREDITS
+-------
+
+Developed and maintained by Christopher Gervais <http://ergonlogic.com/>
+

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

@@ -34,10 +34,10 @@ module VagrantYaml
         Dir.mkdir('vms-enabled')
 
         # Create default.yml
-        save_path = @env.cwd.join("vms-available/default.yml")
+        save_path = @env.cwd.join("vms-available/default.yaml")
         raise Errors::VagrantfileExistsError if save_path.exist?
 
-        template_path = ::VagrantYaml.source_root.join("templates/default.yml")
+        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])
@@ -46,7 +46,7 @@ module VagrantYaml
         end
 
         # Create symlink
-        File.symlink("../vms-available/default.yml", "vms-enabled/default.yml")
+        File.symlink("../vms-available/default.yaml", "vms-enabled/default.yaml")
 
         @env.ui.info(I18n.t("vagrant.plugins.yaml.commands.init.success"),
                      :prefix => false)

data/lib/vagrant-yaml/version.rb

@@ -1,3 +1,3 @@
 module VagrantYaml
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/templates/Vagrantfile.erb

@@ -9,38 +9,38 @@ current_dir = File.dirname(__FILE__)
 # Scan our vms-enabled/ directory for YAML config files
 if File.directory?("#{current_dir}/vms-enabled/")
    Dir.chdir("#{current_dir}/vms-enabled/")
-   config_files = Dir.glob("*.yml")
+   config_files = Dir.glob("*.yaml")
 end
 
 # Build up a list of the VMs we'll provision, and their config_files
 vms = {}
 config_files.each do |config_file|
-  vms.update({ config_file.sub('.yml', '') => config_file})
+  vms.update({ config_file.sub('.yaml', '') => config_file})
 end
 
-## For additional available options, see: http://vagrantup.com/v1/docs/vagrantfile.html
 Vagrant::Config.run do |config|
-
   # VM-specific configuration loaded from YAML config files
   vms.each do |vm,config_file|
-    yml = YAML.load_file "#{current_dir}/vms-enabled/#{config_file}"
-
-    config.vm.define "#{vm}" do |vm_config|
-      vm_config.vm.box = yml['box']
-      vm_config.vm.box_url = yml['box_url']
 
+    yml = YAML.load_file "#{current_dir}/vms-enabled/#{config_file}"
 
-      vm_config.vm.host_name = yml['host_name']
-      vm_config.vm.network :hostonly, yml['ip_address']
-
-#      vm_config.vm.provision :puppet do |puppet|
-#        puppet.manifests_path = "manifests"
-#        puppet.manifest_file  = "site.pp"
-#        puppet.module_path  = "modules"
-#        # TODO: allow facts to be added dynamically from YAML files
-#        puppet.facter = { "fqdn" => $hostname }
-#      end
+    def apply_settings(vm,yml)
+      yml.each do |key0,value0|
+        if !value0.is_a?(Hash)                           # If it's a setting,
+            vm.send("#{key0}=".to_sym, value0)           # we set it directly.
+        else                                               # Otherwise,
+          method_object = vm.method("#{key0}".to_sym)      # we're invoking a method
+          value0.each do |key1,value1|                     # and each setting
+            method_object.call("#{key1}".to_sym, value1)   # needs to be passed to the method.
+          end
+        end
+      end
+    end
 
+    config.vm.define "#{vm}" do |vm_config|
+      apply_settings(vm_config.vm, yml)
+      # We may need some project-wide config file to handle things like:
+      #vm_config.vbguest.auto_update = false
     end
 
   end

data/templates/default.yaml.erb

@@ -0,0 +1,33 @@
+# All Vagrant VM configuration can be done from Yaml config files such as this
+# one. Only config files in the 'vms-enabled' directory are interpreted. You
+# can copy from, or symlink to, files in the 'vms-available' directory. This
+# 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:
+# 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:
+# https://github.com/ergonlogic/vagrant-yaml. Also, feel free to post to the
+# project's wiki, or submit pull requests.
+
+box: "<%= box_name %>"
+<% if box_url.nil? %># <% end %>box_url: "<%= box_url || "http://domain.com/path/to/above.box" %>"
+# host_name: &id001 vagrant.local
+# network:
+#   hostonly: '192.168.33.34'
+# provision:
+#   puppet:
+#     module_path: 'modules'
+#     manifests_path: 'manifests'
+#     manifest_file: site.pp
+#     options:
+#       - --verbose
+#       - --debug
+#     facter:
+#       fqdn: *id001

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-yaml
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that provides a Vagrantfile that looks in YAML files
   for project and VM settings
@@ -32,7 +32,7 @@ files:
 - lib/vagrant_init.rb
 - locales/en.yml
 - templates/Vagrantfile.erb
-- templates/default.yml.erb
+- templates/default.yaml.erb
 - vagrant-yaml.gemspec
 homepage: https://github.com/ergonlogic/vagrant-yaml
 licenses:

data/templates/default.yml.erb

@@ -1,32 +0,0 @@
-host_name: vagrant.local
-ip_address: '192.168.33.34'
-box: "<%= box_name %>"
-<% if box_url.nil? %># <% end %>box_url: "<%= box_url || "http://domain.com/path/to/above.box" %>"
-
-# Many configs are not yet supported. For a full list see:
-# http://docs.vagrantup.com/v1/docs/vagrantfile.html
-#config.nfs.map_uid
-#config.nfs.map_gid
-#config.package.name
-#config.ssh.username
-#config.ssh.host
-#config.ssh.port
-#config.ssh.guest_port
-#config.ssh.max_tries
-#config.ssh.timeout
-#config.ssh.private_key_path
-#config.ssh.forward_agent
-#config.ssh.forward_x11
-#config.ssh.shell
-#config.vagrant.dotfile_name
-#config.vagrant.host
-#config.vm.auto_port_range
-#config.vm.base_mac
-#config.vm.boot_mode
-#config.vm.customize
-#config.vm.define
-#config.vm.forward_port
-#config.vm.guest
-#config.vm.network
-#config.vm.provision
-#config.vm.share_folder