wifi-wand 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dcc159a696bb6c5802164faa4364c372d12478c38027cc0cef1b8efcd28f4a8
-  data.tar.gz: f6dcd8a61c97e38c6fe1cd35d6e1c46a5112993c9e3d319dbcd6cc6105b6c963
+  metadata.gz: a9019eb4d32759d13110c74b96015eced6ee71a3536c1b9690da24d3a54e812d
+  data.tar.gz: b5e805734cf53495aaeab2e1c67c7bb8104af0759980e2836d14c115dd15e5be
 SHA512:
-  metadata.gz: f2e6bf5a8ad731631e464826ec096a5ba10e61111aab1ca66232a5f1453ea98d26c0e3b5a670d754f6ff16d0829b9b4177a5276def708f3fe0be6d9385cbe6f5
-  data.tar.gz: aee01f531189ace41937a7722a413873018792e9a2e161b8dd2634e87c1952763c85f7648ed7b7ac0d0d7b0b205955f70143aaa67f9961abd21eed69176647f9
+  metadata.gz: 87872063dd2b7d1093a9340263ca742f2006d337dd43c6f2d30a4e12ba9985c3315b6072c9eb2d234f2b75e9b523d8f688a95f890e2feb7e567e4be7904a6bc7
+  data.tar.gz: 9e84a5e8a3a69d425e6c7982571daf3f497e43b845cb5fc663b6c59227af2fda116e6196ad555df0b91b2cca9ed15086c8146052ac4c4e0613b3680ab21ca3de

data/README.md

@@ -28,7 +28,7 @@ output at the time of this writing:
 ```
 $ wifi-wand -h
 
-Command Line Switches:                    [wifi-wand version 2.6.0]
+Command Line Switches:                    [wifi-wand version 2.7.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

data/RELEASE_NOTES.md

@@ -1,3 +1,12 @@
+## v2.7.0
+
+* Fix models not being loadable after requiring the gem.
+* Add message suggesting to gem install awesome_print to help text if not installed.
+* Add Github project page URL to help text.
+* Rename 'wifion' to 'wifi_on'.
+* Change order of verbose output and error raising in run_os_commmand.
+
+
 ## v2.6.0
 
 * Add support for getting and setting DNS nameservers with 'na'/'nameservers' command.

data/lib/wifi-wand.rb

@@ -1,3 +1,8 @@
 require_relative 'wifi-wand/version'
 
-require_relative 'wifi-wand/main'  # recursively requires the other files
+require_relative 'wifi-wand/main'  # recursively requires the other files
+#
+# When additional operating systems are added, we will need to modify this
+# to load only the model appropriate for the environment:
+
+require_relative 'wifi-wand/models/mac_os_model'

data/lib/wifi-wand/command_line_interface.rb

@@ -50,7 +50,7 @@ class CommandLineInterface
 
   # Help text to be used when requested by 'h' command, in case of unrecognized or nonexistent command, etc.
   HELP_TEXT = "
-Command Line Switches:                    [wifi-wand version #{WifiWand::VERSION}]
+Command Line Switches:                    [wifi-wand version #{WifiWand::VERSION} 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
@@ -97,6 +97,11 @@ When in interactive shell mode:
         verbose:   options.verbose,
         wifi_port: options.wifi_port
     })
+
+    unless awesome_print_available?
+      HELP_TEXT << "For nicer output, `gem install awesome_print`.\n\n"
+    end
+
     @model = current_os.create_model(model_options)
     @interactive_mode = !!(options.interactive_mode)
     run_shell if @interactive_mode
@@ -371,6 +376,7 @@ When in interactive shell mode:
     end
   end
 
+
   def cmd_pa(network)
     password = model.preferred_network_password(network)
 
@@ -460,7 +466,7 @@ When in interactive shell mode:
         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',   'wifion',        -> (*_options) { cmd_w             }),
+        Command.new('w',   'wifi_on',       -> (*_options) { cmd_w             }),
         Command.new('x',   'xit',           -> (*_options) { cmd_x             })
     ]
   end
@@ -483,7 +489,6 @@ When in interactive shell mode:
   end
 
 
-
   def post_processor
     options.post_processor
   end

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

@@ -40,15 +40,15 @@ class BaseModel
 
     output = `#{command} 2>&1` # join stderr with stdout
 
-    if $?.exitstatus != 0 && raise_on_error
-      raise OsCommandError.new($?.exitstatus, command, output)
-    end
-
     if @verbose_mode
       puts "\n\n#{'-' * 79}\nCommand: #{command}\n\n"
       puts "#{output}#{'-' * 79}\n\n"
     end
 
+    if $?.exitstatus != 0 && raise_on_error
+      raise OsCommandError.new($?.exitstatus, command, output)
+    end
+
     output
   end
 

data/lib/wifi-wand/os/imaginary_os.rb

@@ -1,3 +1,6 @@
+# This class is intended as a placeholder class to test multiple OS support
+# until we have a real Os class for an additional OS.
+
 require_relative 'base_os'
 
 module WifiWand

data/lib/wifi-wand/version.rb

@@ -1,5 +1,5 @@
 module WifiWand
 
-  VERSION = '2.6.0'
+  VERSION = '2.7.0'
 
 end

metadata

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