vagrant-yaml 0.0.2 → 0.0.3

data/lib/vagrant-yaml.rb

@@ -1,8 +1,17 @@
 require 'vagrant'
-#require 'vagrant-yaml/errors'
-require 'vagrant-yaml/init-yaml'
+require 'vagrant-yaml/errors'
+require 'vagrant-yaml/commands/yaml'
+require 'vagrant-yaml/commands/yaml_init'
+require 'vagrant-yaml/commands/yaml_update'
 
-Vagrant.commands.register(:yaml) { VagrantYaml::Command }
+Vagrant.commands.register(:yaml) { VagrantYaml::Command::Yaml }
+
+module VagrantYaml
+  # The source root is the path to the root directory of the this gem.
+  def self.source_root
+    @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+  end
+end
 
 # Add our custom translations to the load path
 I18n.load_path << File.expand_path("../../locales/en.yml", __FILE__)

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

@@ -0,0 +1,60 @@
+require 'optparse'
+require 'vagrant/util/template_renderer'
+require 'vagrant/command/base'
+
+module VagrantYaml
+  module Command
+
+    class Yaml < Vagrant::Command::Base
+      def initialize(argv, env)
+        super
+
+        @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+
+        @subcommands = Vagrant::Registry.new
+        @subcommands.register(:init)       { VagrantYaml::Command::YamlInit }
+        @subcommands.register(:update)     { VagrantYaml::Command::YamlUpdate }
+      end
+
+      def execute
+        if @main_args.include?("-h") || @main_args.include?("--help")
+          # Print the help for all the box commands.
+          return help
+        end
+
+        # If we reached this far then we must have a subcommand. If not,
+        # then we also just print the help and exit.
+        command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
+        return help if !command_class || !@sub_command
+        @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+
+        # Initialize and execute the command class
+        command_class.new(@sub_args, @env).execute
+      end
+
+      # Prints the help out for this command
+      def help
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant yaml <command> [<args>]"
+          opts.separator ""
+          opts.separator "Available subcommands:"
+
+          # Add the available subcommands as separators in order to print them
+          # out as well.
+          keys = []
+          @subcommands.each { |key, value| keys << key.to_s }
+
+          keys.sort.each do |key|
+            opts.separator "     #{key}"
+          end
+
+          opts.separator ""
+          opts.separator "For help on any individual command run `vagrant yaml COMMAND -h`"
+        end
+
+        @env.ui.info(opts.help, :prefix => false)
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,60 @@
+require 'optparse'
+require 'vagrant/util/template_renderer'
+require 'vagrant/command/base'
+
+module VagrantYaml
+  module Command
+
+    class YamlInit < Vagrant::Command::Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant yaml init [box-name] [box-url]"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        # Create our 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])
+        save_path.open("w+") do |f|
+          f.write(contents)
+        end
+
+        # Create our directories
+        Dir.mkdir('vms-available')
+        Dir.mkdir('vms-enabled')
+
+        # Create default.yml
+        save_path = @env.cwd.join("vms-available/default.yml")
+        raise Errors::VagrantfileExistsError if save_path.exist?
+
+        template_path = ::VagrantYaml.source_root.join("templates/default.yml")
+        contents = Vagrant::Util::TemplateRenderer.render(template_path,
+                                                          :box_name => argv[0] || "base",
+                                                          :box_url => argv[1])
+        save_path.open("w+") do |f|
+          f.write(contents)
+        end
+
+        # Create symlink
+        File.symlink("../vms-available/default.yml", "vms-enabled/default.yml")
+
+        @env.ui.info(I18n.t("vagrant.plugins.yaml.commands.init.success"),
+                     :prefix => false)
+
+        # Success, exit status 0
+        0
+       end
+    end
+  end
+end
+

data/lib/vagrant-yaml/{init-yaml.rb → commands/yaml_update.rb}

@@ -1,15 +1,16 @@
 require 'optparse'
-
 require 'vagrant/util/template_renderer'
+require 'vagrant/command/base'
 
 module VagrantYaml
   module Command
-    class InitYaml < Vagrant::Command::Base
+
+    class YamlUpdate < Vagrant::Command::Base
       def execute
         options = {}
 
         opts = OptionParser.new do |opts|
-          opts.banner = "Usage: vagrant init-yaml [box-name] [box-url]"
+          opts.banner = "Usage: vagrant yaml update [box-name] [box-url]"
         end
 
         # Parse the options
@@ -17,7 +18,7 @@ module VagrantYaml
         return if !argv
 
         save_path = @env.cwd.join("Vagrantfile")
