vagrant-windows-domain 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32c0962897914ab1f2665b2ee83e436403d1c7d6
-  data.tar.gz: 6b9f71576ad54801a1325ed828d8a04b614e186b
+  metadata.gz: 7a229ad007dcbe70866e50934f61fa5f64f43604
+  data.tar.gz: 9f8d84d07974fd3477df0668f6e33f917210c53f
 SHA512:
-  metadata.gz: a2a5bba2574096eb6dd50802d44f87b1a20e94caee7f9191dfa686cef067c16b86ca4953c97d40e3203373eed09d5eaec89d28b77a4df6ca6a5f2af473dec6b7
-  data.tar.gz: a15ef170cca8c7b9d8424d1e35d71d8447c3e49567fe9b74c36b6e69e31a99e7146f72dbcd9ac99679efc327a5dc19a824d4ec700e72f3c5ed6f24ef8d66f668
+  metadata.gz: 855602d71f7b086551907ebb97a4a4ea48ccea97838983a9c76cc8956cad4c76fbb6ce783c51cbbc629ea66275f7ae3b960615a50f29e2069af9eee3f1a36531
+  data.tar.gz: 9b694ca5053521836793f9a888ca25077a5c3f42c054c763a18ce929def348cbe9518cebda8f613f4292512b5f8acc4068acb80b60a32eeb0ebc67dabe52fa70

data/README.md

@@ -30,7 +30,7 @@ config.vm.provision :windows_domain do |domain|
     #
     # Uses the Rename-Computer PowerShell command. ORRRR -NewName flag??
     # Specifies a new name for the computer in the new domain.
-    domain.computer_name "myfandangledname"
+    domain.computer_name = "myfandangledname"
 
     # The Username to use when authenticating against the Domain.
     #
@@ -50,7 +50,7 @@ config.vm.provision :windows_domain do |domain|
     # 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.
-    domain.join_options = { "--JoinReadOnly" => "" }
+    domain.join_options = [ "JoinReadOnly" ]
 
     # Organisational Unit path in AD.
     #

data/development/Vagrantfile

@@ -9,8 +9,8 @@ SCRIPT
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  
-  config.vm.box = "mfellows/windows2012r2"
+
+  config.vm.box = "windows2012r2"
   config.vm.guest = :windows
   config.vm.communicator = "winrm"
   config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
@@ -27,7 +27,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     #
     # Uses the Rename-Computer PowerShell command. ORRRR -NewName flag??
     # Specifies a new name for the computer in the new domain.
-    domain.computer_name "myfandangledname"
+    domain.computer_name = "myfandangledname"
 
     # The Username to use when authenticating against the Domain.
     #
@@ -40,23 +40,23 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # join the computers to a new domain. 
     domain.password = "iprobablyshouldntusethisfield"
 
-    # The set of Advanced options to pass when joining the Domain.
+    # An array of advanced options to pass when joining the Domain.
     #
     # See (https://technet.microsoft.com/en-us/library/hh849798.aspx) for detail.
     # NOTE: If we user :computer_name from above this needs to be merged!!
-    domain.join_options
+    # domain.join_options = ['Win9xUpgrade']
 
     # Organisational Unit path in AD.
     #
     # Specifies an organizational unit (OU) for the domain account. 
     # Enter the full distinguished name of the OU in quotation marks. 
     # The default value is the default OU for machine objects in the domain.
-    domain.ou_path
+    # domain.ou_path = nil
 
     # Performs an unsecure join to the specified domain.
     #
     # When this option is used username/password are not required
-    domain.unsecure
+    domain.unsecure = false
   end
 
   # Confirm that this will run after the reload from the domain provisioner!

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

@@ -13,9 +13,7 @@ module VagrantPlugins
       attr_accessor :domain
 
       # The new Computer Name to use when joining the domain.
-      #
-      # Uses the Rename-Computer PowerShell command. ORRRR -NewName flag??
-      # Specifies a new name for the computer in the new domain.
+      # Specifies a new name for the computer in the new domain. Uses the -NameName Option.
       attr_accessor :computer_name
 
       # The Username to use when authenticating against the Domain.
@@ -47,12 +45,6 @@ module VagrantPlugins
       # When this option is used username/password are not required
       attr_accessor :unsecure
 
-      # The current Computer Name.
-      #
-      # Used to determine whether or not we need to rename the computer 
-      # on join. This parameter should not be manually set.
-      attr_accessor :old_computer_name      
-
       def initialize
         super
         @domain            = UNSET_VALUE
