vagrant-dotvm 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d6bfd4a6cefbe7de781b6ec3a0fe8886b11cc2
-  data.tar.gz: 12cc9974690ab4b28ce14008c148a881131b567d
+  metadata.gz: debbbcde749af67762470debc868aa2f2d29dd38
+  data.tar.gz: cd4270123ac9fed8511cb028f38a94cddbe99f26
 SHA512:
-  metadata.gz: bc90c2ccab04fe97f7ad9f20463b89a65270364215faaffe4a66c095a97bb6648ab84693f156532c9ccf54b98f01513c849a14521907fd9d210970e587c086da
-  data.tar.gz: fcba7dade55d13f32eaf49cac6bef88b24b729c9e241fe7779c8bba6e6d076e53375a1dd3409a05bfd31c111ce1576cd28f66e19f2f42cfb1f3a5370c1bb7735
+  metadata.gz: 71fcdc8d518ae0d5f5dda2258a9f39b5934ebc1fb0b8a25d338c357469fa66496e88c411f8f446703d694512177cb45e635fd0068e31a1d28033cfc449225156
+  data.tar.gz: 09b04ba244a8309b68c6ad8eadef820b47cb5bf98c2e90112ddfe94f8828f6b0912ab505308b04adaadf70af86feb015eaeea221e32a38fffec79dd2cde431cc

data/README.md

@@ -11,6 +11,8 @@ Then create Vagrantfile like that:
 require 'vagrant-dotvm'
 
 Vagrant.configure(2) do |config|
+  # config directory will be expected in the same
+  # directory as Vagrantfile.
   config_path = File.dirname(File.expand_path(__FILE__)) + "/config"
   dotvm = VagrantPlugins::Dotvm::Dotvm.new config_path
   dotvm.inject(config)
@@ -26,8 +28,7 @@ $ mkdir -p config/projects
 You need to create folder named after your project in `config/projects`.
 In this folder you can create as many YAML files as you want.
 In each one you are able to define multiple machines.
-Where it makes sense you can use %project.path% variable which will be replaced with
-path to directory where you project lives.
+
 
 Example YAML configuration:
 ```yaml
@@ -41,8 +42,18 @@ machines:
         mask: 255.255.255.0
     provision:
       - type: shell
-        path: "%project.path%/bootstrap.sh"
+        path: "%project.host%/bootstrap.sh"
+        args:
+          - "%project.guest%"
     shared_folders:
       - host: /Volumes/Repos
         guest: /srv/www
 ```
+
+## Available variables
+You can use variables inside of config values.
+Environment variables are accessible by using env prefix, e.g. `%env.LOGNAME%`.  
+
+Predefined variables:  
+* `%project.host%` - points to project directory on host
+* `%project.guest%` - points to project directory on guest

data/lib/vagrant-dotvm/configinjecter.rb

@@ -3,6 +3,9 @@ module VagrantPlugins
     class ConfigInjecter
 
       def self.inject(config, vc)
+        # General settings
+        vc.ssh.forward_x11 = true
+
         config[:machines].each do |machine_cfg|
           vc.vm.define machine_cfg[:nick], primary: machine_cfg[:primary] do |machine|
             machine.vm.box      = machine_cfg[:box]
@@ -12,6 +15,8 @@ module VagrantPlugins
               vb.customize ['modifyvm', :id, '--memory', machine_cfg['memory'] ||= 1024]
               vb.customize ['modifyvm', :id, '--cpus',   machine_cfg['cpus']   ||= 1]
               vb.customize ['modifyvm', :id, '--cpuexecutioncap', machine_cfg['cpucap'] ||= 100]
+              vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
+              vb.customize ['modifyvm', :id, '--natnet1', machine_cfg['natnet'] ||= '192.168.88.0/24']
             end
 
             machine_cfg[:networks].each do |net|
@@ -24,6 +29,7 @@ module VagrantPlugins
               machine.vm.provision provision[:type] do |p|
                 if provision[:type] == 'shell'
                   p.path           = provision[:path]
+                  p.args           = provision[:args]
                   p.privileged     = provision[:privileged] ||= true
                 elsif provision[:type] == 'file'
                   p.source         = provision[:source]
