vagrant-windows-domain 1.1.12 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6935c271e7991ba222a5b9cc75bc7b48bf380551
-  data.tar.gz: 1683dd749c1aa220908d942dba0dce3d6934fc41
+  metadata.gz: 37f4d0b98f1c8ef3ed13f7df4c7873d80f989e7a
+  data.tar.gz: 11ff28a22ab25368c455195e971167447617b439
 SHA512:
-  metadata.gz: 3f115da7c99ff86bc26c401b3c7608d5625b315a8db76eef951569fae6733452764b58a3920974f0d6337707e2c308025043a91e6bc1e559912863155b573400
-  data.tar.gz: 86dae6af5c39d9ad77c2092ea8b1995483fe73ffe33510643aed14d75c7ec4e19b46c490cab00cc553d9529e993509b93b518881a25b217217cfaa6f43fe6ca9
+  metadata.gz: 92a8e46f287fad2cc852bd0b444dd75ee68c671000f12bec1c0aad6de904cac1b81f53840e012abc1f0ea46f06543ee935f7efef0a54cfd0487775cbb24fa43e
+  data.tar.gz: ed683d8d59acd3ceafa4bee83ef04390136764efe2f9762eff960fde970f48370d8a81ae1be73e5c9875d6af785b1c345ecee4ee5ec15012328f169941107b53

data/.travis.yml

@@ -2,10 +2,11 @@ language: ruby
 before_install:
 - rvm @global do gem uninstall bundler --all --executables
 - gem uninstall bundler --all --executables
-- gem install bundler --version '< 1.7.0'
+- gem install bundler --version 1.12.5
+- gem install bundler --version 1.12.5
 rvm:
-- 2.0.0
-- 2.1.0
+- 2.2.3
+- 2.3.0
 - ruby-head
 matrix:
   allow_failures:
@@ -13,7 +14,7 @@ matrix:
   fast_finish: true
 env:
   matrix:
-  - VAGRANT_VERSION=v1.6.5
+  - VAGRANT_VERSION=v1.8.0
   global:
     secure: bs4ezY+1Wksy8hH3nymPJ3AL99mpXULVc/AIh16JetEYw1850QkX7r4gQukMlcyByKUhxucjDLid0Y+KDH5kGMM16QjrVQGhAnUQzMoLD2qPbAaxDCUqpCJtFEEQKYxJvFvEK8a5SQzAsTVG4sgABQ/MllsIIH0FjkWgFtH6050=
-script: bundle exec rake test:unit
+script: bundle _1.12.5_ exec rake test:unit

data/README.md

@@ -28,7 +28,7 @@ config.vm.provision :windows_domain do |domain|
 
     # The new Computer Name to use when joining the domain.
     #
-    # Uses the Rename-Computer PowerShell command. ORRRR -NewName flag??
+    # Uses the Rename-Computer PowerShell command.
     # Specifies a new name for the computer in the new domain.
     domain.computer_name = "myfandangledname"
 
@@ -74,7 +74,44 @@ This is a great real-life example to get you on your way.
 
 Currently the plugin supports any Windows environment with Powershell 3+ installed (2008r2, 2012r2 should work nicely).
 