@@ -77,7 +69,7 @@ module VagrantPlugins
         @computer_name     = nil if @computer_name == UNSET_VALUE || @computer_name == ""
         @username          = nil if @username == UNSET_VALUE || @username == ""
         @password          = nil if @password == UNSET_VALUE || @password == ""
-        @join_options      = {} if @join_options == UNSET_VALUE
+        @join_options      = [] if @join_options == UNSET_VALUE
         @ou_path           = nil if @ou_path == UNSET_VALUE
         @unsecure          = false if @unsecure == UNSET_VALUE
       end
@@ -88,9 +80,7 @@ module VagrantPlugins
       #
       # @param [Machine] The current {Machine}
       # @return [Hash] Any errors or {} if no errors found
-      def validate(machine)
-        @old_computer_name = get_guest_computer_name(machine)
-        
+      def validate(machine)        
         errors = _detected_errors
 
         # Need to supply one of them!
@@ -99,23 +89,7 @@ module VagrantPlugins
         end
         
         { "windows domain provisioner" => errors }
-      end
-
-      # Gets the Computer Name from the guest machine
-      def get_guest_computer_name(machine)
-        computerName = ""
-        machine.communicate.shell.powershell("$env:COMPUTERNAME") do |type, data|
-          if !data.chomp.empty?
-            if [:stderr, :stdout].include?(type)
-              color = type == :stdout ? :green : :red
-              computerName = data.chomp
-              @logger.info("Detected guest computer name: #{computerName}")
-            end
-          end
-        end
-
-        computerName
-      end      
+      end     
     end
   end
 end

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

@@ -19,6 +19,14 @@ module VagrantPlugins
 
       # Default path for storing the transient script runner
       WINDOWS_DOMAIN_GUEST_RUNNER_PATH = "c:/tmp/vagrant-windows-domain-runner.ps1"
+      
+      attr_accessor :restart_sleep_duration        
+
+      # The current Computer Name.
+      #
+      # Used to determine whether or not we need to rename the computer 
+      # on join. This parameter should not be manually set.
+      attr_accessor :old_computer_name      
 
       # Constructs the Provisioner Plugin.
       #
@@ -29,6 +37,7 @@ module VagrantPlugins
         super
 
         @logger = Log4r::Logger.new("vagrant::provisioners::vagrant_windows_domain")
+        @restart_sleep_duration = 10
       end
 
       # Configures the Provisioner.
@@ -42,13 +51,19 @@ module VagrantPlugins
 
       # Run the Provisioner!
       def provision
+        @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
 
-        join_domain
+        result = join_domain
 
-        restart_guest
+        remove_command_runner_script
+
+        if result
+          restart_guest
+        end
       end
 
       # Join the guest machine to a Windows Domain.
@@ -90,7 +105,6 @@ module VagrantPlugins
       def cleanup        
         set_credentials
         leave_domain
-
       end
 
       # Restarts the Computer and waits
@@ -100,7 +114,7 @@ module VagrantPlugins
         options[:provision_ignore_sentinel] = false
         @machine.action(:reload, options)
         begin
-          sleep 10
+          sleep @restart_sleep_duration
         end until @machine.communicate.ready?
       end
 
@@ -133,11 +147,43 @@ module VagrantPlugins
             username: @config.username,
             password: @config.password,
             domain: @config.domain,
-            add_to_domain: add_to_domain
-            # parameters: @config.join_options.map { |k,v| "#{k}" + (!v.nil? ? " \"#{v}\"": '') }.join(" ")
+            add_to_domain: add_to_domain,
+            unsecure: @config.unsecure,
+            parameters: generate_command_arguments(add_to_domain)
         })
       end
 
+      # Generates the argument list
+      def generate_command_arguments(add_to_domain=true)
+        params = {"-DomainName" => @config.domain }
+
+        if add_to_domain
+
+          if @config.unsecure
+            params["-Unsecure"] = nil
+          else
+            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
+        else
+          if !@config.unsecure
+            params["-UnjoinDomainCredential $credentials"] = nil
+          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
+        
+      end
+
       # Writes the PowerShell runner script to a location on the guest.
       #
       # @param [String] script The PowerShell runner script.
@@ -157,7 +203,16 @@ module VagrantPlugins
         guest_script_path
       end
 
