vagrant-windows-domain 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5a4484f57b9b433e8299324a8cc574809763571
-  data.tar.gz: d604d562237867e5c6e6ca019b51d4e6be7b5b5e
+  metadata.gz: 5b4d4875a6881aa9302b991ca98ca530ba0c2387
+  data.tar.gz: b43d80f3309032da02801d7ca249cc4b08671743
 SHA512:
-  metadata.gz: 1c6519d627645442489e233fcf61def98cd363b53773f16d5f205ae03d071442655180317e53dd67bf8a3fd0dd78f795bac4d9fdfaef8888b4987019ca1a2031
-  data.tar.gz: 2a10e956e23facd3e314b70daf2092a7bb0ea766ec3d6587b656c497c0393b9c3a0e19cc22710c29df391242311a5f217c8f1502df857ca3ca071cf40c49d34b
+  metadata.gz: 59121ad5e5524c081892f311c7a515443fd22520c906bff36dc027e00f0bb1f01e1e9e0aa42f7c65056c286401f294fdf7375ed3bbb0fde6985c397f95b81476
+  data.tar.gz: 8646823778f6fb96f14b0425908fdadcbfb0e8cf111ca9a2ca86eb905fef9d5b321e86e792fc5f2f7ae78862befb2f0b1b9cba416de56a45f6f882789c6a123c

data/development/Vagrantfile

@@ -10,8 +10,7 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  config.vm.box = "talentsearch-api-1.0.2"
-  # config.vm.box = "mfellows/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

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

@@ -1,15 +1,32 @@
 require_relative '../provisioner'
-require 'pp'
 
 module VagrantPlugins
   module WindowsDomain
+    # Include the built-in modules so we can use them as top-level things.
+    include Vagrant::Action::Builtin
+
+    # Leave a domain on a `vagrant destroy`.
+    #
+    # This is an Action middleware component that will detect the state of the machine -
+    # and any corresponding configuration and act accordingly. This function accepts user input and
+    # will halt the execution of proceeding middleware if the user chooses to cancel.
+    #
+    # Also note that it will interfere with a `vagrant destroy` user input to avoid duplicate "are you sure.."
+    # messages.
     class LeaveDomain
       include VagrantPlugins::WindowsDomain
 
+      attr_accessor :machine
+      attr_accessor :config
+      attr_accessor :env
+      attr_accessor :app
+      attr_accessor :provisioner
+
       def initialize(app, env)
         @logger = Log4r::Logger.new("vagrant::provisioners::vagrant_windows_domain")
         @logger.debug("Initialising WindowsDomain plugin on destroy action")
         @app = app
+        @env = env
         @machine = env[:machine]
 
         @machine.config.vm.provisioners.each do |prov|
@@ -19,16 +36,40 @@ module VagrantPlugins
         @provisioner = VagrantPlugins::WindowsDomain::Provisioner.new(@machine, @config)
       end
 
+      # The middleware method that is invoked automatically by the Plugin ecosystem.
+      # Expected to call the next middleware component in the chain if action should proceed.
       def call(env)
-        if @config
-          @logger.debug("Configuration detected, triggering leave domain action")
-          @provisioner.destroy
-        else
-          @logger.debug("No configuration detected, not leaving any domain")
-        end
+
+        if @config and @config.include? "domain" and @config.domain != nil
+
+       	  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)")
+       	    if answer.downcase == 'y'
+       	    	env[:force_confirm_destroy] = true # Prevent the popup dialog again
+       	    	@logger.debug("Valid configuration detected, triggering leave domain action")
+       	    	@provisioner.destroy
+       	    end
+       	  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? (y/n)")
+       	    return unless answer.downcase == 'y' # Bail out of destroy and prevent middleware from continuing on
+
+       	    # OK, we're being naughty and letting the rest of the middleware do their things (i.e. destroy the machine, and such)
+
+       	    env[:force_confirm_destroy] = true # Prevent the popup dialog again
+       	    @logger.debug("Force destroying this machine and not leaving the domain #{@config.domain}")
+       	    @machine.env.ui.say(:warn, "Force destroying this machine and not leaving the domain #{@config.domain}. May FSM have mercy on your soul.")
+       	  end
+       	else
+       	  @logger.debug("No configuration detected, not leaving any domain")
+       	end
+
+        # Continue the rest of the middleware actions
         @app.call(env)
       end
 
     end
   end
-end
+end

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