@@ -37,7 +43,7 @@ module VagrantPlugins
             end
 
             machine_cfg[:folders].each do |folder|
-              machine.vm.synced_folder folder[:host], folder[:guest]
+              machine.vm.synced_folder folder[:host], folder[:guest], disabled: folder[:disabled]
             end
 
             if Vagrant.has_plugin?('vagrant-group')

data/lib/vagrant-dotvm/configparser.rb

@@ -9,18 +9,31 @@ module VagrantPlugins
         @vars = vars
       end
 
-      
+
       def replace_vars(value)
-        if value
-          value = value.dup()
-          
-          @vars.each do |key, val|
-            pattern = '%' + key + '%'
-            value.gsub! pattern, val
+        if value.kind_of?(Hash)
+          result = {}
+          value.each do |key, val|
+            result[key] = self.replace_vars(val)
+          end
+        elsif value.kind_of?(Array)
+          result = value.map do |val|
+            self.replace_vars(val)
+          end
+        elsif value.kind_of?(String)
+          result = value.dup
+
+          @vars.each do |k, v|
+            pattern = '%' + k + '%'
+            result.gsub! pattern, v
           end
+        elsif !value.respond_to?(:duplicable) or !value.duplicable?
+          result = value
+        else
+          result = value.dup
         end
-          
-        return value
+
+        return result
       end
 
         
@@ -32,10 +45,22 @@ module VagrantPlugins
           :memory     => machine['memory'],
           :cpus       => machine['cpus'],
           :cpucap     => machine['cpucap'],
-          :primary    => machine['primary'] ||= false,
+          :primary    => self.coalesce(machine['primary'], false),
+          :natnet     => machine['natnet'],
           :networks   => [],
           :provision  => [],
-          :folders    => [],
+          :folders    => [
+            {
+              :host => '.',
+              :guest => '/vagrant',
+              :disabled => true,
+            },
+            {
+              :host => '%project.host%',
+              :guest => '%project.guest%',
+              :disabled => false,
+            }
+          ],
           :groups     => [],
         }
       end
@@ -43,10 +68,10 @@ module VagrantPlugins
       
       def parse_net(net)
         return {
-          :net  => net['net'] || DEFAULT_NET,
+          :net  => self.coalesce(net['net'], DEFAULT_NET),
           :type => net['type'],
           :ip   => net['ip'],
-          :mask => net['mask'] || net['netmask'] || DEFAULT_NETMASK,
+          :mask => self.coalesce(net['mask'], net['netmask'], DEFAULT_NETMASK),
         }
       end
 
@@ -54,11 +79,12 @@ module VagrantPlugins
       def parse_provision(prv)
         return {
           :type		  => prv['type'],
-          :source         => self.replace_vars(prv['source']),
+          :source         => prv['source'],
           :destination    => prv['destination'],
-          :path		  => self.replace_vars(prv['path']),
-          :module_path    => self.replace_vars(prv['module_path']),
-          :manifests_path => self.replace_vars(prv['manifests_path']),
+          :path		  => prv['path'],
+          :args           => prv['args'],
+          :module_path    => prv['module_path'],
+          :manifests_path => prv['manifests_path'],
           :manifest_file  => prv['manifest_file'],
         }
       end
@@ -66,8 +92,9 @@ module VagrantPlugins
 
       def parse_folder(folder)
         return {
-          :host  => self.replace_vars(folder['host']),
+          :host  => folder['host'],
           :guest => folder['guest'],
+          :disabled => self.coalesce(folder['disabled'], false),
         }
       end
 
@@ -99,7 +126,15 @@ module VagrantPlugins
           config[:machines] << item
         end
 
-        return config
+        return self.replace_vars(config)
+      end
+
+
+      def coalesce(*args)
+        args.each do |val|
+          next if val.nil?
+          return val
+        end
       end
       
     end

data/lib/vagrant-dotvm/dotvm.rb

@@ -18,7 +18,8 @@ module VagrantPlugins
           yaml = YAML::load(File.read(fname))
 
           vars = {
-            'project.path' => File.dirname(fname),
+            'project.host' => File.dirname(fname),
+            'project.guest' => '/dotvm/project',
           }
 
           ENV.each_pair do |name, value|

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler