vagrant-windows-domain 1.2.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37f4d0b98f1c8ef3ed13f7df4c7873d80f989e7a
-  data.tar.gz: 11ff28a22ab25368c455195e971167447617b439
+SHA256:
+  metadata.gz: b03f283e47170d9b9a2db97da8a456a11ba260a851fc2f54f8a84d5513e258bd
+  data.tar.gz: 05f3530dd6fa06382d09515160c8a06f4c538d45f66ee15f80840e6d1276b059
 SHA512:
-  metadata.gz: 92a8e46f287fad2cc852bd0b444dd75ee68c671000f12bec1c0aad6de904cac1b81f53840e012abc1f0ea46f06543ee935f7efef0a54cfd0487775cbb24fa43e
-  data.tar.gz: ed683d8d59acd3ceafa4bee83ef04390136764efe2f9762eff960fde970f48370d8a81ae1be73e5c9875d6af785b1c345ecee4ee5ec15012328f169941107b53
+  metadata.gz: 75ed7c28a93fe9a00a5cc7d30ed30f4631e1e4773f196fe5dcfb667265f30bcf514afcc74a4af08230dacbd39364eef6c5850494f0c29824bbe21a0f22f9ee15
+  data.tar.gz: 247b3cb63c12c8597a1fcceeca3799f4f30cd529fcd197e3d0d7eb198febeb11d977bc1eab66d989ba0efb2d56b8cca05d3e705a994b705ff409844d65835097

data/.travis.yml

@@ -1,20 +1,16 @@
 language: ruby
 before_install:
-- rvm @global do gem uninstall bundler --all --executables
-- gem uninstall bundler --all --executables
-- gem install bundler --version 1.12.5
-- gem install bundler --version 1.12.5
+- gem update --system
+- gem install bundler
 rvm:
-- 2.2.3
-- 2.3.0
 - ruby-head
+- 2.5.1
+- 2.4.4
 matrix:
   allow_failures:
   - rvm: ruby-head
   fast_finish: true
 env:
   matrix:
-  - VAGRANT_VERSION=v1.8.0
-  global:
-    secure: bs4ezY+1Wksy8hH3nymPJ3AL99mpXULVc/AIh16JetEYw1850QkX7r4gQukMlcyByKUhxucjDLid0Y+KDH5kGMM16QjrVQGhAnUQzMoLD2qPbAaxDCUqpCJtFEEQKYxJvFvEK8a5SQzAsTVG4sgABQ/MllsIIH0FjkWgFtH6050=
-script: bundle _1.12.5_ exec rake test:unit
+  - VAGRANT_VERSION=v2.1.5
+script: bundle exec rake test:unit

data/Gemfile

@@ -4,9 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", :tag => "v2.1.5"
 end
 
-group :plugins do
-  gem "vagrant-windows-domain", path: "."
-end

data/README.md

@@ -47,6 +47,18 @@ config.vm.provision :windows_domain do |domain|
     # If not supplied the plugin will prompt the user during provisioning to provide one.
     domain.password = "iprobablyshouldntusethisfield"
 
+    # IP address of primary DNS server
+    #
+    # Specifies the IP address you want assigned as the primary DNS server for the primary nic.
+    # If not supplied, the nic's primary dns server will be assigned dynamically.
+    domain.primary_dns = "8.8.8.8"
+    
+    #IP address of the secondary DNS server
+    #
+    # Specifies the IP address you want assigned as the secondary DNS server for the primary nic
+    # If not supplied, the nic's secondary dns server will be assigned dynamically.
+	domain.secondary_dns = "8.8.4.4"
+
     # The set of Advanced options to pass when joining the Domain.
     #
     # See (https://technet.microsoft.com/en-us/library/hh849798.aspx) for detail, these are generally not required.

data/development/Vagrantfile

@@ -13,7 +13,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "mfellows/windows2012r2"
   config.vm.guest = :windows
   config.vm.communicator = "winrm"
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
+  #ALlows for vagrant to successfully connect to destination machine with winrm 
+  config.vm.network :forwarded_port, guest: 5985, host: 55985 #, id: "winrm", auto_correct: true
 
   config.vm.provider "virtualbox" do |v| 
     v.gui = true 

data/lib/vagrant-windows-domain/config.rb

@@ -40,6 +40,16 @@ module VagrantPlugins
       # The default value is the default OU for machine objects in the domain.
       attr_accessor :ou_path
 
+      # IP address of primary DNS server
+      #
+      # Specifies the IP address you want assigned as the primary DNS server for the primary nic
+      attr_accessor :primary_dns
+
+      #IP address of the secondary DNS server
+      #
+      # Specifies the IP address you want assigned as the secondary DNS server for the primary nic
+      attr_accessor :secondary_dns
+
       # Performs an unsecure join to the specified domain.
       #
       # When this option is used username/password are not required
@@ -56,6 +66,8 @@ module VagrantPlugins
         @password          = UNSET_VALUE
         @join_options      = {}
         @ou_path           = UNSET_VALUE
+        @primary_dns       = UNSET_VALUE
+        @secondary_dns     = UNSET_VALUE
         @unsecure          = UNSET_VALUE
         @rename            = UNSET_VALUE
         @logger            = Log4r::Logger.new("vagrant::vagrant_windows_domain")
@@ -63,7 +75,7 @@ module VagrantPlugins
 
       # Final step of the Configuration lifecyle prior to
       # validation.
-      #
+      # 
       # Ensures all attributes are set to defaults if not provided.
       def finalize!
         super
@@ -75,8 +87,10 @@ module VagrantPlugins
         @password          = nil if @password == UNSET_VALUE || @password == ""
         @join_options      = [] if @join_options == UNSET_VALUE
         @ou_path           = nil if @ou_path == UNSET_VALUE
+        @primary_dns       = nil if @primary_dns == UNSET_VALUE || @primary_dns == ""
+        @secondary_dns     = nil if @secondary_dns == UNSET_VALUE || @secondary_dns == ""
         @unsecure          = false if @unsecure == UNSET_VALUE
-        @rename            = true if @rename == UNSET_VALUE
+        @rename            = false if @rename == UNSET_VALUE
       end
 
       # Validate configuration and return a hash of errors.
@@ -89,9 +103,13 @@ module VagrantPlugins
         errors = _detected_errors
 
         # Need to supply one of them!
-        if ( (@username != nil && @password != nil) && @unsecure == true)
+        if (@username != nil && @password != nil) && @unsecure == true
           errors << I18n.t("vagrant_windows_domain.errors.both_credentials_provided")
         end
+
+        if @secondary_dns != nil && @primary_dns == nil
+          errors << I18n.t("vagrant_windows_domain.errors.invalid_dns_config")
+        end
         
         { "windows domain provisioner" => errors }
       end     

data/lib/vagrant-windows-domain/locales/en.yml

@@ -14,4 +14,6 @@ en:
       binary_not_detected: |-
         "The command '%{binary} required to join/remove the guest machine from the domain '%{domain}' was not found on the guest machine"
       absolute_module_path: |-
-        "Absolute 'module_path' not allowed. Please provide a path relative to your Vagrantfile."
+        "Absolute 'module_path' not allowed. Please provide a path relative to your Vagrantfile."
+      invalid_dns_config: |-
+        "Primary dns must be set before configuring Secondary DNS."

data/lib/vagrant-windows-domain/plugin.rb

@@ -24,10 +24,10 @@ module VagrantPlugins
         Provisioner
       end
 
-      action_hook(:windows_domain, :machine_action_destroy) do |hook|
-        require_relative 'action/leave_domain'
-        hook.prepend(VagrantPlugins::WindowsDomain::LeaveDomain)
-      end
+  #    action_hook(:windows_domain, :machine_action_destroy) do |hook|
+   #     require_relative 'action/leave_domain'
+   #     hook.prepend(VagrantPlugins::WindowsDomain::LeaveDomain)
+   #   end
     end
   end
 end

data/lib/vagrant-windows-domain/provisioner.rb

@@ -107,7 +107,7 @@ module VagrantPlugins
             restart_guest
 
             @logger.debug("Need to reboot to join the domain correctly - 2nd reboot")
-            restart_guest
+            #restart_guest
           end
         end
       end
@@ -150,14 +150,14 @@ module VagrantPlugins
       # This is the method called when destroying a machine that allows
       # for any state related to the machine created by the provisioner
       # to be cleaned up.
-      def destroy
+      def cleanup
         if @config && @config.domain != nil
           if is_joined_to_domain()
             set_credentials
             result = leave_domain
             if result
               @logger.debug("Need to reboot to leave the domain correctly")
-              restart_guest
+              #restart_guest
             end
           end
         else
@@ -215,6 +215,8 @@ module VagrantPlugins
             domain: @config.domain,
             computer_name: @config.computer_name,
             ou_path: @config.ou_path,
+            primary_dns: @config.primary_dns,
+            secondary_dns: @config.secondary_dns,
             add_to_domain: add_to_domain,
             unsecure: @config.unsecure,
             rename: @config.rename,
@@ -246,10 +248,6 @@ module VagrantPlugins
             params["-Credential $credentials"] = nil
           end
 
-          if @config.computer_name != nil && @config.computer_name != @old_computer_name
-            params["-NewName"] = "'#{@config.computer_name}'"
-          end
-
           if @config.ou_path
             params["-OUPath"] = "'#{@config.ou_path}'"
           end
@@ -314,7 +312,7 @@ module VagrantPlugins
         last_type = nil
         new_line = ""
         error = false
-        machine.communicate.sudo("powershell -ExecutionPolicy Bypass -OutputFormat Text -file #{script_path}", opts) do |type, data|
+        exit_status = @machine.communicate.sudo("powershell -ExecutionPolicy Bypass -OutputFormat Text -file #{script_path}", opts) do |type, data|
           if !data.chomp.empty?
             error = true if type == :stderr
             if [:stderr, :stdout].include?(type)

data/lib/vagrant-windows-domain/templates/runner.ps1.erb

@@ -17,8 +17,192 @@ function Repair-OpenSSHPasswd(){
 		$passwd | Set-Content $passwdPath -Encoding Ascii
 	}
 }
+function New-ADSIPrincipalContext
+{
+	[CmdletBinding(SupportsShouldProcess = $true)]
+	[OutputType('System.DirectoryServices.AccountManagement.PrincipalContext')]
+	PARAM
+	(
+		[Alias("RunAs")]
+		[System.Management.Automation.PSCredential]
+		[System.Management.Automation.Credential()]
+		$Credential = [System.Management.Automation.PSCredential]::Empty,
+		
+		[Parameter(Mandatory = $true)]
+		[System.DirectoryServices.AccountManagement.ContextType]$ContextType,
+		
+		$DomainName = [System.DirectoryServices.ActiveDirectory.Domain]::Getcurrentdomain(),
+		
+		$Container,
+		
+		[System.DirectoryServices.AccountManagement.ContextOptions[]]$ContextOptions
+	)
+	
+	BEGIN
+	{
+		$ScriptName = (Get-Variable -name MyInvocation -Scope 0 -ValueOnly).MyCommand
+		Write-Verbose -Message "[$ScriptName] Add Type System.DirectoryServices.AccountManagement"
+		Add-Type -AssemblyName System.DirectoryServices.AccountManagement
+	}
+	PROCESS
+	{
+		TRY
+		{
+			switch ($ContextType)
+			{
+				"Domain" { $ArgumentList = $ContextType, $DomainName }
+				"Machine" { $ArgumentList = $ContextType, $ComputerName }
+				"ApplicationDirectory" { $ArgumentList = $ContextType }
+			}
+			
+			IF ($PSBoundParameters['Container'])
+			{
+				$ArgumentList += $Container
+			}
+			
+			IF ($PSBoundParameters['ContextOptions'])
+			{
+				$ArgumentList += $($ContextOptions)
+			}
+			
+			IF ($PSBoundParameters['Credential'])
+			{
+				# Query the specified domain or current if not entered, with the specified credentials
+				$ArgumentList += $($Credential.UserName), $($Credential.GetNetworkCredential().password)
+			}
+			
+			IF ($PSCmdlet.ShouldProcess($DomainName, "Create Principal Context"))
+			{
+				# Query 
+				New-Object -TypeName System.DirectoryServices.AccountManagement.PrincipalContext -ArgumentList $ArgumentList
+			}
+		} #TRY
+		CATCH
+		{
+			$PSCmdlet.ThrowTerminatingError($_)
+		}
+	} #PROCESS
+}
 
+function Get-ADSIComputer
+{
+	[CmdletBinding(DefaultParameterSetName="All")]
+	param ([Parameter(Mandatory=$true,ParameterSetName="Identity")]
+		[string]$Identity,
+		
+		[Alias("RunAs")]
+		[System.Management.Automation.PSCredential]
+		[System.Management.Automation.Credential()]
+		$Credential = [System.Management.Automation.PSCredential]::Empty,
+
+		[String]$DomainName
+	)
+	BEGIN
+	{
+        Add-Type -AssemblyName System.DirectoryServices.AccountManagement
+		
+        # Create Context splatting
+        $ContextSplatting = @{ ContextType = "Domain" }
+		
+        IF ($PSBoundParameters['Credential']) { $ContextSplatting.Credential = $Credential }
+        IF ($PSBoundParameters['DomainName']) { $ContextSplatting.DomainName = $DomainName }
+		
+        $Context = New-ADSIPrincipalContext @ContextSplatting
+
+	}
+	PROCESS
+	{
+        TRY{
+            IF($Identity)
+            {
+                [System.DirectoryServices.AccountManagement.ComputerPrincipal]::FindByIdentity($Context, $Identity)
+            }
+            ELSE{
+                $ComputerPrincipal = New-object -TypeName System.DirectoryServices.AccountManagement.ComputerPrincipal -ArgumentList $Context
+			    $Searcher = new-object System.DirectoryServices.AccountManagement.PrincipalSearcher
+			    $Searcher.QueryFilter = $ComputerPrincipal
+
+                $Searcher.FindAll()
+            }
+        }
+        CATCH
+        {
+        	$pscmdlet.ThrowTerminatingError($_)
+        }
+	}
+}
+
+function Remove-ADSIComputer
+{
+	[CmdletBinding(SupportsShouldProcess = $true)]
+	PARAM (
+		[parameter(Mandatory = $true, ValueFromPipelineByPropertyName = $true, ValueFromPipeline = $true)]
+		$Identity,
+
+		[Alias("RunAs")]
+		[System.Management.Automation.PSCredential]
+		[System.Management.Automation.Credential()]
+		$Credential = [System.Management.Automation.PSCredential]::Empty,
+
+		[String]$DomainName,
+
+		[Switch]$Recursive
+	)
+	
+	BEGIN
+	{
+		Add-Type -AssemblyName System.DirectoryServices.AccountManagement
+		
+		# Create Context splatting
+		$ContextSplatting = @{ }
+		IF ($PSBoundParameters['Credential']) { $ContextSplatting.Credential = $Credential }
+		IF ($PSBoundParameters['DomainName']) { $ContextSplatting.DomainName = $DomainName }
+
+	}
+	PROCESS
+	{
+		TRY
+		{
+			# Not Recursive
+			if (-not $PSBoundParameters['Recursive'])
+			{
+				if ($pscmdlet.ShouldProcess("$Identity", "Remove Account"))
+				{
+					$Account = Get-ADSIComputer -Identity $Identity @ContextSplatting
+					$Account.delete()
+				}
+			}
+			
+			# Recursive (if the computer is the parent of one leaf or more)
+			if ($PSBoundParameters['Recursive'])
+			{
+				if ($pscmdlet.ShouldProcess("$Identity", "Remove Account and any child objects"))
+				{
+					$Account = Get-ADSIComputer -Identity $Identity @ContextSplatting
+					$Account.GetUnderlyingObject().deletetree()
+				}
+			}
+			
+		}
+		CATCH
+		{
+			$pscmdlet.ThrowTerminatingError($_)
+		}
+	}
+}
+try
+{
+	Get-NetConnectionProfile -ErrorAction Stop | Set-NetConnectionProfile -NetworkCategory private -ErrorAction Stop
+}
+catch
+{
+	Write-host "Network adapters already set to private network type"
+}
+<% if options[:computer_name] != nil %>
 $computerName='<%= options[:computer_name] %>'
+<% else %>
+$computerName = $env:COMPUTERNAME
+<% end %>
 <% if options[:username] != nil && options[:unsecure] != true %>
 $domain='<%= options[:domain] %>'
 $username='<%= options[:username] %>'
@@ -26,14 +210,41 @@ $password='<%= options[:password] %>'
 $secpasswd = ConvertTo-SecureString $password -AsPlainText -Force
 $credentials = New-Object System.Management.Automation.PSCredential ($username, $secpasswd)
 <% end %>
+
 <% if options[:add_to_domain] === true %>
 if (Test-PartOfDomain -computerName $computerName -domain $domain){
 	throw "$computerName already part of domain $domain"
 } else {
-	Add-Computer <%= options[:parameters] %> -Verbose -Force -PassThru
-	
+	#If a value is provided for the Primary_DNS and Secondary_DNS variable in the vagrantfile, powershell will determine if the string is a valid IP and will statically set the primary and secondary dns servers of the vm's nic if it is.  If only Primary_DNS variable is provided, powershell will statically set the primary dns server of the vm's nic while leaving the secondary unset.
+	<% if options[:primary_dns] != nil %>
+		$wmi = Get-WmiObject -ComputerName $env:COMPUTERNAME -Namespace "root\CIMV2" -Class "Win32_NetworkAdapterconfiguration" -Filter 'IPENABLED=TRUE AND Index=2' -Impersonation Impersonate -ErrorAction Stop | Where-Object { $_.DefaultIPGateway }
+		# $currdns = $wmi.DNSServerSearchOrder
+		$prim = '<%= options[:primary_dns] %>'
+		# Modified the configuration so that the secondary dns can only be set if the primary dns server has also been set
+		<% if options[:secondary_dns] != nil %>
+			$sec = '<%= options[:secondary_dns] %>'
+			If (($prim -match "^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$") -and ($sec -match "^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$"))
+			{
+				$wmi.SetDNSServerSearchOrder(@("$prim", "$sec"))
+			}
+			else
+			{
+				throw "Invalid value provided for dns server ip"
+			}
+		<% else %>
+			If ($prim -match "^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$")
+			{
+				$wmi.SetDNSServerSearchOrder("$prim")
+			}
+			else
+			{
+				throw "Invalid IP address provided"
+			}
+		<% end %>
+	<% end %>
+	Add-Computer <%= options[:parameters] %> -Verbose -Force
 	# Rename computer separately: Fixes GH issue #11
-	<% if options[:rename] === true %>
+	<% if options[:computer_name] != nil %>
 	$completed = $false
 	while ( -not $completed) {
 		try {
@@ -51,28 +262,26 @@ if (Test-PartOfDomain -computerName $computerName -domain $domain){
 		}
 	}
 	<% end %>	
-	
 	Repair-OpenSSHPasswd
-
-	# Fix vagrant-windows GH-129, if there's an existing scheduled
-	# reboot cancel it so shutdown succeeds
-	&shutdown /a
-
-	# Force shutdown the machine now
-	&shutdown /s /t 15 /c "Vagrant Halt" /f /d p:4:1	
 }
 <% else %>
-if (!(Test-JoinedToADomain)) {
-	Throw "$computerName not part of any domain"
+$compobj = Get-ADSIComputer -Identity $computerName -Credential $credentials -DomainName $domain
+if (!(Test-JoinedToADomain) -or !($compobj)) {
+	# Throw "$computerName not part of any domain"
+	return
 } else {
-	Remove-Computer <%= options[:parameters] %> -Workgroup 'WORKGROUP' -Verbose -Force -PassThru
+	#When destroying the vagrant machine, the goal is not as much to have the virtual machine disjoin from the domain, but to remove the computer object associated with the
+	#machine so that future runs of vagrant up will succeed (especially when the vagrantfile explicitly defines a computer name.  That being the case, the remove-computer
+	#command has been replaced with a custom function which is able to remove the computer object associated with the vagrant machine in active directory.
+	try
+	{
+	Remove-ADSIComputer -Identity $env:COMPUTERNAME -DomainName $domain -Credential $credentials -Verbose -ErrorAction Stop
 	Repair-OpenSSHPasswd
-
-	# Fix vagrant-windows GH-129, if there's an existing scheduled
-	# reboot cancel it so shutdown succeeds
-	&shutdown /a
-
-	# Force shutdown the machine now
-	&shutdown /s /t 15 /c "Vagrant Halt" /f /d p:4:1
+	}
+	catch
+	{
+		Repair-OpenSSHPasswd
+	}
+	
 }
 <% end %>

data/lib/vagrant-windows-domain/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module WindowsDomain
-    VERSION = "1.2.0"
+    VERSION = "1.3.5"
   end
 end

data/spec/provisioner/config_spec.rb

@@ -52,6 +52,7 @@ describe VagrantPlugins::WindowsDomain::Config do
       expect(subject.computer_name).to be_nil
       expect(subject.username).to be_nil
       expect(subject.password).to be_nil
+	  
     end
   end
 

data/spec/provisioner/provisioner_spec.rb

@@ -74,11 +74,11 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       allow(communicator).to receive(:upload)
       allow(ui).to receive(:info)
       expect(communicator).to receive(:test)
-      expect(vm).to receive(:boot_timeout).twice
+      expect(vm).to receive(:boot_timeout).once
       expect(communicator).to receive(:sudo).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1", {:elevated=>true, :error_check=>true, :error_key=>nil, :good_exit=>0, :shell=>:powershell})
       expect(communicator).to receive(:sudo).with("del c:/tmp/vagrant-windows-domain-runner.ps1")
-      expect(machine).to receive(:action).with(:reload, {:provision_ignore_sentinel=>false, :lock=>false}).twice
-      expect(communicator).to receive(:ready?).and_return(true).twice
+      expect(machine).to receive(:action).with(:reload, {:provision_ignore_sentinel=>false, :lock=>false}).once
+      expect(communicator).to receive(:ready?).and_return(true).once
       subject.restart_sleep_duration = 0
       subject.provision
       expect(subject.old_computer_name).to eq("myoldcomputername")
@@ -88,11 +88,11 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       allow(communicator).to receive(:upload)
       allow(ui).to receive(:info)
       expect(communicator).to receive(:test)
-      expect(vm).to receive(:boot_timeout).twice
+      expect(vm).to receive(:boot_timeout).once
       expect(communicator).to receive(:sudo).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1", {:elevated=>true, :error_check=>true, :error_key=>nil, :good_exit=>0, :shell=>:powershell})
       expect(communicator).to receive(:sudo).with("del c:/tmp/vagrant-windows-domain-runner.ps1")
-      expect(machine).to receive(:action). with(:reload, {:provision_ignore_sentinel=>false, :lock=>false}).twice
-      expect(communicator).to receive(:ready?).and_return(true).twice
+      expect(machine).to receive(:action). with(:reload, {:provision_ignore_sentinel=>false, :lock=>false}).once
+      expect(communicator).to receive(:ready?).and_return(true).once
       subject.restart_sleep_duration = 0
       subject.provision
     end
@@ -190,19 +190,12 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
     it "should leave domain when a `vagrant destroy` is issued" do
       allow(machine).to receive(:communicate).and_return(communicator)
       expect(communicator).to receive(:test).and_return(true)
-      expect(vm).to receive(:boot_timeout)
       expect(communicator).to receive(:upload)
       expect(communicator).to receive(:sudo).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1", {:elevated=>true, :error_check=>true, :error_key=>nil, :good_exit=>0, :shell=>:powershell}).and_yield(:stdout, "deleted")
       expect(ui).to receive(:info).with("\"Running Windows Domain Provisioner\"")
       expect(ui).to receive(:info).with("deleted", {:color=>:green, :new_line=>false, :prefix=>false})
-      expect(ui).to receive(:say).with(:info, "Restarting computer for updates to take effect.")
-      expect(machine).to receive(:action). with(:reload, {:provision_ignore_sentinel=>false, :lock=>false})
-      expect(ui).to_not receive(:say)
-      expect(ui).to_not receive(:ask)
-      expect(communicator).to receive(:ready?).and_return(true)
-      subject.restart_sleep_duration = 0      
 
-      subject.destroy
+      subject.cleanup
     end
 
     it "should not leave domain plugin not associated with current Vagrantfile" do
@@ -211,7 +204,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       subject = described_class.new machine, double("env", :domain => nil)
 
       expect(ui).to_not receive(:ask)
-      expect(subject.destroy).to eq(nil)
+      expect(subject.cleanup).to eq(nil)
     end
 
     it "should ask for credentials when leaving domain when no credentials were provided" do
@@ -220,19 +213,13 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       allow(machine).to receive(:communicate).and_return(communicator)
       allow(machine).to receive(:env).and_return(env)
 
-      expect(vm).to receive(:boot_timeout)
       expect(communicator).to receive(:test).and_return(true)
       expect(communicator).to receive(:upload)
       expect(communicator).to receive(:sudo).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1", {:elevated=>true, :error_check=>true, :error_key=>nil, :good_exit=>0, :shell=>:powershell}).and_yield(:stdout, "deleted")
       expect(ui).to receive(:info).with(any_args).twice
       expect(ui).to receive(:ask).with("Please enter your domain password (output will be hidden): ", {:echo=>false}).and_return("myusername")
       expect(ui).to receive(:ask).with("Please enter your domain username: ")
-      expect(ui).to receive(:say).with(:info, "Restarting computer for updates to take effect.")
-      expect(machine).to receive(:action). with(:reload, {:provision_ignore_sentinel=>false, :lock=>false})
-      expect(communicator).to receive(:ready?).and_return(true)
-      subject.restart_sleep_duration = 0
-
-      subject.destroy
+      subject.cleanup
     end
 
   end

data/vagrant-windows-domain.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["matt.fellows@onegeek.com.au"]
   spec.summary       = "Windows Domain Provisioner for Vagrant"
   spec.description   = "Adds and Removes Windows Guests from a Windows Domain, as part of the standard machine lifecycle."
-  spec.homepage      = "https://github.com/SEEK-Jobs/vagrant-windows-domain"
+  spec.homepage      = "https://github.com/mefellows/vagrant-windows-domain"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "bundler", ">= 1.5.2", "<= 1.12.5"
-  spec.add_development_dependency "coveralls", "~> 0.8.10", '>= 0.8.10'
-  spec.add_development_dependency "rspec-core", '~> 3.4.2', '>= 3.4.2'
-  spec.add_development_dependency "rspec-expectations", '~> 3.4.0', '>= 3.4.0'
-  spec.add_development_dependency "rspec-mocks", '~> 3.4.1', '>= 3.4.1'
-  spec.add_development_dependency "rspec-its", "~> 1.2.0", '>= 1.2.0'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "rspec-core"
+  spec.add_development_dependency "rspec-expectations"
+  spec.add_development_dependency "rspec-mocks"
+  spec.add_development_dependency "rspec-its"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-domain
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.5
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,120 +30,84 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.10
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.10
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.10
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.10
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 description: Adds and Removes Windows Guests from a Windows Domain, as part of the
   standard machine lifecycle.
 email:
@@ -169,11 +133,10 @@ files:
 - lib/vagrant-windows-domain/version.rb
 - spec/base.rb
 - spec/provisioner/config_spec.rb
-- spec/provisioner/leave_domain_spec.rb
 - spec/provisioner/provisioner_spec.rb
 - spec/spec_helper.rb
 - vagrant-windows-domain.gemspec
-homepage: https://github.com/SEEK-Jobs/vagrant-windows-domain
+homepage: https://github.com/mefellows/vagrant-windows-domain
 licenses:
 - MIT
 metadata: {}
@@ -192,14 +155,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Windows Domain Provisioner for Vagrant
 test_files:
 - spec/base.rb
 - spec/provisioner/config_spec.rb
-- spec/provisioner/leave_domain_spec.rb
 - spec/provisioner/provisioner_spec.rb
 - spec/spec_helper.rb

data/spec/provisioner/leave_domain_spec.rb

@@ -1,131 +0,0 @@
-require 'spec_helper'
-require 'vagrant-windows-domain/provisioner'
-require 'vagrant-windows-domain/action/leave_domain'
-require 'vagrant-windows-domain/config'
-require 'base'
-
-describe VagrantPlugins::WindowsDomain::LeaveDomain do
-
-  include_context "unit"
-  let(:instance) { described_class.new }
-
-  let(:root_path)           { (Pathname.new(Dir.mktmpdir)).to_s }
-  let(:domain)              { "foo.com" }
-  let(:ui)                  { double("ui") }
-  let(:app)                 { double("app") }
-  let(:communicator)        { double ("communicator") }
-  let(:shell)               { double ("shell") }
-  let(:powershell)          { double ("powershell") }
-  let(:guest)               { double ("guest") }
-  let(:configuration_file)  { "manifests/MyWebsite.ps1" }
-  let(:module_path)         { ["foo/modules", "foo/modules2"] }
-  let(:config)              { VagrantPlugins::WindowsDomain::Config.new }
-  let(:vm)                  { double("vm", provisioners: [double("prov", config: config)]) }
-  let(:root_config)          { double("root_config", vm: vm) }
-  let(:env)                 { {:ui => ui, :machine => machine} }
-  let(:machine)             { double("machine", ui: ui, id: "1234", config: root_config) }
-  let(:provisioner)         { double("provisioner") }
-  subject                   { described_class.new app, env }
-
-  describe "call" do
-
-    before do
-      allow(machine).to receive(:communicate).and_return(communicator)
-      allow(env).to receive(:machine).and_return(machine)
-      allow(communicator).to receive(:shell).and_return(shell)
-      allow(shell).to receive(:powershell).and_yield(:stdout, "myoldcomputername")
-      config.domain = domain
-      allow(env).to receive(:machine).and_return(machine)
-      allow(machine).to receive(:env).and_return(env)
-      allow(env).to receive(:ui).and_return(ui)
-      subject.provisioner = provisioner
-    end
-
-    context "when no configuration exists for the machine" do
-      it "should pass control to the next middleware Action" do
-        config.domain = nil
-        expect(app).to receive(:call).with(env)
-        subject.call(env)
-      end
-    end
-
-    context "when machine is running" do
-      it "should prompt the user if they would like to destroy & d/c the machine" do
-        state = double("state", id: :running)
-        expect(provisioner).to receive(:destroy)
-
-        expect(app).to receive(:call).with(env)
-            expect(ui).to receive(:ask).with("Are you sure you want to destroy this machine and disconnect from #{domain}? (y/n)").and_return("y")
-        expect(machine).to receive(:state).and_return(state).twice
-        subject.call(env)
-
-      end
-
-      it "should not continue if the user declines to destroy the machine" do
-        state = double("state", id: :running)
-        expect(provisioner).to_not receive(:destroy)
-
-        expect(ui).to receive(:ask).with("Are you sure you want to destroy this machine and disconnect from #{domain}? (y/n)").and_return("n")
-        expect(machine).to receive(:state).and_return(state).twice
-        expect(app).to_not receive(:call).with(env)
-        subject.call(env)
-      end
-    end
-
-    context "when machine is :paused, :saved or :poweroff" do
-      it "should prompt the user if they would like to force destroy the machine" do
-        state = double("state", id: :poweroff)
-        provisioner = double("provisioner")
-        subject.provisioner = provisioner
-
-        expect(ui).to receive(:say).with(:warn, "Machine is currently not running. To properly leave the #{domain} network the machine needs to be running and connected to the network in which it was provisioned. Please run `vagrant up` and then `vagrant destroy`.\n")
-        expect(ui).to receive(:ask).with("Would you like to continue destroying this machine, leaving this machine orphaned in the '#{domain}' network? If so, type 'destroy'").and_return("destroy")
-        expect(ui).to receive(:say).with(:warn, "Force destroying this machine and not leaving the domain foo.com. May FSM have mercy on your soul.")
-        expect(machine).to receive(:state).and_return(state).twice
-        expect(app).to receive(:call).with(env)
-        # Can't call destroy on a non-running machine
-        expect(provisioner).to_not receive(:destroy)
-
-        subject.call(env)
-
-        expect(env[:force_confirm_destroy]).to be(true)
-      end
-
-      it "should not pass on to middleware if user declines force destroy" do
-        state = double("state", id: :poweroff)
-        provisioner = double("provisioner")
-        subject.provisioner = provisioner
-
-        expect(ui).to receive(:say).with(:warn, "Machine is currently not running. To properly leave the #{domain} network the machine needs to be running and connected to the network in which it was provisioned. Please run `vagrant up` and then `vagrant destroy`.\n")
-        expect(ui).to receive(:ask).with("Would you like to continue destroying this machine, leaving this machine orphaned in the '#{domain}' network? If so, type 'destroy'").and_return("n")
-        expect(machine).to receive(:state).and_return(state).twice
-        expect(app).to_not receive(:call).with(env)
-        expect(provisioner).to_not receive(:destroy)
-        expect(env[:force_confirm_destroy]).to be(nil)
-
-        subject.call(env)
-      end
-    end
-
-    context "when machine is :not_created" do
-      it "should pass control to the next middleware action" do
-        state = double("state", id: :not_created)
-        expect(machine).to receive(:state).and_return(state)
-
-        expect(app).to receive(:call).with(env)
-        subject.call(env)
-      end
-    end
-  end
-
-
-  describe "initialize" do
-
-    its("env")              { should eq(env) }
-    its("app")              { should eq(app) }
-    its("config")           { should eq(config) }
-    its("machine")          { should eq(machine) }
-
-  end
-
-end