vagrant-windows-domain 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a9722d26377397c2efd60e06c72d24755e8aa95
-  data.tar.gz: 71725b27ec40f96f3aa28ae903dba5b2bf471751
+  metadata.gz: e30bd4addda05305cd59a0e120c3790b20d5c2f5
+  data.tar.gz: 2f5d4a1ff6e0a6fd34dc3f518e75fba516520220
 SHA512:
-  metadata.gz: a76d24b22c36baebaa69bc5e4ff8334104adf42f0d08cb9ab6740249885429251f3527e1f268b4cc8a7a1bbc25beb9a33f953383d9882ea5bd808cfbef2f730e
-  data.tar.gz: b299cec8a1a0182a0a76109574694cf93074d25c192ba77524f3b39611bdef0dbbc732d3a79f6a66da3804cc4f13ce03b7b566a87e37e01fab57a6b3d4eaa06e
+  metadata.gz: bdcca197a09d606352a9431c7dc65963bff2909cf23486213460a55a4879f13c4b08e72d25a72a8291fe04f0e37b7f1f122027124f7cdb3b1ec091a6831fcd4d
+  data.tar.gz: cd78c6f6c8fd24b7bd16c8aed4973a653592fc13b79070996ad0c48fee2367bab593dce7bf5e1b78229fea357a4e564528397dde69415b6420d0507aaaad964d

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

@@ -7,17 +7,28 @@ module VagrantPlugins
       include VagrantPlugins::WindowsDomain
 
       def initialize(app, env)
+        logger.debug("Initialising WindowsDomain plugin on destroy action")
         @app = app
         @machine = env[:machine]
-        @config = env[:machine].config.windows_domain
+        @logger = Log4r::Logger.new("vagrant::provisioners::vagrant_windows_domain")
+
+        @machine.config.vm.provisioners.each do |prov|
+          @config = prov.config if prov.config.is_a?(VagrantPlugins::WindowsDomain::Config)
+        end
+
         @provisioner = VagrantPlugins::WindowsDomain::Provisioner.new(@machine, @config)
       end
 
       def call(env)
-        @provisioner.destroy
-        @app.call(env)
+        if @config
+          logger.debug("Configuration detected, triggering leave domain action")
+          @provisioner.destroy
+          @app.call(env)
+        else
+          logger.debug("No configuration detected, not leaving any domain")
+        end
       end
 
     end
   end
-end
+end

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

@@ -45,10 +45,6 @@ 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
@@ -87,9 +83,6 @@ 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,12 +103,13 @@ 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"
+        if @config && @config.include?("domain")
+          set_credentials
+          leave_domain
+        else
+          @logger.debug("Not leaving domain on `destroy` action - no valid configuration detected")
           return
         end
-        set_credentials
-        leave_domain
       end
 
       # Restarts the Computer and waits

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

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

data/spec/provisioner/config_spec.rb

@@ -76,13 +76,6 @@ describe VagrantPlugins::WindowsDomain::Config do
       assert_invalid
       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

@@ -187,10 +187,8 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
     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")
+      subject = described_class.new machine, []
+
       expect(ui).to_not receive(:ask)
       expect(subject.destroy).to eq(nil)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-domain
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Matt Fellows