mac-wifi 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75c730b3171f9dba37b683b40cde3c4d40765001
-  data.tar.gz: 5660a6f765152ad8ac23a09f5f88084a4ec83d3b
+  metadata.gz: 24a41565844a201ee4416a7a5452d8859526ed7c
+  data.tar.gz: 8cfe9206c6164351d4b98b825a89543e98932719
 SHA512:
-  metadata.gz: 237050e6744bb80ae8c2f36053731db4a03c78cc1402b82a12479848ac6d20b16a032a48d8944e038fe026799f5c28b0991523108958182c083bde7c9e65bb4a
-  data.tar.gz: 57d380bc2392e40e2b78bc856b22be6c83ec388e70a365cc098b0b76084f1e5427dcd6fac64172dad7d300cf11b39f9883f4e67c894ad1430ca851ffaca926ba
+  metadata.gz: 41ba590f1fe37986621d1fee3f5c8d93af431de56b24bedf8988f2f740f20ed8e1a49ad7aeab8b2ed412e068b39ee0b9da3e0372a7821260279e6af988a61f35
+  data.tar.gz: 7e8cb0afeb5f413ff444cf1602170671976ef1a464624c58846ec6b7dc86bf09b349caa0cb889d973790d0d818d92b6a61ebbba360bbcd57f24c1ce073b9c17e

data/.gitignore

@@ -16,4 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .idea/
-
+mac-wifi-error-stack-trace.txt

data/README.md

@@ -17,34 +17,38 @@ Available commands can be seen by using the `h` (or `help`) option. Here is its
 output at the time of this writing:
 
 ```
-➜  mac-wifi git:(master) ✗   ./mac-wifi h
-
-mac-wifi version 1.1.0 -- Available commands are:
-
-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
-h[elp]                  - prints this help
-i[nfo]                  - prints wifi-related information
-lsp[referred]           - lists preferred (not necessarily available) networks
-lsa[vailable]           - lists available networks
-n[etwork_name]          - name (SSID) of currently connected network
-on                      - turns wifi on
-of[f]                   - turns wifi off
-pa[ssword] network-name - shows password for preferred network-name
-q[uit]                  - exits this program (interactive shell mode only)
-r[m] network-name       - removes network-name from the preferred networks list
-s[hell]                 - opens an interactive pry shell (command line only)
-t[ill]                  - returns when the desired Internet connection state is true. Options:
-                          'on'/:on or 'off'/:off
-                          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)
+$ mac-wifi h
+
+
+mac-wifi version 1.3.0 -- Available commands are:
+
+a[vailnets]               - array of names of the available networks
+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
+h[elp]                    - prints this help
+i[nfo]                    - a hash of wifi-related information
+l[savailnets]             - details about available networks
+n[etwork_name]            - name (SSID) of currently connected network
+on                        - turns wifi on
+of[f]                     - turns wifi off
+pa[ssword] network-name   - password for preferred network-name
+pr[efnets]                - preferred (not necessarily available) networks
+q[uit]                    - exits this program (interactive shell mode only) (see also 'x')
+r[mprefnets] network-name - removes network-name from the preferred networks list
+                            (can provide multiple names separated by spaces)
+s[hell]                   - opens an interactive pry shell (command line only)
+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)
+w[ifion]                  - is the wifi on?
+x[it]                     - exits this program (interactive shell mode only) (see also 'q')
 
 When in interactive shell mode:
     * use quotes for string parameters such as method names.
     * for pry commands, use prefix `%`.
+
 ```
 
 Internally, it uses several Mac command line utilities. This is not ideal,
@@ -63,6 +67,25 @@ This is accomplished by the following command:
 `gem install awesome_print`
 
 
+### JSON and YAML Output
+
+For now, JSON and YAML processing are only available in the interactive mode shell, in the way
+you would usually use them in Ruby code. Their respective libraries are automatically
+`require`d for your convenience. If you want them in non-interactive mode,
+you can work around this limitation by redirecting the shell's input, e.g.:
+
+```
+echo "File.write('available_networks.json', availnets.pretty_inspect)" | mac-wifi s
+```
+
+This will create a file `available_networks.json` with content looking something like this:
+
+```bash
+["....MMobile 2.4G",
+ ".@  3BB_WiFi",
+ ".@ AIS SUPER WiFi"]
+```
+
 ### Seeing the Underlying OS Commands and Output
 
 If you would like to see the Mac OS commands and their output, you can do so by setting the
@@ -119,7 +142,7 @@ session. It can be useful when:
 
 There are a couple of things (that may be surprising) to keep in mind
 when using the shell. They relate to the fact that local variables
-and method calls use the same notation in Ruby (use of parentheses
+and method calls use the same notation in Ruby (since use of parentheses
 in a method call is optional):
 
 1) In Ruby, when both a method and a local variable have the same name,
@@ -187,8 +210,9 @@ constants or instance variables if you want to create variables in your shell.
 
 ```
 mac-wifi i            # prints out wifi info
-mac-wifi lsa          # prints available networks
-mac-wifi lsp          # prints preferred networks
+mac-wifi a            # prints out names of available networks
+mac-wifi lsa          # prints available networks detailed information
+mac-wifi pr           # prints preferred networks
 mac-wifi cy           # cycles the wifi off and on
 mac-wifi co a-network a-password # connects to a network requiring a password
 mac-wifi co a-network            # connects to a network _not_ requiring a password
@@ -197,6 +221,36 @@ mac-wifi t on && say "Internet connected" # Play audible message when Internet b
 
 #### Interactive Shell Commands
 
+When in shell mode, commands generally return the target object (e.g. the array of
+available networks) rather than outputting a nicely formatted string. This may result
+in the shell outputting that returned value in an ugly way.
+
+If you don't need the return value but just want to display the value nicely,
+you can use the `fancy_puts` method to output it nicely. An alias `fp` has been
+provided for your convenience. You're welcome!  For example:
+
+```
+[5] pry(#<MacWifi::CommandLineInterface>)> fp pr.first(3)
+[
+    [0] "  AIS SMART Login",
+    [1] " BubblesLive",
+    [2] "#HKAirport Free WiFi"
+]
+```
+
+If you want to surpress output altogether (e.g. if you are using the value in an
+expression and don't need to print it out, you can simply append `;nil` to the expression
+and that will be value output to the console. For example:
+
+```
+[10] pry(#<MacWifi::CommandLineInterface>)> available_networks = availnets; nil
+=> nil
+[11] pry(#<MacWifi::CommandLineInterface>)> availnets.size
+=> 32
+```
+
+**More Examples**
+
 (For brevity, semicolons are used here to put multiple commands on one line, 
 but these commands could also each be specified on a line of its own.)
 
@@ -216,15 +270,15 @@ i
 > @i = i; puts "You are connected on port #{@i[:port]} to #{@i[:network]} on IP address #{@i[:ip_address]}."
 You are connected on port en0 to .@ AIS SUPER WiFi on IP address 172.27.145.225.
 
-> puts "There are #{lsp.size} preferred networks."
+> puts "There are #{pr.size} preferred networks."
 There are 341 preferred networks.
 
 # Delete all preferred networks whose names begin with "TOTTGUEST", the hard way:
-> lsp.grep(/^TOTTGUEST/).each { |n| rm(n) }
+> pr.grep(/^TOTTGUEST/).each { |n| rm(n) }
 
 # Delete all preferred networks whose names begin with "TOTTGUEST", the easy way.
 # rm can take multiple network names, but they must be specified as separate parameters; thus the '*'.
-> rm(*lsp.grep(/^TOTTGUEST/))
+> rm(*pr.grep(/^TOTTGUEST/))
 
 # Define a method to wait for the Internet connection to be active.
 # (This functionality is included in the `till` command.)

data/RELEASE_NOTES.md

@@ -1,9 +1,19 @@
+## v1.3.0
+
+* Add partial JSON and YAML support.
+* Script moved from bin to exe directory.
+* Provide `fp` fancy print alias for convenience in shell.
+* Command renames: 'lsp' -> 'prefnets', 'rm' -> 'rmprefnets'
+* Add 'availnets' command for list of unique available network names.
+
+
 ## v1.2.0
 
 * Fix: protect against using command strings shorter than minimum length
       (e.g. 'c', when more chars are necessary to disambiguate multiple commands).
 * Improvements in help text and readme.
 
+
 ## v1.1.0
 
 * Sort available networks alphabetically, left justify ssid's.

data/{bin → exe}/mac-wifi

@@ -19,14 +19,13 @@
 # License: MIT License
 
 
-
 require 'shellwords'
 require 'tempfile'
 
 module MacWifi
 
 # This version must be kept in sync with the version in the gemspec file.
-VERSION = '1.2.0'
+VERSION = '1.3.0'
 
 
 class BaseModel
@@ -184,11 +183,16 @@ class BaseModel
 
 
   # Waits for the Internet connection to be in the desired state.
-  # @param status must be in [:conn, :disc, :off, :on]; waits for that state
-  # @param wait_interval_in_secs sleeps this interval between retries
+  # @param target_status must be in [:conn, :disc, :off, :on]; waits for that state
+  # @param wait_interval_in_secs sleeps this interval between retries; if nil or absent,
+  #        a default will be provided
   #
-  def till(status, wait_interval_in_secs = nil)
+  def till(target_status, wait_interval_in_secs = nil)
 
+    # One might ask, why not just put the 0.5 up there as the default argument.
+    # We could do that, but we'd still need the line below in case nil
+    # was explicitly specified. The default argument of nil above emphasizes that
+    # the absence of an argument and a specification of nil will behave identically.
     wait_interval_in_secs ||= 0.5
 
     finished_predicates = {
@@ -198,10 +202,11 @@ class BaseModel
         off:  -> { ! wifi_on? }
     }
 
-    finished_predicate = finished_predicates[status]
+    finished_predicate = finished_predicates[target_status]
 
     if finished_predicate.nil?
-      raise ArgumentError.new("Option must be one of #{finished_predicates.keys.inspect}. Was: #{status.inspect}")
+      raise ArgumentError.new(
+          "Option must be one of #{finished_predicates.keys.inspect}. Was: #{target_status.inspect}")
     end
 
     loop do
@@ -280,10 +285,21 @@ class MacOsModel < BaseModel
         return [reformat_line.(header_line)] + data_lines
       end
     end
+
+
     raise "Unable to get available network information after #{max_attempts} attempts."
   end
 
 
+  # @return an array of unique available network names only, sorted alphabetically
+  def available_network_names
+    available_network_info[1..-1] \
+        .map { |line| line[0..32].rstrip } \
+        .uniq \
+        .sort { |s1, s2| s1.casecmp(s2) }
+  end
+
+
   # Returns data pertaining to "preferred" networks, many/most of which will probably not be available.
   def preferred_networks
     lines = run_os_command("networksetup -listpreferredwirelessnetworks #{wifi_hardware_port}").split("\n")
@@ -445,7 +461,7 @@ end
 
 class CommandLineInterface
 
-  attr_reader :model
+  attr_reader :model, :interactive_mode
 
   class Command < Struct.new(:min_string, :max_string, :action); end
 
@@ -461,26 +477,28 @@ class CommandLineInterface
   HELP_TEXT = "
 mac-wifi version #{VERSION} -- Available commands are:
 
-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
-h[elp]                  - prints this help
-i[nfo]                  - prints wifi-related information
-lsp[referred]           - lists preferred (not necessarily available) networks
-lsa[vailable]           - lists available networks
-n[etwork_name]          - name (SSID) of currently connected network
-on                      - turns wifi on
-of[f]                   - turns wifi off
-pa[ssword] network-name - shows password for preferred network-name
-q[uit]                  - exits this program (interactive shell mode only)
-r[m] network-name       - removes network-name from the preferred networks list
-s[hell]                 - opens an interactive pry shell (command line only)
-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)
-w[ifion]                - is the wifi on?
-x[it]                   - exits this program (interactive shell mode only)
+a[vailnets]               - array of names of the available networks
+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
+h[elp]                    - prints this help
+i[nfo]                    - a hash of wifi-related information
+l[savailnets]             - details about available networks
+n[etwork_name]            - name (SSID) of currently connected network
+on                        - turns wifi on
+of[f]                     - turns wifi off
+pa[ssword] network-name   - password for preferred network-name
+pr[efnets]                - preferred (not necessarily available) networks
+q[uit]                    - exits this program (interactive shell mode only) (see also 'x')
+r[mprefnets] network-name - removes network-name from the preferred networks list
+                            (can provide multiple names separated by spaces)
+s[hell]                   - opens an interactive pry shell (command line only)
+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)
+w[ifion]                  - is the wifi on?
+x[it]                     - exits this program (interactive shell mode only) (see also 'q')
 
 When in interactive shell mode:
     * use quotes for string parameters such as method names.
@@ -495,6 +513,8 @@ When in interactive shell mode:
   end
 
 
+  # Until command line option parsing is added, the only way to specify
+  # verbose mode is in the environment variable MAC_WIFI_OPTS.
   def verbose_mode
     /-v/.match(ENV['MAC_WIFI_OPTS'])
   end
@@ -505,9 +525,10 @@ When in interactive shell mode:
   end
 
 
+  # @return true if awesome_print is available (after requiring it), else false after requiring 'pp'.
   # We'd like to use awesome_print if it is available, but not require it.
-  # So, we try to require it, but if that fails, we fall back to using pp (pretty print).
-  # Returns true if awesome_print is available (after requiring it), else false after requiring 'pp'.
+  # So, we try to require it, but if that fails, we fall back to using pp (pretty print),
+  # which is included in Ruby distributions without the need to install a gem.
   def awesome_print_available?
     if @awesome_print_available.nil?  # first time here
       begin
@@ -523,8 +544,19 @@ When in interactive shell mode:
   end
 
 
+  def fancy_string(object)
+    awesome_print_available? ? object.ai : object.pretty_inspect
+  end
+
+
   def fancy_puts(object)
-    awesome_print_available? ? ap(object) : pp(object)
+    puts fancy_string(object)
+  end
+  alias_method :fp, :fancy_puts
+
+
+  def puts_unless_interactive(string)
+    puts(string) unless interactive_mode
   end
 
 
@@ -549,13 +581,17 @@ When in interactive shell mode:
   # Runs a pry session in the context of this object.
   # Commands and options specified on the command line can also be specified in the shell.
   def run_shell
-    if @interactive_mode
+    if interactive_mode
       puts "Already in shell."
       return
     end
 
     @interactive_mode = true
 
+    # For conveniently calling to_json or to_yaml on an object:
+    require 'json'
+    require 'yaml'
+
     begin
       require 'pry'
     rescue LoadError
@@ -579,22 +615,14 @@ When in interactive shell mode:
   end
 
 
-  def output_network_password(network_name, password)
-    output =  %Q{Preferred network "#{network_name}" }
-    output << (password ? %Q{stored password is: "#{password}".} : "has no stored password.")
-    puts output
-    password
-  end
-
-
   # For use by the shell; when typing a command and options, it is passed to process_command_line
   def method_missing(method_name, *options)
     method_name = method_name.to_s
-    method_valid = !! find_command_action(method_name)
-    if method_valid
+    method_exists = !! find_command_action(method_name)
+    if method_exists
       process_command_line(method_name, options)
     else
-      puts(%Q{"#{method_name}" is not a valid command or option. If you intend for this to be a string literal, use quotes.})
+      puts(%Q{"#{method_name}" is not a valid command or option. If you intend for this to be a string literal, use quotes or %q/Q{}.})
     end
   end
 
@@ -602,9 +630,9 @@ When in interactive shell mode:
   # Processes the command (ARGV[0]) and any relevant options (ARGV[1..-1]).
   #
   # CAUTION! In interactive mode, any strings entered (e.g. a network name) MUST
-  # be in a form that Ruby will recognize as a string, i.e. single or double quotes,
-  # %q, %Q, etc. Otherwise Ruby will assume it's a method name and pass it to
-  # method_missing!
+  # be in a form that the Ruby interpreter will recognize as a string,
+  # i.e. single or double quotes, %q, %Q, etc.
+  # Otherwise it will assume it's a method name and pass it to method_missing!
   def process_command_line(command, options)
     action = find_command_action(command)
     if action
@@ -618,7 +646,7 @@ When in interactive shell mode:
 
 
   def quit
-    if @interactive_mode
+    if interactive_mode
       exit(0)
     else
       puts "This command can only be run in shell mode."
@@ -626,9 +654,16 @@ When in interactive shell mode:
   end
 
 
+  def cmd_a
+    info = model.available_network_names
+    puts_unless_interactive(fancy_string(info))
+    info
+  end
+
+
   def cmd_ci
     connected = model.connected_to_internet?
-    puts "Connected to Internet: #{connected}" unless @interactive_mode
+    puts_unless_interactive("Connected to Internet: #{connected}")
     connected
   end
 
@@ -655,30 +690,21 @@ When in interactive shell mode:
 
   def cmd_i
     info = model.wifi_info
-    fancy_puts(info) unless @interactive_mode
+    puts_unless_interactive(fancy_string(info))
     info
   end
 
 
   def cmd_lsa
     info = model.available_network_info
-    puts info unless @interactive_mode
+    puts_unless_interactive(fancy_string(info))
     info
   end
 
 
-  def cmd_lsp
-    networks = model.preferred_networks
-    puts networks unless @interactive_mode
-    networks
-  end
-
-
   def cmd_n
     name = model.connected_network_name
-    unless @interactive_mode
-      puts "Network (SSID) name: #{name ? name : '[none]'}"
-    end
+    puts_unless_interactive("Network (SSID) name: #{name ? name : '[none]'}")
     name
   end
 
@@ -695,11 +721,24 @@ When in interactive shell mode:
 
   def cmd_pa(network)
     password = model.preferred_network_password(network)
-    output_network_password(network, password) unless @interactive_mode
+
+    unless interactive_mode
+      output =  %Q{Preferred network "#{network_name}" }
+      output << (password ? %Q{stored password is: "#{password}".} : "has no stored password.")
+      puts output
+    end
+
     password
   end
 
 
+  def cmd_pr
+    networks = model.preferred_networks
+    puts_unless_interactive(fancy_string(networks))
+    networks
+  end
+
+
   def cmd_q
     quit
   end
@@ -724,7 +763,7 @@ When in interactive shell mode:
 
   def cmd_w
     on = model.wifi_on?
-    puts "Wifi on: #{on}" unless @interactive_mode
+    puts_unless_interactive("Wifi on: #{on}")
     on
   end
 
@@ -736,20 +775,21 @@ When in interactive shell mode:
 
   def commands
     @commands_ ||= [
+        Command.new('a',   'availnets',    -> (*_options) { cmd_a             }),
         Command.new('ci',  'ci',           -> (*_options) { cmd_ci            }),
         Command.new('co',  'connect',      -> (*options)  { cmd_co(*options)  }),
         Command.new('cy',  'cycle',        -> (*_options) { cmd_cy            }),
         Command.new('d',   'disconnect',   -> (*_options) { cmd_d             }),
         Command.new('h',   'help',         -> (*_options) { cmd_h             }),
         Command.new('i',   'info',         -> (*_options) { cmd_i             }),
-        Command.new('lsa', 'lsavailable',  -> (*_options) { cmd_lsa           }),
-        Command.new('lsp', 'lspreferred',  -> (*_options) { cmd_lsp           }),
+        Command.new('l',   'lsavailnets',  -> (*_options) { cmd_lsa           }),
         Command.new('n',   'network_name', -> (*_options) { cmd_n             }),
         Command.new('of',  'off',          -> (*_options) { cmd_of            }),
         Command.new('on',  'on',           -> (*_options) { cmd_on            }),
         Command.new('pa',  'password',     -> (*options)  { cmd_pa(*options)  }),
+        Command.new('pr',  'prefnets',     -> (*_options) { cmd_pr            }),
         Command.new('q',   'quit',         -> (*_options) { cmd_q             }),
-        Command.new('r',   'rm',           -> (*options)  { cmd_r(*options)   }),
+        Command.new('r',   'rmprefnets',   -> (*options)  { cmd_r(*options)   }),
         Command.new('s',   'shell',        -> (*_options) { cmd_s             }),
         Command.new('t',   'till',         -> (*options)  { cmd_t(*options)   }),
         Command.new('w',   'wifion',       -> (*_options) { cmd_w             }),
@@ -774,65 +814,86 @@ When in interactive shell mode:
     begin
       process_command_line(ARGV[0], ARGV[1..-1])
     rescue BadCommandError => error
-      separator_line = "#{'!' * 79}\n"
+      separator_line = "! #{'-' * 75} !\n"
       puts '' << separator_line << error.to_s << "\n" << separator_line
       exit(-1)
     end
   end
 end
-end
 
 
+class Main
 
-# @return true if this file is being run as a script, else false
-#
-# This file could be called as a script in either of these two ways:
-#
-# 1) by loading this file directly, or
-# 2) by running as a gem executable's binstub, in (relatively) '../../../bin'
-#
-# For example, I get this when running this file as a gem:
-# __FILE__ = /Users/kbennett/.rvm/gems/ruby-2.4.0/gems/mac-wifi-1.0.0/bin/mac-wifi
-# $0 =       /Users/kbennett/.rvm/gems/ruby-2.4.0/bin/mac-wifi
-# GEM_PATH = /Users/kbennett/.rvm/gems/ruby-2.4.0:/Users/kbennett/.rvm/gems/ruby-2.4.0@global
+  # @return true if this file is being run as a script, else false
+  #
+  # This file could be called as a script in either of these two ways:
+  #
+  # 1) by loading this file directly, or
+  # 2) by running as a gem executable's binstub, in (relatively) '../../../exe'
+  #
+  # For example, I get this when running this file as a gem and running:
+  #
+  # puts "$0: #{$0}"
+  # puts "__FILE__: #{__FILE__}"
+  # puts "GEM_PATH: #{ENV['GEM_PATH']}"
+  #
+  # $0: /Users/kbennett/.rvm/gems/ruby-2.4.1/bin/mac-wifi
+  # __FILE__: /Users/kbennett/.rvm/gems/ruby-2.4.1/gems/mac-wifi-1.2.0/exe/mac-wifi
+  # GEM_PATH: /Users/kbennett/.rvm/gems/ruby-2.4.1:/Users/kbennett/.rvm/gems/ruby-2.4.1@global
 
-def running_as_script?
 
-  this_file = File.expand_path(__FILE__)
-  main_file = File.expand_path($0)
+  def running_as_script?
 
-  this_file_basename = File.basename(this_file)
-  main_file_basename = File.basename(main_file)
+    this_source_file = File.expand_path(__FILE__)
+    called_file      = File.expand_path($0)
+    return true if called_file == this_source_file
 
-  # Please enable this code and report its output if you report any issues with this method:
-  # puts "__FILE__ = #{this_file}"
-  # puts "$0 =       #{main_file}"
-  # puts "GEM_PATH = #{ENV['GEM_PATH']}"
+    this_source_file_basename = File.basename(this_source_file)
+    called_file_basename      = File.basename(called_file)
+    return false if called_file_basename != this_source_file_basename
 
-  return true if main_file == this_file
-  return false if main_file_basename != this_file_basename
+    # If here, then filespecs are different but have the same basename.
+    gem_roots = ENV['GEM_PATH'].split(File::PATH_SEPARATOR)
+    as_script = gem_roots.any? do |gem_root|
+      binstub_candidate_name = File.join(gem_root, 'bin', called_file_basename)
+      up_4_from_this_source_file = File.expand_path(File.join(this_source_file, '..', '..', '..', '..'))
+      found = ($0 == binstub_candidate_name) && (gem_root == up_4_from_this_source_file)
+      found
+    end
 
-  # If here, then filespecs are different but have the same basename.
-  gem_paths = ENV['GEM_PATH'].split(File::PATH_SEPARATOR)
-  gem_paths.any? do |path|
-    path_plus_basename = File.join(path, 'bin', main_file_basename)
-    __file__up_4 = File.expand_path(File.join(this_file, '..', '..', '..', '..'))
-    ($0 == path_plus_basename) && (path == __file__up_4)
+    as_script
   end
-end
 
 
-def assert_os_is_mac_os
-  unless /darwin/ === RbConfig::CONFIG["host_os"]  # e.g. "darwin16.4.0"
-    raise "This program currently works only on Mac OS. Platform is '#{RbConfig::CONFIG["host_os"]}'."
+  def assert_os_is_mac_os
+    host_os = RbConfig::CONFIG["host_os"]
+    unless /darwin/.match(host_os)  # e.g. "darwin16.4.0"
+      raise "This program currently works only on Mac OS. Platform is '#{host_os}'."
+    end
   end
-end
 
-assert_os_is_mac_os
 
-# If this file is being called as a script, run it.
-# Else, it may be loaded to use the model in a different way.
-if running_as_script?
-  MacWifi::CommandLineInterface.new.call
+  def call
+    assert_os_is_mac_os
+
+    # If this file is being called as a script, run it.
+    # Else, it may be loaded to use the model in a different way.
+    if running_as_script?
+      begin
+        MacWifi::CommandLineInterface.new.call
+      rescue => error
+        puts error
+        stack_trace_filename = './mac-wifi-error-stack-trace.txt'
+        File.write(stack_trace_filename, caller.join("\n"))
+        puts "Exiting. Stack trace written to '#{File.expand_path(stack_trace_filename)}'."
+        exit(-1)
+      end
+    end
+  end
 end
 
+
+end # module MacWifi
+
+
+MacWifi::Main.new.call

data/mac-wifi.gemspec

@@ -1,6 +1,6 @@
 # coding: utf-8
 # When changing the version, also change the version and the help text in the README.
-VERSION = '1.2.0'
+VERSION = '1.3.0'
 
 Gem::Specification.new do |spec|
   spec.name          = "mac-wifi"
@@ -13,13 +13,14 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  # spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  # spec.require_paths = ['lib']
 
-  # spec.add_development_dependency "bundler", "~> 1.3"
-  # spec.add_development_dependency "rake", '~> 10.1'
-  # spec.add_development_dependency "rspec", '~> 3.0'
+  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
 
 end
 

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mac-wifi
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Keith Bennett
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
-dependencies: []
+date: 2017-12-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: A command line interface for managing wifi on a Mac.
 email:
 - keithrbennett@gmail.com
@@ -23,7 +65,7 @@ files:
 - LICENSE.txt
 - README.md
 - RELEASE_NOTES.md
-- bin/mac-wifi
+- exe/mac-wifi
 - mac-wifi.gemspec
 - spec/mac-wifi_spec.rb
 homepage: https://github.com/keithrbennett/mac-wifi
@@ -46,9 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Mac wifi utility
-test_files:
-- spec/mac-wifi_spec.rb
+test_files: []