landrush 1.1.0.beta.3 → 1.1.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d77ecf53a2c01d7b970262ad962f581b5f3b44c4
-  data.tar.gz: ea67610f89e99e4a7b39610a2f154eb932ce25e3
+  metadata.gz: 4f14705abc9cca46ab6289380605e920f7d0b1b9
+  data.tar.gz: 9fec7c2e50cb5d6e5e006474320894bca04df10e
 SHA512:
-  metadata.gz: 66834fc6e32258479ac9121bd7cee33ed7f177b6ffd2300866523f0263391991c048db3e136eb087a96f922915ffb6688793d0b87f148a8a58458a6c752977a7
-  data.tar.gz: 091535496355c49f29dc937c3e3617cf5b955ac7046217df7c4a1aabb36e560f704e55894e77b0bf2c26d99aa25c4dd6aa13b6996a1a7f23346a499ee15631a1
+  metadata.gz: 4a6d04db3fbe1e996d3f71cf650793c6876436ad851d062428fc563ee8218de1f5ba3771611ecafc1d55b3c56bee2a64a0eacdace3581ae23ebbeb4b87b36dda
+  data.tar.gz: 43738660461e9f0b5c20aa7d43e46063ef5cadacc406799daeb927679666bdeb3cf806d5d5f18f5973a17eadef759390a87790ed184d626b40a214a7efa0f05f

data/lib/landrush/cap/host/windows/configure_visibility_on_host.rb

@@ -54,24 +54,26 @@ module Landrush
           def update_network_adapter(ip, tld)
             # Need to defer loading to ensure cross OS compatibility
             require 'win32/registry'
-            ensure_admin_privileges(__FILE__.to_s, ip, tld)
-
-            network_name = get_network_name(ip)
-            if network_name.nil?
-              info("unable to determine network interface for #{ip}. DNS on host cannot be configured. Try manual configuration.")
-              return
+            if admin_mode?
+              network_name = get_network_name(ip)
+              if network_name.nil?
+                info("unable to determine network interface for #{ip}. DNS on host cannot be configured. Try manual configuration.")
+                return
+              else
+                info("adding Landrush'es DNS server to network '#{network_name}' using DNS IP '#{ip}'' and search domain '#{tld}'")
+              end
+              network_guid = get_guid(network_name)
+              if network_guid.nil?
+                info("unable to determine network GUID for #{ip}. DNS on host cannot be configured. Try manual configuration.")
+                return
+              end
+              interface_path = INTERFACES + "\\{#{network_guid}}"
+              Win32::Registry::HKEY_LOCAL_MACHINE.open(interface_path, Win32::Registry::KEY_ALL_ACCESS) do |reg|
+                reg['NameServer'] = '127.0.0.1'
+                reg['Domain'] = tld
+              end
             else
-              info("adding Landrush'es DNS server to network '#{network_name}' using DNS IP '#{ip}'' and search domain '#{tld}'")
-            end
-            network_guid = get_guid(network_name)
-            if network_guid.nil?
-              info("unable to determine network GUID for #{ip}. DNS on host cannot be configured. Try manual configuration.")
-              return
-            end
-            interface_path = INTERFACES + "\\{#{network_guid}}"
-            Win32::Registry::HKEY_LOCAL_MACHINE.open(interface_path, Win32::Registry::KEY_ALL_ACCESS) do |reg|
-              reg['NameServer'] = '127.0.0.1'
-              reg['Domain'] = tld
+              run_with_admin_privileges(__FILE__.to_s, ip, tld)
             end
           end
 
@@ -133,14 +135,10 @@ module Landrush
 
           # Makes sure that we have admin privileges and if nor starts a new shell with the required
           # privileges
-          def ensure_admin_privileges(file, *args)
-            unless admin_mode?
-              require 'win32ole'
-              shell = WIN32OLE.new('Shell.Application')
-              shell.ShellExecute('ruby', "#{file} #{args.join(' ')}", nil, 'runas', 1)
-              # need to exit current execution, changes will occur in new environment
-              exit
-            end
+          def run_with_admin_privileges(file, *args)
+            require 'win32ole'
+            shell = WIN32OLE.new('Shell.Application')
+            shell.ShellExecute('ruby', "#{file} #{args.join(' ')}", nil, 'runas', 1)
           end
 
           def info(msg)

data/lib/landrush/version.rb

@@ -1,3 +1,3 @@
 module Landrush
-  VERSION = '1.1.0.beta.3'.freeze
+  VERSION = '1.1.0.beta.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: landrush
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta.3
+  version: 1.1.0.beta.4
 platform: ruby
 authors:
 - Paul Hinze