wifi-wand 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f21e7e9af16e0eea5c7d254ef75ce061fbae1ada6c707201a189ec78f9238be
-  data.tar.gz: ec4b2ef369ca6e3186fe02b59e57c059f89a17b03eba2cdf760035b93fdaa9b9
+  metadata.gz: 3f241f14959069b1206de6183dc072605c5af1c65b1dbfc0f855366194bc3c68
+  data.tar.gz: 8bd1250fe4fc050b5810d1c67bd279ce6022974fc9facb236088057966712ec6
 SHA512:
-  metadata.gz: a86d2fd563801ca4a3259d200de197d8811c6f46360a805b85779fc488107045c8df20f6013c69866b61bdddcc40f11ff77a338bb2e0984eef8690d86a2016fd
-  data.tar.gz: cd16ad95aed459d769e51539a911797f004be30e7ad9dfab8c6352d2aaa226cbadcbe46d5d0c4075c58b6f478bb1ccb3f6a66408aa932b1111cf0205d5ea2e3c
+  metadata.gz: 3c3e3b3a1da083d30ba3289046d35506c43a6a0a56c443da10e5dc50566ada6e9c5aae829967eb5ac5c0d1a59d49063280397c1a05e5461440945c0415329c5a
+  data.tar.gz: d4791602539759a83b8d88f5dd801279559537dc5401fd003bdf2b9cd96083a5ffce957487122ed704e69a13458ef0659b7f7c52b19a74f4a4c9d1ca386d8d42

data/RELEASE_NOTES.md

@@ -1,3 +1,11 @@
+## v2.12.0
+
+* Change connected_to_internet?. Use 'dig' to test name resolution first, then HTTP get. Also, add baidu.com for China where google.com is blocked.
+* Remove ping test from connected_to_internet?. It was failing on a network that had connectivity (Syma in France).
+* Remove trailing newline from MAC address.
+* Fix nameservers command to return empty array instead of ["There aren't any DNS Servers set on Wi-Fi."] (output of underlying command)when no nameservers.
+
+
 ## v2.11.0
 
 * Various fixes and clarifications.

data/lib/wifi-wand/models/base_model.rb

@@ -66,47 +66,64 @@ class BaseModel
 
 
   # This method returns whether or not there is a working Internet connection,
-  # which is defined as being able to get a successful response
-  # from google.com within 3 seconds..
+  # which is defined as name resolution and HTTP get being successful.
+  # Domains attempted are google.com and baidu.com. Success is either being successful.
+  # Commands for the multiple sites are run in parallel, in threads, to save time.
   def connected_to_internet?
 
-    # We test using ping first because that will allow us to fail faster
-    # if there is no network connection.
-    test_using_ping = -> do
-      run_os_command('ping -c 1 -t 3 google.com', false)
-      $?.exitstatus == 0
-    end
-
+    # We cannot use run_os_command for the running of external processes here,
+    # because they are multithreaded, and the output will get mixed up.
 
-    test_using_http_get = -> do
-      test_site = 'https://www.google.com'
-      url = URI.parse(test_site)
-      success = true
+    # First pass to fail quickly if name resolving does not work.
+    test_using_dig = -> do
+      domains = %w(google.com  baidu.com)
+      puts "Calling dig on domains #{domains}..." if @verbose_mode
 
-      if @verbose_mode
-        puts CommandOutputFormatter.command_attempt_as_string("[Calling Net:HTTP.start(#{url.host})]")
+      threads = domains.map do |domain|
+        Thread.new do
+          output = `dig +short #{domain}`
+          output.length > 0
+        end
       end
 
-      start_time = Time.now
+      threads.each(&:join)
+      values = threads.map(&:value)
+      success = values.include?(true)
+      puts "Results of dig: success == #{success}, values were #{values}." if @verbose_mode
+      success
+    end
 
-      begin
-        Net::HTTP.start(url.host) do |http|
-          http.read_timeout = 3 # seconds
-          http.get('.')
+    test_using_http_get = -> do
+      test_sites = %w{https://www.google.com  http://baidu.com}
+      puts "Calling HTTP.get on sites #{test_sites}..." if @verbose_mode
+
+      threads = test_sites.map do |site|
+        Thread.new do
+          url = URI.parse(site)
+          success = true
+
+          begin
+            Net::HTTP.start(url.host) do |http|
+              http.read_timeout = 3 # seconds
+              http.get('.')
+            end
+          rescue
+            success = false
+          end
+
+          success
         end
-      rescue
-        success = false
       end
 
-      if @verbose_mode
-        puts "Duration: #{'%.4f' % [Time.now - start_time]} seconds"
-        puts CommandOutputFormatter.command_result_as_string("#{success}\n")
-      end
+      threads.each(&:join)
+      values = threads.map(&:value)
+      success = values.include?(true)
 
+      puts "Results of HTTP.get: success == #{success}, values were #{values}." if @verbose_mode
       success
     end
 
-    test_using_ping.() && test_using_http_get.()
+    test_using_dig.() && test_using_http_get.()
   end
 
 

data/lib/wifi-wand/models/mac_os_model.rb

@@ -279,7 +279,7 @@ class MacOsModel < BaseModel
   # then this method returns the current address if none is provided,
   # but sets to the specified address if it is.
   def mac_address
-    run_os_command("ifconfig #{wifi_port} | awk '/ether/{print $2}'")
+    run_os_command("ifconfig #{wifi_port} | awk '/ether/{print $2}'").chomp
   end
 
 
@@ -387,6 +387,9 @@ class MacOsModel < BaseModel
 
   def nameservers_using_networksetup
     output = run_os_command("networksetup -getdnsservers Wi-Fi")
+    if output == "There aren't any DNS Servers set on Wi-Fi.\n"
+      output = ''
+    end
     output.split("\n")
   end
 end

data/lib/wifi-wand/version.rb

@@ -1,5 +1,5 @@
 module WifiWand
 
-  VERSION = '2.11.0'
+  VERSION = '2.12.0'
 
 end

data/wifi-wand.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["keithrbennett@gmail.com"]
   spec.description   = %q{A command line interface for managing WiFi on a Mac.}
   spec.summary       = %q{Mac WiFi utility}
-  spec.homepage      = "https://github.com/keithrbennett/wifi-wand"
+  spec.homepage      = "https://github.com/keithrbennett/wifiwand"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wifi-wand
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Keith Bennett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,7 @@ files:
 - spec/wifi-wand/models/mac_os_model_spec.rb
 - test-data/invalid-byte-sequence-network-names.txt
 - wifi-wand.gemspec
-homepage: https://github.com/keithrbennett/wifi-wand
+homepage: https://github.com/keithrbennett/wifiwand
 licenses:
 - MIT
 metadata: {}