-## Uninistallation
+## Development
+
+Before getting started, read the Vagrant plugin [development basics](https://docs.vagrantup.com/v2/plugins/development-basics.html) and [packaging](https://docs.vagrantup.com/v2/plugins/packaging.html) documentation.
+
+You will need Ruby 2.1.5 and Bundler v1.12.5 installed before proceeding.
+
+_NOTE_: it _must_ be bundler v1.12.5 due to a hard dependency in Vagrant at this time.
+
+```
+git clone git@github.com:mefellows/vagrant-dsc.git
+cd vagrant-dsc
+bundle install
+```
+
+Run tests:
+```
+bundle exec rake spec
+```
+
+Run Vagrant in context of current vagrant-dsc plugin:
+```
+cd <directory>
+bundle exec vagrant up
+```
+
+There is a test Vagrant DSC setup in `./development` that is a good example of a simple acceptance test.
+
+### Multiple Bundlers?
+
+If you have multiple Bundler versions, you can still use 1.12.5 with the following:
+
+```
+bundle _1.12.5_ <command>
+```
+
+e.g. `bundle _1.12.5_ exec rake spec`
+
+## Uninstallation
 
 ```vagrant plugin uninstall vagrant-windows-domain```
 

data/lib/vagrant-windows-domain/action/leave_domain.rb

@@ -45,16 +45,20 @@ module VagrantPlugins
        	  if [:not_created].include? @machine.state.id
        	    @logger.debug("Machine not created, nothing to do")
        	  elsif [:running].include? @machine.state.id
-       	    answer = @machine.env.ui.ask("Are you sure you want to destroy this machine and disconnect from #{@config.domain}? (y/n)")
-            return unless answer.downcase == 'y' # Bail out of destroy and prevent middleware from continuing on
+            if !(env[:force_confirm_box_remove] || env[:force_confirm_destroy])
+       	      answer = @machine.env.ui.ask("Are you sure you want to destroy this machine and disconnect from #{@config.domain}? (y/n)")
+              return unless answer.downcase == 'y' # Bail out of destroy and prevent middleware from continuing on
+            end 
 
-env[:force_confirm_destroy] = true # Prevent the popup dialog again
-@logger.debug("Valid configuration detected, triggering leave domain action")
-@provisioner.destroy
+            env[:force_confirm_destroy] = true # Prevent the popup dialog again
+            @logger.debug("Valid configuration detected, triggering leave domain action")
+            @provisioner.destroy
        	  else
        	    @machine.env.ui.say(:warn, "Machine is currently not running. To properly leave the #{@config.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")
-       	    answer = @machine.env.ui.ask("Would you like to continue destroying this machine, leaving this machine orphaned in the '#{@config.domain}' network? If so, type 'destroy'")
-       	    return unless answer.downcase == 'destroy' # Bail out of destroy and prevent middleware from continuing on
+            if !(env[:force_confirm_box_remove] || env[:force_confirm_destroy])
+       	      answer = @machine.env.ui.ask("Would you like to continue destroying this machine, leaving this machine orphaned in the '#{@config.domain}' network? If so, type 'destroy'")
+       	      return unless answer.downcase == 'destroy' # Bail out of destroy and prevent middleware from continuing on
+            end 
 
        	    # OK, we're being naughty and letting the rest of the middleware do their things (i.e. destroy the machine, and such)
 

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

@@ -45,6 +45,9 @@ module VagrantPlugins
       # When this option is used username/password are not required
       attr_accessor :unsecure
 
+      # The trigger whether plugin should rename the computer or omit the renaming
+      attr_accessor :rename
+
       def initialize
         super
         @domain            = UNSET_VALUE
@@ -54,6 +57,7 @@ module VagrantPlugins
         @join_options      = {}
         @ou_path           = UNSET_VALUE
         @unsecure          = UNSET_VALUE
+        @rename            = UNSET_VALUE
         @logger            = Log4r::Logger.new("vagrant::vagrant_windows_domain")
       end
 
@@ -72,6 +76,7 @@ module VagrantPlugins
         @join_options      = [] if @join_options == UNSET_VALUE
         @ou_path           = nil if @ou_path == UNSET_VALUE
         @unsecure          = false if @unsecure == UNSET_VALUE
+        @rename            = true if @rename == UNSET_VALUE
       end
 
       # Validate configuration and return a hash of errors.

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

@@ -47,22 +47,68 @@ module VagrantPlugins
         raise WindowsDomainError, :unsupported_platform if !windows?
       end
 
+
+      def is_part_of_domain(computer_name, domain)
+        command = <<-EOH
+          function Test-PartOfDomain($computerName, $domain){
+            $computerSystem = gwmi win32_computersystem
+            $partofDomain = ($computerSystem.Name -eq $computerName) -and ($computerSystem.PartOfDomain) -and ($computerSystem.Domain -eq $domain) 
+
+            if ($partofDomain) {
+              exit 0
+            } else {
+              exit 1
+            }
+          }
+          Test-PartOfDomain -computerName '#{computer_name}' -domain '#{domain}'
+        EOH
+        @machine.communicate.test(command, sudo: true)
+      end
+
+      def is_joined_to_domain()
+        command = <<-EOH
+          function Test-JoinedToADomain(){
+            $computerSystem = gwmi win32_computersystem
+            $partOfDomain = $computerSystem.PartOfDomain
+            if ($partofDomain) {
+              exit 0
+            } else {
+              exit 1
+            }
+          }
+          Test-JoinedToADomain
+        EOH
+        @machine.communicate.test(command, sudo: true)
+      end
+
+
       # Run the Provisioner!
       def provision
         verify_guest_capability
 
         @old_computer_name = get_guest_computer_name(machine)
-        
-        @machine.env.ui.say(:info, "Connecting guest machine to domain '#{config.domain}' with computer name '#{config.computer_name}'")
 
-        set_credentials
+        result = is_part_of_domain(config.computer_name, config.domain)
+
+        if result
+          @machine.env.ui.say(:info, "Guest machine with computer name '#{config.computer_name}' is already a member of domain '#{config.domain}'")
+        else
+          @machine.env.ui.say(:info, "Connecting guest machine to domain '#{config.domain}' with computer name '#{config.computer_name}'")
+
+          set_credentials
 
-        result = join_domain
+          result = join_domain
 
-        remove_command_runner_script
+          remove_command_runner_script
 
-        if result
-          restart_guest
+          if result
+            #Often requires 2 reboots to ensure that all AD stuff has been applied
+            @logger.debug("Need to reboot to join the domain correctly - 1st reboot")
+            restart_guest
+
+            @logger.debug("Need to reboot to join the domain correctly - 2nd reboot")
+            restart_guest
+          end
         end
       end
 
@@ -89,6 +135,8 @@ module VagrantPlugins
         if (config.username == nil)
           @logger.info("==> Requesting username as none provided")
           config.username = @machine.env.ui.ask("Please enter your domain username: ")
+        else
+          @logger.info("==> Using domain username: #{config.username}")
         end
 
         if (config.password == nil)
@@ -104,9 +152,13 @@ module VagrantPlugins
       # to be cleaned up.
       def destroy
         if @config && @config.domain != nil
-          set_credentials
-          if leave_domain
-            restart_guest
+          if is_joined_to_domain()
+            set_credentials
+            result = leave_domain
+            if result
+              @logger.debug("Need to reboot to leave the domain correctly")
+              restart_guest
+            end
           end
         else
           @logger.debug("Not leaving domain on `destroy` action - no valid configuration detected")
@@ -119,10 +171,13 @@ module VagrantPlugins
         @machine.env.ui.say(:info, "Restarting computer for updates to take effect.")
         options = {}
         options[:provision_ignore_sentinel] = false
+        options[:lock] = false
         @machine.action(:reload, options)
-        begin
-          sleep @restart_sleep_duration
-        end until @machine.communicate.ready?
+        Timeout.timeout(@machine.config.vm.boot_timeout) do
+          begin
+            sleep @restart_sleep_duration
+          end until @machine.communicate.ready?
+        end
       end
 
       # Verify that we can call the remote operations.
@@ -149,17 +204,36 @@ module VagrantPlugins
       def generate_command_runner_script(add_to_domain=true)
         path = File.expand_path("../templates/runner.ps1", __FILE__)
 
+        if @config.computer_name != nil && @old_computer_name != nil && @config.computer_name.casecmp(@old_computer_name) != 0
+          @config.rename = true
+        end
+        
         Vagrant::Util::TemplateRenderer.render(path, options: {
             config: @config,
             username: @config.username,
             password: @config.password,
             domain: @config.domain,
+            computer_name: @config.computer_name,
+            ou_path: @config.ou_path,
             add_to_domain: add_to_domain,
             unsecure: @config.unsecure,
+            rename: @config.rename,
             parameters: generate_command_arguments(add_to_domain)
+        }, options_rename: {
+            parameters: generate_command_arguments_rename
         })
       end
 
+      # Generates the argument list for rename 
+      def generate_command_arguments_rename
+
+        params = {"-NewName" => @config.computer_name}
+        params["-DomainCredential $credentials"] = nil
+        join_params = @config.join_options.map { |a| "#{a}" }.join(',')
+        params.map { |k,v| "#{k}" + (!v.nil? ? " #{v}": '') }.join(' ') + join_params
+        
+      end
+      
       # Generates the argument list
       def generate_command_arguments(add_to_domain=true)
 
@@ -179,6 +253,12 @@ module VagrantPlugins
           if @config.ou_path
             params["-OUPath"] = "'#{@config.ou_path}'"
           end
+
+          # Remove with unsecure
+          join_params = @config.join_options.map { |a| "#{a}" }.join(',')
+          if join_params.to_s != ''
+            params["-Options"] = join_params
+          end
         else
           params = {}
           if !@config.unsecure
@@ -186,10 +266,7 @@ module VagrantPlugins
           end
         end
 
-        # Remove with unsecure
-        join_params = @config.join_options.map { |a| "#{a}" }.join(',')
-        params.map { |k,v| "#{k}" + (!v.nil? ? " #{v}": '') }.join(' ') + join_params
-        
+        params.map { |k,v| "#{k}" + (!v.nil? ? " #{v}": '') }.join(' ')
       end
 
       # Writes the PowerShell runner script to a location on the guest.

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

@@ -1,9 +1,78 @@
+function Test-PartOfDomain($computerName, $domain){
+	$computerSystem = gwmi win32_computersystem
+	return ($computerSystem.Name -eq $computerName) -and ($computerSystem.PartOfDomain) -and ($computerSystem.Domain -eq $domain) 
+}
+
+function Test-JoinedToADomain(){
+	$computerSystem = gwmi win32_computersystem
+	return $computerSystem.PartOfDomain
+}
+
+function Repair-OpenSSHPasswd(){
+	$passwdPath = 'C:\Program Files\OpenSSH\etc\passwd'
+	$mkpasswdPath = 'C:\Program Files\OpenSSH\bin\mkpasswd.exe'
+	if ((Test-Path $passwdPath) -and (Test-Path $mkpasswdPath)){
+		$passwd = &$mkpasswdPath
+		$passwd = $passwd -replace '^([^+]*\+)', ''
+		$passwd | Set-Content $passwdPath -Encoding Ascii
+	}
+}
+
+$computerName='<%= options[:computer_name] %>'
 <% if options[:username] != nil && options[:unsecure] != true %>
-$secpasswd = ConvertTo-SecureString "<%= options[:password] %>" -AsPlainText -Force
-$credentials = New-Object System.Management.Automation.PSCredential ("<%= options[:username] %>", $secpasswd)
+$domain='<%= options[:domain] %>'
+$username='<%= options[:username] %>'
+$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 %>
-Add-Computer <%= options[:parameters] %> -Verbose -Force
+if (Test-PartOfDomain -computerName $computerName -domain $domain){
+	throw "$computerName already part of domain $domain"
+} else {
+	Add-Computer <%= options[:parameters] %> -Verbose -Force -PassThru
+	
+	# Rename computer separately: Fixes GH issue #11
+	<% if options[:rename] === true %>
+	$completed = $false
+	while ( -not $completed) {
+		try {
+			Rename-Computer <%= options_rename[:parameters] %> -Verbose -Force -ErrorAction Stop
+			$completed = $true
+		} catch {
+			if ($retrycount -ge 5) {
+				Write-Host ("Rename failed the maximum number of $retrycount times.")
+				throw
+			} else {
+				Write-Host ("Rename failed, Retrying in 5 seconds...")
+				Start-sleep -s 5
+				$retrycount++
+			}
+		}
+	}
+	<% 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 %>
-Remove-Computer <%= options[:parameters] %> -Workgroup "WORKGROUP" -Verbose -Force
-<% end %>
+if (!(Test-JoinedToADomain)) {
+	Throw "$computerName not part of any domain"
+} else {
+	Remove-Computer <%= options[:parameters] %> -Workgroup 'WORKGROUP' -Verbose -Force -PassThru
+	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
+}
+<% end %>

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

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

data/spec/provisioner/leave_domain_spec.rb

@@ -21,7 +21,7 @@ describe VagrantPlugins::WindowsDomain::LeaveDomain do
   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(: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") }

data/spec/provisioner/provisioner_spec.rb

@@ -73,10 +73,12 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
     it "should join the domain" do
       allow(communicator).to receive(:upload)
       allow(ui).to receive(:info)
+      expect(communicator).to receive(:test)
+      expect(vm).to receive(:boot_timeout).twice
       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})
-      expect(communicator).to receive(:ready?).and_return(true)
+      expect(machine).to receive(:action).with(:reload, {:provision_ignore_sentinel=>false, :lock=>false}).twice
+      expect(communicator).to receive(:ready?).and_return(true).twice
       subject.restart_sleep_duration = 0
       subject.provision
       expect(subject.old_computer_name).to eq("myoldcomputername")
@@ -85,21 +87,25 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
     it "should restart the machine on a successful domain join" do
       allow(communicator).to receive(:upload)
       allow(ui).to receive(:info)
+      expect(communicator).to receive(:test)
+      expect(vm).to receive(:boot_timeout).twice
       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})
-      expect(communicator).to receive(:ready?).and_return(true)
+      expect(machine).to receive(:action). with(:reload, {:provision_ignore_sentinel=>false, :lock=>false}).twice
+      expect(communicator).to receive(:ready?).and_return(true).twice
       subject.restart_sleep_duration = 0
       subject.provision
     end
 
     it "should not restart the machine on a failed domain join attempt" do
       allow(communicator).to receive(:upload)
+      expect(communicator).to receive(:test)
+      expect(vm).to_not receive(:boot_timeout)
       allow(ui).to receive(:info).with("some exception thrown!", {:color=>:red, :new_line=>false, :prefix=>false}) # Red output on error please!
       allow(ui).to receive(:info).with("\"Running Windows Domain Provisioner\"")
       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(:stderr, "some exception thrown!")
       expect(communicator).to receive(:sudo).with("del c:/tmp/vagrant-windows-domain-runner.ps1")
-      expect(machine).to_not receive(:action). with(:reload, {:provision_ignore_sentinel=>false})
+      expect(machine).to_not receive(:action). with(:reload, {:provision_ignore_sentinel=>false, :lock=>false})
       subject.restart_sleep_duration = 0
       subject.provision
     end
@@ -150,18 +156,24 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
 
   describe "cleanup" do
     before do
