vagrant-dotvm 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f0db930d6a40bd79d357345fc1a7894a518802c
-  data.tar.gz: c870d76bc7eec160fe1797b167015088dc4ae4af
+  metadata.gz: 1c1d2926742ca09d2235e4ac8fdf5a33fe94846e
+  data.tar.gz: 760e89721aa455da912be1f2682787804f3e2404
 SHA512:
-  metadata.gz: 296b16570f1ba5931563c0fc9f2c4c3330ba9d986bc557503aa8bacd780a3f983ae31e11ca5abbe90f2a2511a344b9b596b920fbca6cc549ce98b18bdb047c1a
-  data.tar.gz: e4adcc2af39bc9501943bdaa11736ee18cca1f4e6145d5bfd210375d40dff6cab0ece5b081569bc9df96f3dabb0171f0888e00e17216b7bea0a27ad1f72dcdd0
+  metadata.gz: f0b2e8dd132e338ed6f6fc6ae7128294e35f631147f205546d7546321ff4df23006b25cfc3761ea6d894d5930dc091b2eddf13c049d5ab989887a8973d2106ff
+  data.tar.gz: f2e82fa6d3a1e7ac99a479a16af820d0bd554b1f42f6fd9e0d6aa7624a50132e4ae6f13858cf47f958512e3c58bf2dc36097ab0f86a4fd3d14f62dd9c19cfdd9

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.17.0
+* Add ability to add entries to /etc/hosts in guest
+* Ability to set custom options for VirtualBox
+* Remove default setting for natdnshostresolver1
+
+# 0.16.0
+* Remove default settings so DotVm is more transparent
+
 # 0.15.1
 * Fix for natnet option
 

data/lib/vagrant-dotvm/configinjecter.rb

@@ -23,8 +23,11 @@ module VagrantPlugins
               vb.customize ["modifyvm", :id, "--memory", machine_cfg[:memory]] unless machine_cfg[:memory].nil?
               vb.customize ["modifyvm", :id, "--cpus",   machine_cfg[:cpus]] unless machine_cfg[:cpus].nil?
               vb.customize ["modifyvm", :id, "--cpuexecutioncap", machine_cfg[:cpucap]] unless machine_cfg[:cpucap].nil?
-              vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
               vb.customize ["modifyvm", :id, "--natnet1", machine_cfg[:natnet]] unless machine_cfg[:natnet].nil?
+
+              machine_cfg[:options][:virtualbox].each do |option|
+                vb.customize ["modifyvm", :id, option[:name], option[:value]]
+              end
             end
 
             machine_cfg[:networks].each do |net|
@@ -56,6 +59,14 @@ module VagrantPlugins
               end
             end
 
+            machine_cfg[:hosts].each do |host|
+              machine.vm.provision "shell", run: "always" do |s|
+                s.path       = File.dirname(__FILE__) + "/../../utils/add_host.py"
+                s.args       = [host[:ip], host[:host]]
+                s.privileged = true
+              end
+            end
+
             machine_cfg[:provision].each do |provision|
               machine.vm.provision provision[:type], run: provision[:run] do |p|
                 if provision[:type] == "shell"

data/lib/vagrant-dotvm/configparser.rb

@@ -55,6 +55,7 @@ module VagrantPlugins
           :graceful_halt_timeout => coalesce(machine["graceful_halt_timeout"], Defaults::GRACEFUL_HALT_TIMEOUT),
           :post_up_message       => machine["post_up_message"],
           :autostart             => coalesce(machine["autostart"], true),
+          :hosts                 => [],
           :folders               => [
             {
               :host     => "%project.host%",
@@ -64,6 +65,9 @@ module VagrantPlugins
               :type     => nil,
             }
           ],
+          :options               => {
+            :virtualbox => [],
+          },
         }
       end
 
@@ -135,6 +139,22 @@ module VagrantPlugins
         }
       end
 
+      private
+      def parse_option(option)
+        {
+          :name  => option["name"],
+          :value => option["value"],
+        }
+      end
+
+      private
+      def parse_host(host)
+        {
+          :ip   => host["ip"],
+          :host => host["host"],
+        }
+      end
+
       public
       def parse(yaml)
         config = {
@@ -168,6 +188,14 @@ module VagrantPlugins
             item[:authorized_keys] << parse_authorized_key(key)
           end
 
+          machine["options"].to_h["virtualbox"].to_a.each do |option|
+            item[:options][:virtualbox] << parse_option(option)
+          end
+
+          machine["hosts"].to_a.each do |host|
+            item[:hosts] << parse_host(host)
+          end
+
           config[:machines] << item
         end
 

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = "0.16.0"
+    VERSION = "0.17.0"
   end
 end

data/utils/add_host.py

@@ -0,0 +1,23 @@
+#! /usr/bin/env python
+
+import sys
+
+ip = sys.argv[1]
+host = sys.argv[2]
+
+with open('/etc/hosts') as fd:
+    for entry in fd:
+        entry = entry.strip()
+
+        # omit empty lines
+        if not entry:
+            continue
+
+        entry = [x.strip() for x in entry.split(' ', 1)]
+        entry[1] = [x.strip() for x in entry[1].split(' ')]
+
+        if entry[0] == ip and host in entry[1]:
+            sys.exit(0)
+
+with open('/etc/hosts', 'a') as fd:
+    fd.write("{} {}\n".format(ip, host))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,7 @@ files:
 - lib/vagrant-dotvm/dotvm.rb
 - lib/vagrant-dotvm/plugin.rb
 - lib/vagrant-dotvm/version.rb
+- utils/add_host.py
 - utils/authorize_key.sh
 - utils/setup_route.sh
 - vagrant-dotvm.gemspec