vagrant-windows-domain 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42f3d186357fa789c5cfe433c9dcb260b30f0d1e
-  data.tar.gz: a0d0b75ed02779afc0c96fc7dd21c5fdcde19cd3
+  metadata.gz: ce86949685fe8c228f0bf2ecb5b5284f6fd85eac
+  data.tar.gz: da22799eb1a74e416c9c32178fca198256c5757b
 SHA512:
-  metadata.gz: 0177c73b416054d338634b3abda33249f5c652eee85fbfc365b86d9039421afca652f603e3a0d6d30b89b16116e3ec974dea67c57f53407ecdd9eed3474065db
-  data.tar.gz: 1cd8a084046bc000aee30493c8c28e115810eb64cba17e698c9b6540c7555fcf9ccb3e3b24af5876d2ace64b957495fa60bc713b09eb9859ca6297b1eba4d02c
+  metadata.gz: 05d2351ac7ae90cc26c49106ee8a0374d29cf8bd8341b5fb2fabdfaa59d6ebd408d93b0439bd839a58563a5694c4bec8a87a737aebe735c828011184069dea1a
+  data.tar.gz: 7b7299f283728ca184295b3c1c80532db8a309fff96c6a7867c32869bab22b8631814f7230ed52676a5a54cf97b220b44f9e5ad08b87292382bf967fef25bd02

data/development/Vagrantfile

@@ -10,11 +10,15 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  config.vm.box = "windows2012r2"
+  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
 
+  config.vm.provider "virtualbox" do |v| 
+    v.gui = true 
+  end
+
   # Run Windows Domain Provisioner
   config.vm.provision :windows_domain do |domain|
 

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

@@ -0,0 +1,23 @@
+require_relative '../provisioner'
+require 'pp'
+
+module VagrantPlugins
+  module WindowsDomain
+    class LeaveDomain
+      include VagrantPlugins::WindowsDomain
+
+      def initialize(app, env)
+        @app = app
+        @machine = env[:machine]
+        @config = env[:machine].config.windows_domain
+        @provisioner = VagrantPlugins::WindowsDomain::Provisioner.new(@machine, @config)
+      end
+
+      def call(env)
+        @provisioner.destroy
+        @app.call(env)
+      end
+
+    end
+  end
+end

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

@@ -13,11 +13,21 @@ module VagrantPlugins
         require_relative 'config'
         Config
       end
+      
+      config(:windows_domain) do
+        require_relative 'config'
+        Config
+      end
 
       provisioner(:windows_domain) do
         require_relative 'provisioner'
         Provisioner
       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

@@ -102,7 +102,7 @@ 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 cleanup        
+      def destroy
         set_credentials
         leave_domain
       end
@@ -155,9 +155,9 @@ module VagrantPlugins
 
       # Generates the argument list
       def generate_command_arguments(add_to_domain=true)
-        params = {"-DomainName" => @config.domain }
 
         if add_to_domain
+          params = {"-DomainName" => @config.domain }
 
           if @config.unsecure
             params["-Unsecure"] = nil
@@ -173,6 +173,7 @@ module VagrantPlugins
             params["-OUPath"] = "'#{@config.ou_path}'"
           end
         else
+          params = {}
           if !@config.unsecure
             params["-UnjoinDomainCredential $credentials"] = nil
           end
@@ -237,7 +238,7 @@ module VagrantPlugins
           end
         end
 
-        result
+        result == 0
       end
 
       # Gets the Computer Name from the guest machine

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

@@ -5,5 +5,5 @@ $credentials = New-Object System.Management.Automation.PSCredential ("<%= option
 <% if options[:add_to_domain] === true %>
 Add-Computer <%= options[:parameters] %> -Verbose -Force
 <% else %>
-Remove-Computer <%= options[:parameters] %> -Verbose -Force
+Remove-Computer <%= options[:parameters] %> -Workgroup "WORKGROUP" -Verbose -Force
 <% end %>

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

@@ -1,5 +1,5 @@
 module Vagrant
   module WindowsDomain
-    VERSION = "1.1.1"
+    VERSION = "1.1.3"
   end
 end

data/spec/provisioner/provisioner_spec.rb

@@ -73,7 +73,7 @@ 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(: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(". 'c:/tmp/vagrant-windows-domain-runner.ps1'", {:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_return(0)
       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)
@@ -85,7 +85,7 @@ 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(: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(". 'c:/tmp/vagrant-windows-domain-runner.ps1'", {:elevated=>true, :error_key=>:ssh_bad_exit_status_muted, :good_exit=>0, :shell=>:powershell}).and_return(0)
       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)
@@ -156,7 +156,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
     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(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(0)
       expect(ui).to receive(:info).with(any_args).once
       
       result = subject.leave_domain
@@ -169,7 +169,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       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
+      subject.destroy
     end
 
     it "should ask for credentials when leaving domain when no credentials were provided" do
@@ -183,7 +183,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       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
+      subject.destroy
     end
 
   end
@@ -222,7 +222,7 @@ Add-Computer -DomainName foo.com -Credential $credentials -Verbose -Force
         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
+Remove-Computer -UnjoinDomainCredential $credentials -Workgroup "WORKGROUP" -Verbose -Force
 }
         expect(script).to eq(expect_script)
       end
@@ -259,7 +259,7 @@ Add-Computer -DomainName foo.com -Credential $credentials -NewName 'mynewcompute
 
       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 = "Remove-Computer  -Workgroup \"WORKGROUP\" -Verbose -Force"
         expect(script).to eq(expect_script)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-domain
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -166,6 +166,7 @@ files:
 - Rakefile
 - development/Vagrantfile
 - lib/vagrant-windows-domain.rb
+- lib/vagrant-windows-domain/action/leave_domain.rb
 - lib/vagrant-windows-domain/config.rb
 - lib/vagrant-windows-domain/locales/en.yml
 - lib/vagrant-windows-domain/plugin.rb