+      allow(machine).to receive(:root_config).and_return(root_config)
+      machine.stub(config: root_config, env: env, id: "1234")
+      allow(ui).to receive(:say).with(any_args)
+      allow(machine).to receive(:communicate).and_return(communicator)
       allow(communicator).to receive(:shell).and_return(shell)
-      allow(shell).to receive(:powershell).and_yield(:stdout, "myoldcomputername")
-      config = double(config)
-      allow(machine).to receive(:config).and_return(config)
-      allow(config).to receive(:windows_domain).and_return(root_config)
-      allow(machine).to receive(:env).and_return(env)
+      allow(shell).to receive(:powershell).with("$env:COMPUTERNAME").and_yield(:stdout, "myoldcomputername")
+      allow(root_config).to receive(:vm).and_return(vm)
+      allow(vm).to receive(:communicator).and_return(:winrm)
+      allow(communicator).to receive(:sudo).with("which Add-Computer", {:error_class=>VagrantPlugins::WindowsDomain::WindowsDomainError, :error_key=>:binary_not_detected, :domain=>"foo.com", :binary=>"Add-Computer"})
+      allow(communicator).to receive(:sudo).with("which Remove-Computer", {:error_class=>VagrantPlugins::WindowsDomain::WindowsDomainError, :error_key=>:binary_not_detected, :domain=>"foo.com", :binary=>"Remove-Computer"})
 
       root_config.domain = "foo.com"
       root_config.username = "username"
       root_config.password = "password"
