vagrant-windows-domain 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce86949685fe8c228f0bf2ecb5b5284f6fd85eac
-  data.tar.gz: da22799eb1a74e416c9c32178fca198256c5757b
+  metadata.gz: 9a9722d26377397c2efd60e06c72d24755e8aa95
+  data.tar.gz: 71725b27ec40f96f3aa28ae903dba5b2bf471751
 SHA512:
-  metadata.gz: 05d2351ac7ae90cc26c49106ee8a0374d29cf8bd8341b5fb2fabdfaa59d6ebd408d93b0439bd839a58563a5694c4bec8a87a737aebe735c828011184069dea1a
-  data.tar.gz: 7b7299f283728ca184295b3c1c80532db8a309fff96c6a7867c32869bab22b8631814f7230ed52676a5a54cf97b220b44f9e5ad08b87292382bf967fef25bd02
+  metadata.gz: a76d24b22c36baebaa69bc5e4ff8334104adf42f0d08cb9ab6740249885429251f3527e1f268b4cc8a7a1bbc25beb9a33f953383d9882ea5bd808cfbef2f730e
+  data.tar.gz: b299cec8a1a0182a0a76109574694cf93074d25c192ba77524f3b39611bdef0dbbc732d3a79f6a66da3804cc4f13ce03b7b566a87e37e01fab57a6b3d4eaa06e

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

@@ -45,6 +45,10 @@ module VagrantPlugins
       # When this option is used username/password are not required
       attr_accessor :unsecure
 
+      # Internal id for use with detecting whether or not this
+      # plugin should be run in the `destroy` or phase.
+      attr_accessor :id
+
       def initialize
         super
         @domain            = UNSET_VALUE
@@ -83,6 +87,9 @@ module VagrantPlugins
       def validate(machine)        
         errors = _detected_errors
 
+        # Store machine id for unique reference
+        @id = machine.id
+
         # Need to supply one of them!
         if ( (@username != nil && @password != nil) && @unsecure == true)
           errors << I18n.t("vagrant_windows_domain.errors.both_credentials_provided")

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

@@ -103,6 +103,10 @@ module VagrantPlugins
       # for any state related to the machine created by the provisioner
       # to be cleaned up.
       def destroy
+        if !@machine.id || !@machine.config.windows_domain.id
+          @machine.env.ui.say "No machine id, nothing for 'windows-domain-provisioner' to do"
+          return
+        end
         set_credentials
         leave_domain
       end

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

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

data/spec/provisioner/config_spec.rb

@@ -10,7 +10,7 @@ describe VagrantPlugins::WindowsDomain::Config do
 
  let(:root_path)           { (Pathname.new(Dir.mktmpdir)).to_s }
   let(:ui)                  { Vagrant::UI::Silent.new }
-  let(:machine)             { double("machine", ui: ui) }
+  let(:machine)             { double("machine", ui: ui, id: "1234") }
   let(:env)                 { double("environment", root_path: root_path, ui: ui) }
   let(:vm)                  { double ("vm") }
   let(:communicator)        { double ("communicator") }
@@ -27,7 +27,7 @@ describe VagrantPlugins::WindowsDomain::Config do
     before do
       env = double("environment", root_path: "/tmp/vagrant-windows-domain-path")
       config = double("config")
-      machine.stub(config: config, env: env)
+      machine.stub(config: config, env: env, id: "1234")
     end
 
     before { subject.finalize! }
@@ -77,6 +77,12 @@ describe VagrantPlugins::WindowsDomain::Config do
       assert_error("You must not supply a \"username\" and \"password\" if \"unsecure\" is set to true.")
     end
 
+    it "should populate the id with the unique machine id" do
+      subject.validate(machine)
+
+      expect(subject.id).to eq("1234")
+    end
+
   end
 
 end

data/spec/provisioner/provisioner_spec.rb

@@ -8,7 +8,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
 
   let(:root_path)           { (Pathname.new(Dir.mktmpdir)).to_s }
   let(:ui)                  { double("ui") }
-  let(:machine)             { double("machine", ui: ui) }
+  let(:machine)             { double("machine", ui: ui, id: "1234") }
   let(:env)                 { double("environment", root_path: root_path, ui: ui) }
   let(:vm)                  { double ("vm") }
   let(:communicator)        { double ("communicator") }
@@ -23,7 +23,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
   describe "configure" do
     before do
       allow(machine).to receive(:root_config).and_return(root_config)
-      machine.stub(config: root_config, env: env)
+      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)
@@ -51,7 +51,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
 
     before do
       allow(machine).to receive(:root_config).and_return(root_config)
-      machine.stub(config: root_config, env: env)
+      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)
@@ -151,6 +151,16 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
     before do
       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)
+
+      root_config.domain = "foo.com"
+      root_config.username = "username"
+      root_config.password = "password"
+      root_config.finalize!
+      root_config.validate(machine)
     end
 
     it "should leave domain" do
@@ -168,13 +178,26 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       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(ui).to_not receive(:say)
+      expect(ui).to_not receive(:ask)
       subject.destroy
     end
 
+    it "should not leave domain plugin not associated with current Vagrantfile" do
+      allow(machine).to receive(:communicate).and_return(communicator)
+
+      root_config.username = nil
+      root_config.password = nil
+      root_config.id = nil
+      expect(ui).to receive(:say).with("No machine id, nothing for 'windows-domain-provisioner' to do")
+      expect(ui).to_not receive(:ask)
+      expect(subject.destroy).to eq(nil)
+    end
+
     it "should ask for credentials when leaving domain when no credentials were provided" do
       root_config.username = nil
-      root_config.password = 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)
@@ -182,7 +205,6 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       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.destroy
     end
 
@@ -191,7 +213,7 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
   describe "Powershell runner script" do
     before do
       allow(machine).to receive(:root_config).and_return(root_config)
-      machine.stub(config: root_config, env: env)
+      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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-domain
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -198,7 +198,7 @@ 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