+      # Remove temporary run script as it may contain
+      # sensitive plain-text credentials.
+      def remove_command_runner_script
+        @machine.communicate.sudo("del #{WINDOWS_DOMAIN_GUEST_RUNNER_PATH}")
+      end
+
       # Runs the PowerShell script on the guest machine.
+      #
+      # Streams the output of the command to the UI
+      # @return [boolean] The result of the remote command
       def run_remote_command_runner(script_path)
         command = ". '#{script_path}'"
 
@@ -171,20 +226,39 @@ module VagrantPlugins
           shell: :powershell
         }
 
-        @machine.communicate.sudo(command, opts) do |type, data|
+        result = @machine.communicate.sudo(command, opts) do |type, data|
           if !data.chomp.empty?
             if [:stderr, :stdout].include?(type)
               color = type == :stdout ? :green : :red
               @machine.ui.info(
                 data.chomp,
-                color: color, new_line: false, prefix: false)
+                color: color, new_line: false, prefix: false)              
             end
           end
         end
+
+        result
       end
 
-      # If on using WinRM, we can assume we are on Windows
+      # Gets the Computer Name from the guest machine
+      def get_guest_computer_name(machine)
+        computerName = ""
+        machine.communicate.shell.powershell("$env:COMPUTERNAME") do |type, data|
+          if !data.chomp.empty?
+            if [:stderr, :stdout].include?(type)
+              color = type == :stdout ? :green : :red
+              computerName = data.chomp
+              @logger.info("Detected guest computer name: #{computerName}")
+            end
+          end
+        end
+
+        computerName
+      end 
+
+      # Is the guest Windows?
       def windows?
+        # If using WinRM, we can assume we are on Windows
         @machine.config.vm.communicator == :winrm
       end
 

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

@@ -1,9 +1,9 @@
+<% if options[:username] != nil && options[:unsecure] != true %>
 $secpasswd = ConvertTo-SecureString "<%= options[:password] %>" -AsPlainText -Force
 $credentials = New-Object System.Management.Automation.PSCredential ("<%= options[:username] %>", $secpasswd)
-
+<% end %>
 <% if options[:add_to_domain] === true %>
-echo "Add-Computer"
-Add-Computer -DomainName <%= options[:domain] %> -Credential $credentials -Verbose -Force #-WhatIf
+Add-Computer <%= options[:parameters] %> -Verbose -Force
 <% else %>
-Remove-Computer -UnjoinDomainCredential $credentials -Verbose -Force
+Remove-Computer <%= options[:parameters] %> -Verbose -Force
 <% end %>

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

@@ -1,5 +1,5 @@
 module Vagrant
   module WindowsDomain
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/spec/provisioner/config_spec.rb

@@ -77,11 +77,6 @@ describe VagrantPlugins::WindowsDomain::Config do
       assert_error("You must not supply a \"username\" and \"password\" if \"unsecure\" is set to true.")
     end
 
-    it "should detect the current computers' name" do
-      subject.validate(machine)
-      expect(subject.old_computer_name).to eq("myoldcomputername")
-    end
-
   end
 
 end

data/spec/provisioner/provisioner_spec.rb

@@ -7,7 +7,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
   include_context "unit"
 
   let(:root_path)           { (Pathname.new(Dir.mktmpdir)).to_s }
-  let(:ui)                  { Vagrant::UI::Silent.new }
+  let(:ui)                  { double("ui") }
   let(:machine)             { double("machine", ui: ui) }
   let(:env)                 { double("environment", root_path: root_path, ui: ui) }
   let(:vm)                  { double ("vm") }
@@ -24,10 +24,10 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
     before do
       allow(machine).to receive(:root_config).and_return(root_config)
       machine.stub(config: root_config, env: env)
-
+      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(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.finalize!
@@ -50,148 +50,226 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       expect(communicator).to receive(:sudo).with("which Remove-Computer", {:error_class=>VagrantPlugins::WindowsDomain::WindowsDomainError, :error_key=>:binary_not_detected, :domain=>nil, :binary=>"Remove-Computer"})
       subject.configure(root_config)
     end
+
   end
 
   describe "provision" do
 
-    # before do
-    #   # allow(root_config).to receive(:vm).and_return(vm)
-    #   allow(machine).to receive(:root_config).and_return(root_config)
-    #   allow(machine).to receive(:env).and_return(env)
-    #   root_config.finalize!
-    #   root_config.validate(machine)
-    #   subject.configure(root_config)
-    #   machine.stub(config: root_config, env: env, communicate: communicator, guest: guest)
-    # end
+    before do
+      allow(machine).to receive(:root_config).and_return(root_config)
+      machine.stub(config: root_config, env: env)
+      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)
+      expect(communicator).to receive(:sudo).with("which Add-Computer", {:error_class=>VagrantPlugins::WindowsDomain::WindowsDomainError, :error_key=>:binary_not_detected, :domain=>"foo.com", :binary=>"Add-Computer"})
+      expect(communicator).to receive(:sudo).with("which Remove-Computer", {:error_class=>VagrantPlugins::WindowsDomain::WindowsDomainError, :error_key=>:binary_not_detected, :domain=>"foo.com", :binary=>"Remove-Computer"})
 
-    it "should join the domain" do
+      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 join the domain" do
+      allow(communicator).to receive(:upload)
+      allow(ui).to receive(:info)
+      expect(communicator).to receive(:sudo).with(". 'c:/tmp/vagrant-windows-domain-runner.ps1'", {:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_return(true)
+      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)
+      subject.restart_sleep_duration = 0
+      subject.provision
+      expect(subject.old_computer_name).to eq("myoldcomputername")
     end
 
     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(:sudo).with(". 'c:/tmp/vagrant-windows-domain-runner.ps1'", {:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_return(true)
+      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)
+      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)
+      allow(ui).to receive(:info)
+      expect(communicator).to receive(:sudo).with(". 'c:/tmp/vagrant-windows-domain-runner.ps1'", {:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_return(false)
+      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})
+      subject.restart_sleep_duration = 0
+      subject.provision
     end
 
-    it "should not attempt to join the domain if already on it" do
+    context "generate_command_arguments" do
 
-    end
+      it "join with credentials if provided" do
+        args = subject.generate_command_arguments
+        puts args
+      end
+
+      it "not join with credentials if 'unsecure' option provided" do
+
+      end
 
-    it "should authenticate with credentials if provided" do
+      it "remove with credentials if provided" do
 
+      end
+
+      it "remove join with credentials if 'unsecure' option provided" do
+
+      end
+
+      it "should rename the computer if the computer name is different" do
+
+      end
+      
     end
 
     it "should prompt for credentials if not provided" do
-    
+      root_config.username = nil
+      root_config.password = nil
+      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: ")
+      subject.set_credentials
     end
 
-    it "should remove any traces of credentials once provisioning has occurred" do
+    it "should not prompt for credentials if provided" do
+      expect(ui).to_not receive(:ask)
+      subject.set_credentials
+    end
 
+    it "should remove any traces of credentials once provisioning has occurred" do
+      expect(communicator).to receive(:sudo).with("del c:/tmp/vagrant-windows-domain-runner.ps1")
+      subject.remove_command_runner_script
     end
 
   end
 
   describe "cleanup" do
+    before do
+      allow(communicator).to receive(:shell).and_return(shell)
+      allow(shell).to receive(:powershell).and_yield(:stdout, "myoldcomputername")
+    end
+
+    it "should leave domain" do
+      allow(machine).to receive(:communicate).and_return(communicator)
+      expect(communicator).to receive(:upload)
+      expect(communicator).to receive(:sudo).with(". 'c:/tmp/vagrant-windows-domain-runner.ps1'", {:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_return(true)
+      expect(ui).to receive(:info).with(any_args).once
+      
+      result = subject.leave_domain
+      expect(result).to eq(true)
+    end
 
     it "should leave domain when a `vagrant destroy` is issued" do
+      allow(machine).to receive(:communicate).and_return(communicator)
+      expect(communicator).to receive(:upload)
+      expect(communicator).to receive(:sudo).with(". 'c:/tmp/vagrant-windows-domain-runner.ps1'", {:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell})
+      expect(ui).to receive(:info).with(any_args).once
+      
+      subject.cleanup
+    end
 
+    it "should ask for credentials when leaving domain when no credentials were provided" do
+      root_config.username = nil
+      root_config.password = nil      
+      allow(machine).to receive(:communicate).and_return(communicator)
+      allow(machine).to receive(:env).and_return(env)
+      expect(communicator).to receive(:upload)
+      expect(communicator).to receive(:sudo).with(". 'c:/tmp/vagrant-windows-domain-runner.ps1'", {:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :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: ")      
+
+      subject.cleanup
     end
 
   end
 
-  # describe "Powershell runner script" do
-#     before do
-#       # Prevent counters messing with output in tests
-#       Vagrant::Util::Counter.class_eval do
-#         def get_and_update_counter(name=nil) 1 end
-#       end
-
-#       allow(machine).to receive(:root_config).and_return(root_config)
-#       root_config.configuration_file = configuration_file
-#       machine.stub(config: root_config, env: env)
-#       root_config.module_path = module_path
-#       root_config.configuration_file = configuration_file
-#       root_config.finalize!
-#       root_config.validate(machine)
-#       subject.configure(root_config)
-
-#     end
-
-#     context "with default parameters" do
-#       it "should generate a valid powershell command" do
-#         script = subject.generate_dsc_runner_script
-#         expect_script = "#
-# # DSC Runner.
-# #
-# # Bootstraps the DSC environment, sets up configuration data
-# # and runs the DSC Configuration.
-# #
-# #
-
-# # Set the local PowerShell Module environment path
-# $absoluteModulePaths = [string]::Join(\";\", (\"/tmp/vagrant-windows-domain-1/modules-0;/tmp/vagrant-windows-domain-1/modules-1\".Split(\";\") | ForEach-Object { $_ | Resolve-Path }))
-
-# echo \"Adding to path: $absoluteModulePaths\"
-# $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
-# (\"/tmp/vagrant-windows-domain-1/modules-0;/tmp/vagrant-windows-domain-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
-
-# $script = $(Join-Path \"/tmp/vagrant-windows-domain-1\" \"manifests/MyWebsite.ps1\" -Resolve)
-# echo \"PSModulePath Configured: ${env:PSModulePath}\"
-# echo \"Running Configuration file: ${script}\"
-
-# # Generate the MOF file, only if a MOF path not already provided.
-# # Import the Manifest
-# . $script
-
-# cd \"/tmp/vagrant-windows-domain-1\"
-# $StagingPath = $(Join-Path \"/tmp/vagrant-windows-domain-1\" \"staging\")
-# $response = MyWebsite -OutputPath $StagingPath  4>&1 5>&1 | Out-String
-
-# # Start a DSC Configuration run
-# $response += Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath 4>&1 5>&1 | Out-String
-# $response"
-
-#         expect(script).to eq(expect_script)
-#       end
-#     end
-
-#   end
-
-#   describe "write DSC Runner script" do
-#     it "should upload the customised DSC runner to the guest" do
-#       script = "myscript"
-#       path = "/local/runner/path"
-#       guest_path = "c:/tmp/vagrant-windows-domain-runner.ps1"
-#       machine.stub(config: root_config, env: env, communicate: communicator)
-#       file = double("file")
-#       allow(file).to receive(:path).and_return(path)
-#       allow(Tempfile).to receive(:new) { file }
-#       expect(file).to receive(:write).with(script)
-#       expect(file).to receive(:fsync)
-#       expect(file).to receive(:close).exactly(2).times
-#       expect(file).to receive(:unlink)
-#       expect(communicator).to receive(:upload).with(path, guest_path)
-#       res = subject.write_dsc_runner_script(script)
-#       expect(res.to_s).to eq(guest_path)
-#     end
-#   end
-
-#   describe "Apply DSC" do
-#     it "should invoke the DSC Runner and notify the User of provisioning status" do
-#       expect(ui).to receive(:info).with(any_args).once
-#       expect(ui).to receive(:info).with("provisioned!", {color: :green, new_line: false, prefix: false}).once
-#       allow(machine).to receive(:communicate).and_return(communicator)
-#       expect(communicator).to receive(:sudo).with('. ' + "'c:/tmp/vagrant-windows-domain-runner.ps1'",{:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_yield(:stdout, "provisioned!")
-
-#       subject.run_dsc_apply
-#     end
-
-#     it "should show error output in red" do
-#       expect(ui).to receive(:info).with(any_args).once
-#       expect(ui).to receive(:info).with("provisioned!", {color: :red, new_line: false, prefix: false}).once
-#       allow(machine).to receive(:communicate).and_return(communicator)
-#       expect(communicator).to receive(:sudo).with('. ' + "'c:/tmp/vagrant-windows-domain-runner.ps1'",{:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_yield(:stderr, "provisioned!")
-
-#       subject.run_dsc_apply
-    # 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)
+      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 -DomainName foo.com -UnjoinDomainCredential $credentials -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 -DomainName foo.com -Verbose -Force"
+        expect(script).to eq(expect_script)
+      end
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-domain
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake