vagrant-dotvm 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 329d0a2a3dcbc737df5fd64651dee0edfa7784e6
-  data.tar.gz: 9c0659b46f54dd94770bae0fe550c46ee57b1758
+  metadata.gz: 667d0dce371ea12db6bd6c8954ae29300bbdadaa
+  data.tar.gz: 22afb804a131c0759d0980a7b211bec543eee6da
 SHA512:
-  metadata.gz: 938cb9479eb145b2159698545a8fa776c953263fda6d0ac8b680bdc47fda994f224a46e1eea0f7b9cf2b5c8a4e3d4f4c1e58a3a00cd29586e49acae49f300b12
-  data.tar.gz: 28a4ab213f0ad04659cf7293f95179b9b551b7a62c0d89684e2b3cf7cea50555a8adfeb35a32e4eb595d9f6b3193ffbd697752f542168ab033d7dd3759d151c5
+  metadata.gz: fbfd7301f49c8371f0bcb91c88806ea05382cda1b0605ac4c0fc7f267d74e032b6a0715d78811b6c6f4cdd2dffbabd5609c6ee8c5893cc560aed60c5e795b7f7
+  data.tar.gz: 27d143751fe453535985fef8d6dccd4211a03f6b5a42f35ec6c1232a30c7b3ca590afc6b90418b09dbb74223148adfbe5242d015b0d29397ea3184ffb1c7a0ee

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.25.0
+* Ability to set global options for ssh
+* Ability to set global options for winrm
+* Ability to set global options for vagrant
+* Don't set X11 forwarding by default, now it's controlled via option
+
 # 0.24.0
 * Fix for autostart/primary options incorrectly passed to Vagrant
 

data/lib/vagrant-dotvm/config/machine.rb

@@ -37,7 +37,6 @@ module VagrantPlugins
         attr_reader :usable_port_range
 
         def initialize()
-          @primary         = false
           @networks        = []
           @routes          = []
           @provision       = []

data/lib/vagrant-dotvm/config/root.rb

@@ -3,9 +3,15 @@ module VagrantPlugins
     module Config
       class Root < AbstractConfig
         attr_reader :machines
+        attr_reader :options
 
         def initialize()
           @machines = []
+          @options  = {
+            :ssh     => [],
+            :winrm   => [],
+            :vagrant => [],
+          }
         end
 
         def populate_machines(data)
@@ -15,6 +21,19 @@ module VagrantPlugins
             @machines << machine
           end
         end
+
+        def populate_options(data)
+          data.to_h.each do |key, confs|
+            key = key.to_sym
+            raise "Invalid options category: #{key}." unless @options.has_key?(key)
+
+            confs.to_a.each do |conf|
+              item = Option.new
+              item.populate conf
+              @options[key] << item
+            end
+          end
+        end
       end
     end
   end

data/lib/vagrant-dotvm/configinjecter.rb

@@ -4,8 +4,17 @@ module VagrantPlugins
 
       public
       def self.inject(config, vc)
-        # General settings
-        vc.ssh.forward_x11 = true
+        config.options[:ssh].each do |option|
+          vc.ssh.send("#{option.name}=", option.value)
+        end
+
+        config.options[:winrm].each do |option|
+          vc.winrm.send("#{option.name}=", option.value)
+        end
+
+        config.options[:vagrant].each do |option|
+          vc.vagrant.send("#{option.name}=", option.value)
+        end
 
         config.machines.each do |machine_cfg|
           define_opts = {}

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = "0.24.0"
+    VERSION = "0.25.0"
   end
 end

metadata

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