wifi-wand 2.17.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71b05a8e0debe969871ce1c44e2a5497458b970f7cf6d666d2035448636f194b
-  data.tar.gz: 3decf9e34a5aaca2b0d1de7ccb91a93138b002d755c648d0975ca0164a48624d
+  metadata.gz: d3618e39101d073349d544a930672b436ed2da7d3c622689e9e8203424ddd44d
+  data.tar.gz: c99cb63e34ff7823a7c56c95d0483e1483dcae26df62718fcf01f4cc00dd0ca8
 SHA512:
-  metadata.gz: 57fa874a6588a7a03862a2397f172374a3203e27fb0694623a6385a1743d195e1899393705cb6ef2133448e402fdf09a8fd4cebb19dfd67fa16d367addaa9a99
-  data.tar.gz: 37b6a84124163b57e1a6922f7703dac69bb8ebcddf6c3ac5d4e056404b4a224b27f1a98505f09c798586df6e0a8cd6a6564664775f48742dd28d90d8dbf6f00a
+  metadata.gz: f07b8f1498aa244c54a1f8d5be2b78f14e3e4c83191426afd38dec01c735e023182bd5192dd7e64e08b1364620889d5d2a7b9b0d228be51dd51778f5f457c2e9
+  data.tar.gz: 795b4bfba2b4a5b5d425caeef7875a68a76886f6672b694265c70caf835b624d38cbc10fd82a89835cf1b8efa19eed9cae523c35b4d5696f74b9743789711b51

data/RELEASE_NOTES.md

@@ -1,3 +1,15 @@
+## v2.18.0
+
+* Remove 'hotspot_login_required' informational item and logic (was not working correctly).
+
+
+## v2.17.1
+
+* Fix verbose output for running a Swift command. 
+* Exit Swift programs with code 1 on error.
+* Remove rexml dependency, no longer needed.
+
+
 ## v2.17.0
 
 * Remove all remaining uses of the 'airport' command.

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

@@ -130,13 +130,6 @@ class BaseModel
   end
 
 
-  def hotspot_login_required
-    response_text = run_os_command('curl --max-time 3 http://captive.apple.com', false)
-    required = ['Error', '302', 'Hotspot login required'].all? { |s| response_text.include?(s) }
-    required
-  end
-
-
   # Turns wifi off and then on, reconnecting to the originally connecting network.
   def cycle_network
     # TODO: Make this network name saving and restoring conditional on it not having a password.
@@ -171,12 +164,7 @@ class BaseModel
     # Verify that the network is now connected:
     actual_network_name = connected_network_name
 
-    if actual_network_name == network_name
-      if hotspot_login_required
-        puts "Hotspot login required. Opening browser to captive.apple.com."
-        `open https://captive.apple.com`
-      end
-    else
+    unless actual_network_name == network_name
       message = %Q{Expected to connect to "#{network_name}" but }
       if actual_network_name.nil? || actual_network_name.empty?
         message << "unable to connect to any network."

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

@@ -1,6 +1,5 @@
 require 'ipaddr'
 require 'ostruct'
-require 'rexml/document'
 require 'shellwords'
 
 require_relative 'base_model'
@@ -188,12 +187,9 @@ class MacOsModel < BaseModel
       false
     end
 
-    need_hotspot_login = hotspot_login_required
-
     info = {
         'wifi_on'     => wifi_on?,
         'internet_on' => connected,
-        'hotspot_login_required' => need_hotspot_login,
         'interface'   => wifi_interface,
         'network'     => connected_network_name,
         'ip_address'  => ip_address,
@@ -202,12 +198,15 @@ class MacOsModel < BaseModel
         'timestamp'   => Time.now,
     }
 
-    if info['internet_on'] && (! need_hotspot_login)
+    if info['internet_on']
       begin
         info['public_ip'] = public_ip_address_info
       rescue => e
-        puts "Error obtaining public IP address info, proceeding with everything else:"
-        puts e.to_s
+        puts <<~MESSAGE
+          #{e.class} obtaining public IP address info, proceeding with everything else. Error message:
+          #{e}
+
+        MESSAGE
       end
     end
     info
@@ -313,7 +312,7 @@ class MacOsModel < BaseModel
       File.dirname(__FILE__), "../../../swift/#{basename}.swift"
     )
     command = "swift #{swift_filespec}"
-    `#{command}`
+    run_os_command(command)
   end
 end
 end

data/lib/wifi-wand/version.rb

@@ -1,3 +1,3 @@
 module WifiWand
-  VERSION = '2.17.0' unless defined?(VERSION)
+  VERSION = '2.18.0' unless defined?(VERSION)
 end

data/swift/AvailableWifiNetworkLister.swift

@@ -2,10 +2,11 @@
 
 import Foundation
 import CoreWLAN
+import Darwin
 
 class NetworkScanner {
     var currentInterface: CWInterface
-    
+
     init?() {
         // Initialize with the default Wi-Fi interface
         guard let defaultInterface = CWWiFiClient.shared().interface(),
@@ -14,7 +15,7 @@ class NetworkScanner {
         }
         self.currentInterface = defaultInterface
     }
-    
+
     func available_networks() {
         do {
             let networks = try currentInterface.scanForNetworks(withName: nil)
@@ -23,8 +24,9 @@ class NetworkScanner {
             }
         } catch let error as NSError {
             print("Error: \(error.localizedDescription)")
+            exit(1)
         }
     }
 }
 
-NetworkScanner()?.available_networks()
+let _ = NetworkScanner()?.available_networks()

data/wifi-wand.gemspec

@@ -25,8 +25,6 @@ Gem::Specification.new do |spec|
   # on last line of method:
   spec.add_dependency('pry', '>= 0.14.2')
 
-  spec.add_dependency('rexml', '>= 3.2.6', '< 4')
-
   spec.add_development_dependency "bundler", ">= 2.5.9"
   spec.add_development_dependency "rake", ">= 13.2.1"
   spec.add_development_dependency "rspec", ">= 3.13.0", "< 4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wifi-wand
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Keith Bennett
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2024-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -44,26 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.2
-- !ruby/object:Gem::Dependency
-  name: rexml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Mac WiFi utility