vagrant-dotvm 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7b62f83672b10c1f5c244ca3fbc4ad6e46495d0
-  data.tar.gz: 80d84606b9c7346020b3b6d4634dd466ee16728a
+  metadata.gz: dc456bf715d4b8612e9c6c7d0084199165971172
+  data.tar.gz: 5f173b97006ad6c2abf724521427eb7a91e7617f
 SHA512:
-  metadata.gz: 59669ce6f5ca80e04a5d3a1615c447b3a526c80cab355dc0816de41e80b7cffbcf708c46ac7199dfcaa59133f2f742ebe0dc445299837a6a2c55153e3fa36e4c
-  data.tar.gz: 0839355b47428666ceb101c54b46e71f1cbf07ec87af417fed2cd5d05c6914e2c64a288f2442407ce5196d016dcb384943480fa16cf514b924c4bdc06eaf0657
+  metadata.gz: d6ab000283ad59a213f7267dd95fbd418993579c5917836d7a9c2b5fed0b20f9fb95b9d1eeecfe372dbdf6f2d4bd03381cc0a0d0cf0ed234e0068046046dbd74
+  data.tar.gz: 3c57965cbf5667b3ef6fa604c04c1db0c9db4d78b1a0454367f473d5528fff77d4cacaf0b25434380bd774c9a7ea61a38673b44515572ed328ad339641ea26ae

data/CHANGELOG.md

@@ -0,0 +1,47 @@
+# 0.13.0
+* Ability to configure some vm related options
+* Ability to use shorter forms of network
+* Ability to configure public network
+* Ability to set some options on shared folders
+* Fix bug in port forwarding
+
+# 0.12.0
+* Ability to forward port
+
+# 0.11.0
+* Ability to authorize ssh public key from file or hardcoded string
+
+# 0.10.0
+* Make `/vagrant` available in guest
+
+# 0.9.0
+* Ability to select network interface in private network
+
+# 0.8.0
+* Now forwarding of X11 via SSH is enabled
+* Ability to configure nat network
+* Ability to use variables in many configuration options
+* Ability to pass args to provision script
+* Now project directory is available in guest
+
+# 0.7.0
+* Better handling of network configuration
+
+# 0.6.0
+* Ability to configure primary machine
+
+# 0.5.0
+* Ability to configure groups for `vagrant-group` users
+
+# 0.4.0
+* Ability to use environment variables in configuration
+
+# 0.3.0
+* Ability to use predefined variables
+* Ability to configure shared folders
+
+# 0.2.0
+* Now configs are spread across projects directories
+
+# 0.1.0
+* Initial version

data/lib/vagrant-dotvm/configinjecter.rb

@@ -10,6 +10,11 @@ module VagrantPlugins
           vc.vm.define machine_cfg[:nick], primary: machine_cfg[:primary] do |machine|
             machine.vm.box      = machine_cfg[:box]
             machine.vm.hostname = machine_cfg[:name]
+            machine.vm.boot_timeout = machine_cfg[:boot_timeout]
+            machine.vm.box_check_update = machine_cfg[:box_check_update]
+            machine.vm.box_version = machine_cfg[:box_version]
+            machine.vm.graceful_halt_timeout = machine_cfg[:graceful_halt_timeout]
+            machine.vm.post_up_message = machine_cfg[:post_up_message]
 
             machine.vm.provider "virtualbox" do |vb|
               vb.customize ['modifyvm', :id, '--memory', machine_cfg['memory'] ||= 1024]
@@ -20,17 +25,23 @@ module VagrantPlugins
             end
 
             machine_cfg[:networks].each do |net|
-              if net[:net] == 'private_network'
+              if net[:net] == :private_network
                 machine.vm.network net[:net],
-                                   type: net[:type] ||= 'static',
+                                   type: net[:type],
                                    ip: net[:ip],
                                    netmask: net[:mask],
                                    virtualbox__intnet: net[:interface]
-              elsif net[:net] = 'forwarded_port'
+              elsif net[:net] == :public_network
+                machine.vm.network net[:net],
+                                   type: net[:type],
+                                   ip: net[:ip],
+                                   netmask: net[:mask],
+                                   bridge: net[:bridge]
+              elsif net[:net] == :forwarded_port
                 machine.vm.network net[:net],
                                    guest: net[:guest],
                                    host: net[:host],
-                                   protocol: net[:protocol]
+                                   protocol: net[:protocol]                                   
               end
             end
 
@@ -52,7 +63,11 @@ module VagrantPlugins
             end
 
             machine_cfg[:folders].each do |folder|
-              machine.vm.synced_folder folder[:host], folder[:guest], disabled: folder[:disabled]
+              machine.vm.synced_folder folder[:host],
+                                       folder[:guest],
+                                       disabled: folder[:disabled],
+                                       create: folder[:create],
+                                       type: folder[:type]
             end
 
             machine_cfg[:authorized_keys].each do |key|

data/lib/vagrant-dotvm/configparser.rb

@@ -3,8 +3,13 @@ module VagrantPlugins
     class ConfigParser
 
       DEFAULT_NET     = 'private_network'
+      DEFAULT_NET_TYPE = 'static'
       DEFAULT_NETMASK = '255.255.255.0'
       DEFAULT_PROTOCOL = 'tcp'
+      DEFAULT_BOOT_TIMEOUT = 300
+      DEFAULT_BOX_CHECK_UPDATE = true
+      DEFAULT_BOX_VERSION = '>= 0'
+      DEFAULT_GRACEFUL_HALT_TIMEOUT = 60
 
       def initialize(vars = {})
         @vars = vars
@@ -55,24 +60,43 @@ module VagrantPlugins
               :host => '%project.host%',
               :guest => '%project.guest%',
               :disabled => false,
+              :create => false,
+              :type => nil,
             }
           ],
           :groups     => [],
           :authorized_keys => [],
+          :boot_timeout => self.coalesce(machine['boot_timeout'], DEFAULT_BOOT_TIMEOUT),
+          :box_check_update => self.coalesce(machine['box_check_update'], DEFAULT_BOX_CHECK_UPDATE),
+          :box_version => self.coalesce(machine['box_version'], DEFAULT_BOX_VERSION),
+          :graceful_halt_timeout => self.coalesce(machine['graceful_halt_timeout'], DEFAULT_GRACEFUL_HALT_TIMEOUT),
+          :post_up_message => machine['post_up_message'],
         }
       end
 
       
       def parse_net(net)
+        case net['net']
+        when 'private_network', 'private'
+          nettype = :private_network
+        when 'forwarded_port', 'port'
+          nettype = :forwarded_port
+        when 'public_network', 'public', 'bridged'
+          nettype = :public_network
+        else
+          nettype = DEFAULT_NET
+        end
+        
         return {
-          :net  => self.coalesce(net['net'], DEFAULT_NET),
-          :type => net['type'],
+          :net  => nettype,
+          :type => self.coalesce(net['type'], DEFAULT_NET_TYPE),
           :ip   => net['ip'],
           :mask => self.coalesce(net['mask'], net['netmask'], DEFAULT_NETMASK),
           :interface => net['interface'],
           :guest => net['guest'],
           :host => net['host'],
           :protocol => self.coalesce(net['protocol'], DEFAULT_PROTOCOL),
+          :bridge => net['bridge'],
         }
       end
 
@@ -96,6 +120,8 @@ module VagrantPlugins
           :host  => folder['host'],
           :guest => folder['guest'],
           :disabled => self.coalesce(folder['disabled'], false),
+          :create => self.coalesce(folder['create'], false),
+          :type => folder['type'],
         }
       end
 

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = "0.12.0"
+    VERSION = "0.13.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md