wifi-wand 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69ff4a48a042ef648c1cca4f2aca1722f5a56bfb8b4bd78ee6cc9f4ba732b9db
-  data.tar.gz: 0e5c99698650885c01a08caa740dfc5a4c5d35a8a2b0ff5c0eda31ce9297cf80
+  metadata.gz: 3d5b1780753a271f9bc1d4da54530160de21c28760262fa959fd723589abbbdd
+  data.tar.gz: ee3094477cde57eed16ede10c2111b885986ee67340227284bb2882c45edd4c8
 SHA512:
-  metadata.gz: a5c2067026a31c0e0b976d5d5c63f2680d7324838583060d70d50c9289d3f360ea4c11210ebb062803a680dffadb9996fad2a65c0027c7524318b6bc27942c45
-  data.tar.gz: aeedfe2437d7f11cb8ad3dbde4cebc63ad518f72f5e4bd52106850e8c856364471ffc036a89f12755748fc95ed835a2965d4da832b470534f3e3ae3009349225
+  metadata.gz: d4d9cd6476fbc3bdb06c02d906c0bcf1cceb99b0cd39c3bc0b84287477bcbd45e945cdfaeee7fd195f88cde5e87ea8a9bfbb24e38b5c31f6cedf512eb55911f2
+  data.tar.gz: b7d7626c4370420f6b971d82189f8b70d17fdca4e3ed34aab762d555800605e690f5507bf1ee702c60b5ae87e5cd6754d4ce81af3c2880bcf6a1f55478009c2e

data/README.md

@@ -28,7 +28,7 @@ output at the time of this writing:
 ```
 $ wifi-wand -h
 
-Command Line Switches:                    [wifi-wand version 2.8.0 at https://github.com/keithrbennett/wifiwand]
+Command Line Switches:                    [wifi-wand version 2.9.0 at https://github.com/keithrbennett/wifiwand]
 
 -o {i,j,k,p,y}            - outputs data in inspect, JSON, pretty JSON, puts, or YAML format when not in shell mode
 -p wifi_port_name         - override automatic detection of port name with this name
@@ -52,12 +52,11 @@ of[f]                     - turns wifi off
 pa[ssword] network-name   - password for preferred network-name
 pr[ef_nets]               - preferred (not necessarily available) networks
 q[uit]                    - exits this program (interactive shell mode only) (see also 'x')
-r[m_pref_nets] network-name - removes network-name from the preferred networks list
-                          (can provide multiple names separated by spaces)
-ro[pen]                   - open resource ('ipc' (IP Chicken), 'ipw' (What is My IP), 'spe' (Speed Test), 'this' (wifi-wand Home Page))
+r[m_pref_nets] network-name - removes network-name(s) from the preferred networks list
+ro[pen]                   - open resource ('ipl' (IP Location), 'ipw' (What is My IP), 'spe' (Speed Test), 'this' (wifi-wand home page))
 t[ill]                    - returns when the desired Internet connection state is true. Options:
-                          1) 'on'/:on, 'off'/:off, 'conn'/:conn, or 'disc'/:disc
-                          2) wait interval, in seconds (optional, defaults to 0.5 seconds)
+                            1) 'on'/:on, 'off'/:off, 'conn'/:conn, or 'disc'/:disc
+                            2) wait interval, in seconds (optional, defaults to 0.5 seconds)
 w[ifion]                  - is the wifi on?
 x[it]                     - exits this program (interactive shell mode only) (see also 'q')
 
@@ -345,8 +344,8 @@ return this:
 `Rate limit exceeded. Subscribe to a paid plan to increase your usage limits` 
 
 If this happens, the public IP information will be silently omitted from the
-information hash. In this case, the web site 'https://www.whatismyip.com' is
-recommended, and `ro ipw` on the command line or `ro 'ipw'` in the shell will
+information hash. In this case, the web site 'https://www.iplocation.net/' is
+recommended, and `ro ipl` on the command line or `ro 'ipl'` in the shell will
 open that page in your browser for you.
 
 

data/RELEASE_NOTES.md

@@ -1,3 +1,12 @@
+## v2.9.0
+
+* Add duration of command to verbose output.
+* Add MAC address to info hash.
+* Reduce ping timeout to 3 seconds for faster return for `info`, `ci` commands.
+* Replace ipchicken.com link with iplocation.net link for 'ropen'; iplocation aggregates several info sources.
+* Fix bug where if there were no duplicate network names, result was nil, because uniq! returns nil if no changes!!!
+* Suppress error throw on ping error when not connected; it was printing useless output.
+
 ## v2.8.0
 
 * Substantial simplifications of model implementations of connected_to_internet?, available_network_names.

data/lib/wifi-wand/command_line_interface.rb

@@ -41,10 +41,10 @@ class CommandLineInterface
   end
 
   OPEN_RESOURCES = OpenResources.new([
-      OpenResource.new('ipc',  'https://ipchicken.com/',     'IP Chicken'),
-      OpenResource.new('ipw',  'https://www.whatismyip.com', 'What is My IP'),
-      OpenResource.new('spe',  'http://speedtest.net/',      'Speed Test'),
-      OpenResource.new('this', 'https://github.com/keithrbennett/wifiwand', 'wifi-wand Home Page'),
+      OpenResource.new('ipl',  'https://www.iplocation.net/',               'IP Location'),
+      OpenResource.new('ipw',  'https://www.whatismyip.com',                'What is My IP'),
+      OpenResource.new('spe',  'http://speedtest.net/',                     'Speed Test'),
+      OpenResource.new('this', 'https://github.com/keithrbennett/wifiwand', 'wifi-wand home page'),
   ])
 
 
@@ -74,12 +74,11 @@ of[f]                     - turns wifi off
 pa[ssword] network-name   - password for preferred network-name
 pr[ef_nets]               - preferred (not necessarily available) networks
 q[uit]                    - exits this program (interactive shell mode only) (see also 'x')
-r[m_pref_nets] network-name - removes network-name from the preferred networks list
-                          (can provide multiple names separated by spaces)
+r[m_pref_nets] network-name - removes network-name(s) from the preferred networks list
 ro[pen]                   - open resource (#{OPEN_RESOURCES.help_string})
 t[ill]                    - returns when the desired Internet connection state is true. Options:
-                          1) 'on'/:on, 'off'/:off, 'conn'/:conn, or 'disc'/:disc
-                          2) wait interval, in seconds (optional, defaults to 0.5 seconds)
+                            1) 'on'/:on, 'off'/:off, 'conn'/:conn, or 'disc'/:disc
+                            2) wait interval, in seconds (optional, defaults to 0.5 seconds)
 w[ifion]                  - is the wifi on?
 x[it]                     - exits this program (interactive shell mode only) (see also 'q')
 

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

@@ -59,9 +59,11 @@ class BaseModel
       puts command_attempt_as_string(command)
     end
 
+    start_time = Time.now
     output = `#{command} 2>&1` # join stderr with stdout
 
     if @verbose_mode
+      puts "Duration: #{'%.4f' % [Time.now - start_time]} seconds"
       puts command_result_as_string(output)
     end
 
@@ -77,28 +79,44 @@ class BaseModel
   # which is defined as being able to get a successful response
   # from google.com within 3 seconds..
   def connected_to_internet?
-    test_site = 'https://www.google.com'
-    url = URI.parse(test_site)
-    success = true
 
-    if @verbose_mode
-      puts command_attempt_as_string("[Calling Net:HTTP.start(#{url.host})]")
+    # 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
 
-    begin
-      Net::HTTP.start(url.host) do |http|
-        http.read_timeout = 3 # seconds
-        http.get('.')
+
+    test_using_http_get = -> do
+      test_site = 'https://www.google.com'
+      url = URI.parse(test_site)
+      success = true
+
+      if @verbose_mode
+        puts command_attempt_as_string("[Calling Net:HTTP.start(#{url.host})]")
       end
-    rescue
-      success = false
-    end
 
-    if @verbose_mode
-      puts command_result_as_string("#{success}\n")
+      start_time = Time.now
+
+      begin
+        Net::HTTP.start(url.host) do |http|
+          http.read_timeout = 3 # seconds
+          http.get('.')
+        end
+      rescue
+        success = false
+      end
+
+      if @verbose_mode
+        puts "Duration: #{'%.4f' % [Time.now - start_time]} seconds"
+        puts command_result_as_string("#{success}\n")
+      end
+
+      success
     end
 
-    success
+    test_using_ping.() && test_using_http_get.()
   end
 
 
@@ -225,6 +243,13 @@ class BaseModel
   end
 
 
+  def random_mac_address
+    bytes = Array.new(6) { rand(256) }
+    chars = bytes.map { |b| "%02x" % b }
+    chars.join(':')
+  end
+
+
   def wifi_port
     @wifi_port ||= detect_wifi_port
   end

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

@@ -107,6 +107,7 @@ class MacOsModel < BaseModel
     output.map! { |s| s.gsub(/<\/?string>/, '') }
     output.sort! { |s1, s2| s1.casecmp(s2) }    # sort alphabetically, case insensitively
     output.uniq!
+    output
   end
 
 
@@ -222,6 +223,17 @@ class MacOsModel < BaseModel
   end
 
 
+  # TODO: Add capability to change the MAC address using a command in the form of:
+  #     sudo ifconfig en0 ether aa:bb:cc:dd:ee:ff
+  # However, the MAC address will be set to the real hardware address on restart.
+  # One way to implement this is to have an optional address argument,
+  # 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}'")
+  end
+
+
   # Returns some useful wifi-related information.
   def wifi_info
 
@@ -237,6 +249,7 @@ class MacOsModel < BaseModel
         'port'        => wifi_port,
         'network'     => connected_network_name,
         'ip_address'  => ip_address,
+        'mac_address' => mac_address,
         'nameservers' => nameservers_using_scutil,
         'timestamp'   => Time.now,
     }

data/lib/wifi-wand/version.rb

@@ -1,5 +1,5 @@
 module WifiWand
 
-  VERSION = '2.8.0'
+  VERSION = '2.9.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wifi-wand
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Keith Bennett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler