vagrant-vmware-dhcp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23aa2463797ac8ab504cb0f4495de5231272e3fd
-  data.tar.gz: 5279cdddee8dc659ddd83b1be484f0e30521e0a8
+  metadata.gz: 41b94ee9258152c1f4876cd69480f2f5aaf86d34
+  data.tar.gz: 9ca0e66e7f97bb066277bad8dccda536c8f2bf07
 SHA512:
-  metadata.gz: 7b1b8c1f8db66515829cf6599ce3871748d5768f198fc1d8d68971e1365a7deef0b8eec973bf4b7556547fd38fe1084fc8f7ebff8f7f9310ba332618d99e268b
-  data.tar.gz: 417eac593215670c8f9e90e337b4bd78152af4941d5bb81d171c34af95cd32446c193702dd89e4adb278dd7fc27bee04d4ee63fc32e4f9d7e5620c88b820b16e
+  metadata.gz: 669af463443c20509ea29e71cf05e1e904815e5fea53965da20741598754099188283c27d639723202f8a3500cd851be974002772dee726456bcedd508466c59
+  data.tar.gz: c581d528b41c80c62f9523b3f3fe850abf62d700bbbe52a26062adad0a0ffce1e51945f45d75565f078fa61b68ffd55eb7f35f45a8c3f668d06b2045011cc92f

data/lib/vagrant-vmware-dhcp/action/config_dhcp.rb

@@ -18,8 +18,7 @@ module VagrantPlugins
           if @env[:machine]
             @logger.debug("In config_dhcp provider_name is #{@env[:machine].provider_name}")
 
-            # or env[:machine].provider_name == :vmware_workstation
-            if @env[:machine].provider_name == :vmware_fusion or @env[:machine].provider_name == :vmware_workstation
+            if (@env[:machine].provider_name == :vmware_fusion or @env[:machine].provider_name == :vmware_workstation) and @env[:machine].config.control_dhcp
               configure_dhcp
             end
           end

data/lib/vagrant-vmware-dhcp/action/set_mac.rb

@@ -14,10 +14,12 @@ module VagrantPlugins
         def call(env)
           @env = env
 
-          machine = env[:machine]
+          if @env[:machine]
+            machine = @env[:machine]
 
-          if machine
-            set_mac_address(env)
+            if (@env[:machine].provider_name == :vmware_fusion or @env[:machine].provider_name == :vmware_workstation) and @env[:machine].config.control_dhcp
+              set_mac_address(@env)
+            end
           end
 
           @app.call(@env)

data/lib/vagrant-vmware-dhcp/config.rb

@@ -0,0 +1,19 @@
+require_relative "action"
+
+module VagrantPlugins
+  module VagrantVmwareDhcp
+    class Config < Vagrant.plugin(2, :config)
+      attr_accessor :enable
+
+      def initialize
+        @enable = false
+      end
+
+      def finalize!
+        if @enable != true
+          @enable = false 
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-vmware-dhcp/plugin.rb

@@ -9,23 +9,27 @@ module VagrantPlugins
       Especially nice on multi-vm environments with Windows.
       DESC
 
+      config(:control_dhcp) do
+        Config
+      end
+
       action_hook('DA VMWare Network: Configure MAC addresses') do |hook|
         action = Vagrant::Action::Builtin::ConfigValidate
         hook.before(action, VagrantVmwareDhcp::Action::SetMac)
       end
 
-      if Vagrant::Util::Platform.windows?
-        ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpWindows
-        ActionClass = HashiCorp::VagrantVMwaredesktop::Action::Network
-      elsif Vagrant::Util::Platform.linux?
-        ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpLinux
-        ActionClass = HashiCorp::VagrantVMwaredesktop::Action::Network
-      elsif Vagrant::Util::Platform.darwin?
-        ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpDarwin
-        ActionClass = HashiCorp::VagrantVMwarefusion::Action::Network
-      end
-
       action_hook('DA VMWare Network: Configure dhcp.conf') do |hook|
+        if Vagrant::Util::Platform.windows?
+          ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpWindows
+          ActionClass = HashiCorp::VagrantVMwaredesktop::Action::Network
+        elsif Vagrant::Util::Platform.linux?
+          ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpLinux
+          ActionClass = HashiCorp::VagrantVMwaredesktop::Action::Network
+        elsif Vagrant::Util::Platform.darwin?
+          ConfigDhcpClass = VagrantVmwareDhcp::Action::ConfigDhcpDarwin
+          ActionClass = HashiCorp::VagrantVMwarefusion::Action::Network
+        end
+
         hook.after(ActionClass, ConfigDhcpClass)
       end
 

data/lib/vagrant-vmware-dhcp/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantVmwareDhcp
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

data/lib/vagrant-vmware-dhcp.rb

@@ -5,6 +5,7 @@ module VagrantPlugins
   module VagrantVmwareDhcp
     lib_path = Pathname.new(File.expand_path("../vagrant-vmware-dhcp", __FILE__))
     autoload :Action,      lib_path.join("action")
+    autoload :Config,      lib_path.join("config")
 
     def self.source_root
       @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmware-dhcp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Israel Shirk
@@ -58,6 +58,7 @@ files:
 - lib/vagrant-vmware-dhcp/action/config_dhcp_linux.rb
 - lib/vagrant-vmware-dhcp/action/config_dhcp_windows.rb
 - lib/vagrant-vmware-dhcp/action/set_mac.rb
+- lib/vagrant-vmware-dhcp/config.rb
 - lib/vagrant-vmware-dhcp/plugin.rb
 - lib/vagrant-vmware-dhcp/version.rb
 - locales/en.yml