-        raise Errors::VagrantfileExistsError if save_path.exist?
+#    raise Errors::VagrantfileExistsError if save_path.exist?
 
         template_path = ::Vagrant.source_root.join("templates/commands/init/Vagrantfile")
         contents = Vagrant::Util::TemplateRenderer.render(template_path,
@@ -29,7 +30,7 @@ module VagrantYaml
           f.write(contents)
         end
 
-        @env.ui.info(I18n.t("vagrant.commands.init.success"),
+        @env.ui.info(I18n.t("vagrant.plugins.yaml.commands.init.success"),
                      :prefix => false)
 
         # Success, exit status 0
@@ -38,3 +39,4 @@ module VagrantYaml
     end
   end
 end
+

data/lib/vagrant-yaml/errors.rb

@@ -0,0 +1,13 @@
+module VagrantYaml
+  module Errors
+
+    class YamlError < Vagrant::Errors::VagrantError
+      def error_namespace; "vagrant.plugins.yaml.errors"; end
+    end
+
+    class VagrantfileExistsError < YamlError
+      error_key :vagrantfile_exists
+    end
+
+  end
+end

data/lib/vagrant-yaml/version.rb

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

data/locales/en.yml

@@ -1,55 +1,18 @@
 en:
   vagrant:
     plugins:
-      vbguest:
-        skipped_installation: "Updating GuestAdditions skipped."
-        skipped_rebuild: "Rebuilding GuestAdditions skipped."
-        installing: "Installing Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
-        installing_forced: "Forcing installation of Virtualbox Guest Additions %{installer_version} - guest version is %{guest_version}"
-        rebuild: "Rebuilding Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"
-        rebuild_forced: "Forcing rebuilding of Virtualbox Guest Additions %{guest_version} (Your host version is %{host_version})"
-        start_copy_iso: "Copy iso file %{from} into the box %{to}"
-        restart_vm: "Restarting VM to apply changes..."
-        suggest_restart: "Guest Additions got installed. However, they seem not be loaded correctly. Please restart the box running `vagrant reload %{name}`"
-        restart_loop_guard_activated: "Guest Additions will not load, even after reboot."
-        machine_loop_guard: "Could not execute %{command} from current state %{state}. To prevent running in circles, we'll stop."
-        guest_version_reports_differ: |-
-          Got different reports about installed GuestAdditions version:
-          Virtualbox on your host claims:   %{driver}
-          VBoxService inside the vm claims: %{service}
-          Going on, assuming VBoxService is correct...
-        unknown: unknown
-
-        status:
-          clean: "No installation found."
-          unmatched: "GuestAdditions versions on your host (%{host_version}) and guest (%{guest_version}) do not match."
-          not_running: "GuestAdditions seems to be installed (%{guest_version}) correctly, but not running."
-          ok: "GuestAdditions %{guest_version} running --- OK."
+      yaml:
+        commands:
+          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.
 
         errors:
-          autodetect_iso_path: |-
-            Could not locate a local Virtualbox Guest Additions iso file.
-            Please configure a local path to the iso using `config.vbguest.iso_path`
-            in your Vagrantfile or the `--iso` command line option.
-            If you think this is a bug and vbguest could have guessed the iso_path,
-            please file an issue at: https://github.com/dotless-de/vagrant-vbguest/issues
-
-          downloading_disabled: |-
-            Could not locate a local Virtualbox Guest Additions iso file.
-            However, the no_remote option was set and thus I will not download it from
-            %{from}
-            Please configure a local path to the iso using `config.vbguest.iso_path`
-            in your Vagrantfile or the `--iso` command line option.
-
-          installer:
-            no_installer_for_platform: |-
-              Sorry, don't know how to %{method} Virtualbox Guest Additions on this platform. Stopping installation.
-            generic_linux_installer: |-
-              The guest's platform is currently not supported, will try generic Linux method...
-            do_not_inherit_match_method: |-
-              Installer classes must provide their own `match?` method.
-
-        download:
-          with: "Downloading VirtualBox Guest Additions ISO with %{class}..."
-          cleaning: "Cleaning up downloaded VirtualBox Guest Additions ISO..."
-          unknown_type: "Unknown or unsupported URI type given for VirtualBox Guest Additions ISO download."
+          vagrantfile_exists: |-
+            `Vagrantfile` already exists in this directory. Remove it before running `vagrant
+            yaml init`, or run `vagrant yaml update` to update to the latest version.

data/templates/Vagrantfile.erb

@@ -0,0 +1,48 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+require "yaml"
+
+# All paths are relative to the project root
+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")
+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})
+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']
+
+
+      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
+
+    end
+
+  end
+
+end

data/templates/default.yml.erb

@@ -0,0 +1,32 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-yaml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -24,10 +24,15 @@ files:
 - LICENSE
 - Readme.md
 - lib/vagrant-yaml.rb
-- lib/vagrant-yaml/init-yaml.rb
+- lib/vagrant-yaml/commands/yaml.rb
+- lib/vagrant-yaml/commands/yaml_init.rb
+- lib/vagrant-yaml/commands/yaml_update.rb
+- lib/vagrant-yaml/errors.rb
 - lib/vagrant-yaml/version.rb
 - lib/vagrant_init.rb
 - locales/en.yml
+- templates/Vagrantfile.erb
+- templates/default.yml.erb
 - vagrant-yaml.gemspec
 homepage: https://github.com/ergonlogic/vagrant-yaml
 licenses: