wifi-wand 2.9.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d5b1780753a271f9bc1d4da54530160de21c28760262fa959fd723589abbbdd
-  data.tar.gz: ee3094477cde57eed16ede10c2111b885986ee67340227284bb2882c45edd4c8
+  metadata.gz: 301b4e83a32c377d251c8cdef985299c26220e4c7322ba72fe43488aa050b94e
+  data.tar.gz: 1880892a4a794728a932ca5e42830ca546c46ce55403d0cf3b2059d92381c707
 SHA512:
-  metadata.gz: d4d9cd6476fbc3bdb06c02d906c0bcf1cceb99b0cd39c3bc0b84287477bcbd45e945cdfaeee7fd195f88cde5e87ea8a9bfbb24e38b5c31f6cedf512eb55911f2
-  data.tar.gz: b7d7626c4370420f6b971d82189f8b70d17fdca4e3ed34aab762d555800605e690f5507bf1ee702c60b5ae87e5cd6754d4ce81af3c2880bcf6a1f55478009c2e
+  metadata.gz: a8aede3fee3958093e2c5cca0dbf8c01118d79cb2cca7cac815d83aa69f1c45a51f6fb94846cf0ec9bbbf6e5a88e29dd3644af1f5a51d3ad7d191a3c07238134
+  data.tar.gz: 6a7ed65e40957546032570d54e36db58157885de5bc4e11723e4564e7b4d0040ec433876c8a5b5c67943130be5293ae6ad2c159cabf82147464e7abb9338fcb3

data/README.md

@@ -28,7 +28,9 @@ output at the time of this writing:
 ```
 $ wifi-wand -h
 
-Command Line Switches:                    [wifi-wand version 2.9.0 at https://github.com/keithrbennett/wifiwand]
+Syntax is: exe/wifi-wand [options] command [command_options]
+
+Command Line Switches:                    [wifi-wand version 2.10.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
@@ -42,6 +44,7 @@ ci                        - connected to Internet (not just wifi on)?
 co[nnect] network-name    - turns wifi on, connects to network-name
 cy[cle]                   - turns wifi off, then on, preserving network selection
 d[isconnect]              - disconnects from current network, does not turn off wifi
+f[orget] network-name     - removes network-name(s) from the preferred networks list
 h[elp]                    - prints this help
 i[nfo]                    - a hash of wifi-related information
 l[s_avail_nets]           - details about available networks
@@ -52,7 +55,6 @@ 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(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

data/RELEASE_NOTES.md

@@ -1,3 +1,12 @@
+## v2.10.1
+
+* Fix egregious bug; the 'a' command did not work if `airport` was not in the path; I should have been using the AIRPORT_CMD constant but hard coded `airport` instead.
+
+## v2.10.0
+
+* Rename rm[_pref_nets] command to f[orget].
+ 
+
 ## v2.9.0
 
 * Add duration of command to verbose output.

data/lib/wifi-wand/command_line_interface.rb

@@ -64,6 +64,7 @@ ci                        - connected to Internet (not just wifi on)?
 co[nnect] network-name    - turns wifi on, connects to network-name
 cy[cle]                   - turns wifi off, then on, preserving network selection
 d[isconnect]              - disconnects from current network, does not turn off wifi
+f[orget] name1 [..name_n] - removes network-name(s) from the preferred networks list
 h[elp]                    - prints this help
 i[nfo]                    - a hash of wifi-related information
 l[s_avail_nets]           - details about available networks
@@ -74,7 +75,6 @@ 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(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
@@ -409,7 +409,7 @@ When in interactive shell mode:
   end
 
 
-  def cmd_r(*options)
+  def cmd_f(*options)
     removed_networks = model.remove_preferred_networks(*options)
     if interactive_mode
       removed_networks
@@ -448,6 +448,7 @@ When in interactive shell mode:
         Command.new('co',  'connect',       -> (*options)  { cmd_co(*options)  }),
         Command.new('cy',  'cycle',         -> (*_options) { cmd_cy            }),
         Command.new('d',   'disconnect',    -> (*_options) { cmd_d             }),
+        Command.new('f',   'forget',        -> (*options)  { cmd_f(*options)   }),
         Command.new('h',   'help',          -> (*_options) { cmd_h             }),
         Command.new('i',   'info',          -> (*_options) { cmd_i             }),
         Command.new('l',   'ls_avail_nets', -> (*_options) { cmd_l             }),
@@ -459,7 +460,6 @@ When in interactive shell mode:
         Command.new('pa',  'password',      -> (*options)  { cmd_pa(*options)  }),
         Command.new('pr',  'pref_nets',     -> (*_options) { cmd_pr            }),
         Command.new('q',   'quit',          -> (*_options) { cmd_q             }),
-        Command.new('r',   'rm_pref_nets',  -> (*options)  { cmd_r(*options)   }),
         Command.new('t',   'till',          -> (*options)  { cmd_t(*options)   }),
         Command.new('w',   'wifi_on',       -> (*_options) { cmd_w             }),
         Command.new('x',   'xit',           -> (*_options) { cmd_x             })

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

@@ -155,12 +155,12 @@ class BaseModel
     actual_network_name = connected_network_name
     unless actual_network_name == network_name
       message = %Q{Expected to connect to "#{network_name}" but }
-      if actual_network_name
-        message << %Q{connected to "#{connected_network_name}" instead.}
+      if actual_network_name.nil? || actual_network_name.empty?
+        message << "unable to connect to any network."
       else
-        message << "unable to connect to any network. Did you "
+        message << %Q{connected to "#{connected_network_name}" instead.}
       end
-      message << (password ? "provide the correct password?" : "need to provide a password?")
+      message << ' Did you ' << (password ? "provide the correct password?" : "need to provide a password?")
       raise message
     end
     nil

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

@@ -98,7 +98,7 @@ class MacOsModel < BaseModel
   def available_network_names
 
     # awk command below kindly provided by @nohillside at https://apple.stackexchange.com/questions/320323/how-to-programmatically-get-available-wifi-networks-without-airport-utility.
-    command = %q{airport -s -x | awk '{ if (catch == 1) { print; catch=0 } } /SSID_STR/ { catch=1 }'}
+    command = %Q{#{AIRPORT_CMD} -s -x | awk '{ if (catch == 1) { print; catch=0 } } /SSID_STR/ { catch=1 }'}
     stop_condition = ->(response) { ! [nil, ''].include?(response) }
 
     output = try_os_command_until(command, stop_condition)

data/lib/wifi-wand/version.rb

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

metadata

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