+
       root_config.finalize!
       root_config.validate(machine)
+      subject.configure(root_config)
     end
 
     it "should leave domain" do
@@ -177,13 +189,14 @@ 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})
+      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)
@@ -207,13 +220,15 @@ 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})
+      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
 
@@ -221,82 +236,4 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
     end
 
   end
-
-  describe "Powershell runner script" do
-    before do
-      allow(machine).to receive(:root_config).and_return(root_config)
-      machine.stub(config: root_config, env: env, id: "1234")
-      allow(ui).to receive(:say).with(any_args)
-      allow(machine).to receive(:communicate).and_return(communicator)
-      allow(communicator).to receive(:shell).and_return(shell)
-      allow(shell).to receive(:powershell).with("$env:COMPUTERNAME").and_yield(:stdout, "myoldcomputername")
-      allow(root_config).to receive(:vm).and_return(vm)
-      allow(vm).to receive(:communicator).and_return(:winrm)
-      root_config.domain = "foo.com"
-      root_config.username = "username"
-      root_config.password = "password"
-      root_config.finalize!
-      root_config.validate(machine)
-    end
-
-    context "with credentials provided" do
-
-      it "should generate a valid powershell command to add the computer to a domain" do
-        script = subject.generate_command_runner_script
-        expect_script = 
-%Q{$secpasswd = ConvertTo-SecureString "password" -AsPlainText -Force
-$credentials = New-Object System.Management.Automation.PSCredential ("username", $secpasswd)
-Add-Computer -DomainName foo.com -Credential $credentials -Verbose -Force
-}
-        expect(script).to eq(expect_script)
-      end
-
-      it "should generate a valid powershell command to remove the computer from a domain" do
-        script = subject.generate_command_runner_script(false)
-        expect_script = 
-%Q{$secpasswd = ConvertTo-SecureString "password" -AsPlainText -Force
-$credentials = New-Object System.Management.Automation.PSCredential ("username", $secpasswd)
-Remove-Computer -UnjoinDomainCredential $credentials -Workgroup "WORKGROUP" -Verbose -Force
-}
-        expect(script).to eq(expect_script)
-      end
-
-      context "with join options" do
-        it "should rename the computer on join" do
-          
-          root_config.computer_name = "mynewcomputername"
-          root_config.ou_path = "OU=testOU,DC=domain,DC=Domain,DC=com"
-          root_config.finalize!
-          root_config.validate(machine)
-
-          script = subject.generate_command_runner_script
-          expect_script = 
-%Q{$secpasswd = ConvertTo-SecureString "password" -AsPlainText -Force
-$credentials = New-Object System.Management.Automation.PSCredential ("username", $secpasswd)
-Add-Computer -DomainName foo.com -Credential $credentials -NewName 'mynewcomputername' -OUPath 'OU=testOU,DC=domain,DC=Domain,DC=com' -Verbose -Force
-}
-          expect(script).to eq(expect_script)
-        end
-      end
-    end
-
-    context "with 'unsecure' parameter provided" do
-      before do
-        root_config.unsecure = true
-      end
-
-      it "should generate a valid powershell command to add the computer to a domain" do
-        script = subject.generate_command_runner_script.strip
-        expect_script = "Add-Computer -DomainName foo.com -Unsecure -Verbose -Force"
-        expect(script).to eq(expect_script)
-      end
-
-      it "should generate a valid powershell command to remove the computer from a domain" do
-        script = subject.generate_command_runner_script(false).strip
-        expect_script = "Remove-Computer  -Workgroup \"WORKGROUP\" -Verbose -Force"
-        expect(script).to eq(expect_script)
-      end
-    end
-
-  end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'vagrant-windows-domain/plugin'
 require 'rspec/its'
 require 'base'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatters = [
     SimpleCov::Formatter::HTMLFormatter,
     Coveralls::SimpleCov::Formatter
 ]
@@ -18,7 +18,7 @@ end
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
-    c.syntax = :expect
+    c.syntax = [:should, :expect]
   end
   config.color = true
   config.tty = true

data/vagrant-windows-domain.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rake", '~> 10.3', '>= 10.3.0'
-  spec.add_development_dependency "bundler", "~> 1.6", '>= 1.6.0'
-  spec.add_development_dependency "coveralls", "~> 0.7.1", '>= 0.7.1'
-  spec.add_development_dependency "rspec-core", '~> 3.1', '>= 3.1.0'
-  spec.add_development_dependency "rspec-expectations", '~> 3.1', '>= 3.1.0'
-  spec.add_development_dependency "rspec-mocks", '~> 3.1', '>= 3.1.0'
-  spec.add_development_dependency "rspec-its", "~> 1.0.1", '>= 1.0.0'
+  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'
 end

metadata

@@ -1,155 +1,149 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-domain
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.2.0
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - '>='
+        version: 1.5.2
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.12.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - '>='
+        version: 1.5.2
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.12.5
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
-    - - '>='
+        version: 0.8.10
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
-    - - '>='
+        version: 0.8.10
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.10
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - '>='
+        version: 3.4.2
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - '>='
+        version: 3.4.2
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - '>='
+        version: 3.4.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - '>='
+        version: 3.4.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - '>='
+        version: 3.4.1
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - '>='
+        version: 3.4.1
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - '>='
+        version: 1.2.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - '>='
+        version: 1.2.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 description: Adds and Removes Windows Guests from a Windows Domain, as part of the
   standard machine lifecycle.
 email:
@@ -158,8 +152,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -189,17 +183,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Windows Domain Provisioner for Vagrant