@@ -103,45 +103,6 @@ module VagrantPlugins
       # for any state related to the machine created by the provisioner
       # to be cleaned up.
       def destroy
-        # 
-          # # Returns the state of this machine. The state is queried from the
-          # # backing provider, so it can be any arbitrary symbol.
-          # #
-          # # @return [MachineState]
-          # def state
-          #   result = @provider.state
-          #   raise Errors::MachineStateInvalid if !result.is_a?(MachineState)
-
-          #   # Update our state cache if we have a UUID and an entry in the
-          #   # master index.
-          #   uuid = index_uuid
-          #   if uuid
-          #     entry = @env.machine_index.get(uuid)
-          #     if entry
-          #       entry.state = result.short_description
-          #       @env.machine_index.set(entry)
-          #       @env.machine_index.release(entry)
-          #     end
-          #   end
-
-          #   result
-          # end
-
-
-        # Check state: if NOT running, prompt user to start the box and return false
-
-
-
-        # Check state: if running, continue
-
-
-
-        # Potentially ask if the user really wants to destroy first?
-
-        # If we leave, set Force Key :force_confirm_destroy to true 
-        # -> We have already left domain!
-
-
         if @config && @config.include?("domain")
           set_credentials
           leave_domain
@@ -186,7 +147,7 @@ module VagrantPlugins
       def generate_command_runner_script(add_to_domain=true)
         path = File.expand_path("../templates/runner.ps1", __FILE__)
 
-        script = Vagrant::Util::TemplateRenderer.render(path, options: {
+        Vagrant::Util::TemplateRenderer.render(path, options: {
             config: @config,
             username: @config.username,
             password: @config.password,
@@ -259,30 +220,26 @@ module VagrantPlugins
       # 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}'"
-
         @machine.ui.info(I18n.t(
           "vagrant_windows_domain.running"))
 
-        opts = {
-          elevated: true,
-          error_key: :ssh_bad_exit_status_muted,
-          good_exit: 0,
-          shell: :powershell
-        }
-
-        result = @machine.communicate.sudo(command, opts) do |type, data|
+        # A bit of an ugly dance, but this is how we get neat, colourised output and exit codes from a Powershell run
+        last_type = nil
+        new_line = ""
+        error = false
+        machine.communicate.shell.powershell("powershell -ExecutionPolicy Bypass -OutputFormat Text -file #{script_path}") do |type, data|
           if !data.chomp.empty?
+            error = true if type == :stderr
             if [:stderr, :stdout].include?(type)
               color = type == :stdout ? :green : :red
-              @machine.ui.info(
-                data.chomp,
-                color: color, new_line: false, prefix: false)              
+              new_line = "\r\n" if last_type != nil and last_type != type
+              last_type = type
+              @machine.ui.info( new_line + data.chomp, color: color, new_line: false, prefix: false)
             end
           end
         end
 
-        result == 0
+        error == false
       end
 
       # Gets the Computer Name from the guest machine
@@ -291,7 +248,6 @@ module VagrantPlugins
         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
@@ -309,4 +265,4 @@ module VagrantPlugins
 
     end
   end
-end
+end

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

@@ -1,5 +1,5 @@
 module Vagrant
   module WindowsDomain
-    VERSION = "1.1.7"
+    VERSION = "1.1.8"
   end
 end

data/spec/provisioner/leave_domain_spec.rb

@@ -0,0 +1,123 @@
+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
+  	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? (y/n)").and_return("y")
+      		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? (y/n)").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

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(0)
+      expect(shell).to receive(:powershell).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1")
       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(0)
+      expect(shell).to receive(:powershell).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1")
       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)
@@ -95,8 +95,9 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
 
     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)
+      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(shell).to receive(:powershell).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1").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})
       subject.restart_sleep_duration = 0
@@ -166,8 +167,9 @@ 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(0)
-      expect(ui).to receive(:info).with(any_args).once
+      expect(shell).to receive(:powershell).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1").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})
       
       result = subject.leave_domain
       expect(result).to eq(true)
@@ -176,8 +178,9 @@ 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(: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
+      expect(shell).to receive(:powershell).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1").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_not receive(:say)
       expect(ui).to_not receive(:ask)
@@ -199,7 +202,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       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(shell).to receive(:powershell).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1").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: ")      
@@ -285,4 +288,4 @@ Add-Computer -DomainName foo.com -Credential $credentials -NewName 'mynewcompute
     end
 
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-domain
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -175,6 +175,7 @@ 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
@@ -198,12 +199,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.0.14
 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