wifi-wand 2.18.0 → 2.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3618e39101d073349d544a930672b436ed2da7d3c622689e9e8203424ddd44d
-  data.tar.gz: c99cb63e34ff7823a7c56c95d0483e1483dcae26df62718fcf01f4cc00dd0ca8
+  metadata.gz: b9da3f2d69b3deb5046f7ea3394a43235733d9784c41bf372febdcca09c5d15d
+  data.tar.gz: 63f83f663cb0ad11f8fe5087aeda730e8dcd4a5108dad4b84c653d37cd2cd21e
 SHA512:
-  metadata.gz: f07b8f1498aa244c54a1f8d5be2b78f14e3e4c83191426afd38dec01c735e023182bd5192dd7e64e08b1364620889d5d2a7b9b0d228be51dd51778f5f457c2e9
-  data.tar.gz: 795b4bfba2b4a5b5d425caeef7875a68a76886f6672b694265c70caf835b624d38cbc10fd82a89835cf1b8efa19eed9cae523c35b4d5696f74b9743789711b51
+  metadata.gz: 0be501742d8ad2e8ac317bf622b6f448af53293a8b90e563768aba12cf49a79488b3e8897928300be1150c6d021aa531c2fb809db0e9ff1346813268b347693c
+  data.tar.gz: a645d6e65afb64c19bbca0dd3443fc1b92067084897384df8da330df876093bfd5906b754dc18826b59810aeab65050dc9a64918692a4f291361ada7f87a9b2c

data/RELEASE_NOTES.md

@@ -1,3 +1,14 @@
+## v2.19.1
+
+* Fix connected_network_name when wifi is on but no network is connected.
+
+
+## v2.19.0
+
+* Replace `networksetup` with Swift script for connecting to a network.
+* For getting connected network name, replace `networksetup` with `ipconfig`. 
+
+
 ## v2.18.0
 
 * Remove 'hotspot_login_required' informational item and logic (was not working correctly).

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

@@ -11,25 +11,6 @@ class BaseModel
 
   attr_accessor :wifi_interface, :verbose_mode
 
-  class OsCommandError < RuntimeError
-    attr_reader :exitstatus, :command, :text
-
-    def initialize(exitstatus, command, text)
-      @exitstatus = exitstatus
-      @command = command
-      @text = text
-    end
-
-    def to_s
-      "#{self.class.name}: Error code #{exitstatus}, command = #{command}, text = #{text}"
-    end
-
-    def to_h
-      { exitstatus: exitstatus, command: command, text: text }
-    end
-  end
-
-
   def initialize(options)
     @verbose_mode = options.verbose
 
@@ -274,5 +255,23 @@ class BaseModel
   def wifi_interface
     @wifi_interface ||= detect_wifi_interface
   end
+
+  class OsCommandError < RuntimeError
+    attr_reader :exitstatus, :command, :text
+
+    def initialize(exitstatus, command, text)
+      @exitstatus = exitstatus
+      @command = command
+      @text = text
+    end
+
+    def to_s
+      "#{self.class.name}: Error code #{exitstatus}, command = #{command}, text = #{text}"
+    end
+
+    def to_h
+      { exitstatus: exitstatus, command: command, text: text }
+    end
+  end
 end
 end

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

@@ -96,7 +96,7 @@ class MacOsModel < BaseModel
 
 
   # This method is called by BaseModel#connect to do the OS-specific connection logic.
-  def os_level_connect(network_name, password = nil)
+  def os_level_connect_using_networksetup(network_name, password = nil)
     command = "networksetup -setairportnetwork #{wifi_interface} #{Shellwords.shellescape(network_name)}"
     if password
       command << ' ' << Shellwords.shellescape(password)
@@ -104,6 +104,17 @@ class MacOsModel < BaseModel
     run_os_command(command)
   end
 
+  def os_level_connect_using_swift(network_name, password = nil)
+    ensure_swift_and_corewlan_present
+    args = [Shellwords.shellescape(network_name)]
+    args << Shellwords.shellescape(password) if password
+    run_swift_command('WifiNetworkConnecter', *args)
+  end
+
+  def os_level_connect(network_name, password = nil)
+    os_level_connect_using_swift(network_name, password)
+  end
+
 
   # @return:
   #   If the network is in the preferred networks list
@@ -151,10 +162,10 @@ class MacOsModel < BaseModel
   def connected_network_name
     return nil unless wifi_on? # no need to try
 
-    command_output = run_os_command("networksetup -getairportnetwork #{wifi_interface}")
-    connected_prefix = 'Current Wi-Fi Network: '
-    connected = Regexp.new(connected_prefix).match?(command_output)
-    connected ? command_output.split(connected_prefix).last.chomp : nil
+    command_output = run_os_command("ipconfig getsummary #{wifi_interface} | grep ' SSID :'", false)
+    return nil if command_output.empty?
+
+    command_output.split('SSID :').last.strip
   end
 
 
@@ -306,12 +317,12 @@ class MacOsModel < BaseModel
     system("swift -e 'import CoreWLAN' >/dev/null 2>&1")
   end
 
-  def run_swift_command(basename)
+
+  def run_swift_command(basename, *args)
     ensure_swift_and_corewlan_present
-    swift_filespec = File.join(
-      File.dirname(__FILE__), "../../../swift/#{basename}.swift"
-    )
-    command = "swift #{swift_filespec}"
+    swift_filespec = File.absolute_path(File.join(File.dirname(__FILE__), "../../../swift/#{basename}.swift"))
+    argv = ['swift', swift_filespec] + args
+    command = argv.compact.join(' ')
     run_os_command(command)
   end
 end

data/lib/wifi-wand/version.rb

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

data/swift/WifiNetworkConnecter.swift

@@ -0,0 +1,57 @@
+#!/usr/bin/env swift
+
+import Foundation
+import CoreWLAN
+
+// Function to connect to a network
+func connectToNetwork(ssid: String, password: String?) -> Bool {
+    guard let interface = CWWiFiClient.shared().interface() else {
+        print("Error: Could not get WiFi interface")
+        exit(1)
+    }
+
+    do {
+        // Scan for networks
+        let networks = try interface.scanForNetworks(withSSID: ssid.data(using: .utf8))
+        guard let network = networks.first else {
+            print("Error: Network not found")
+            exit(1)
+        }
+
+        // Connect to the network
+        try interface.associate(to: network, password: password)
+        return true
+    } catch let error as NSError {
+        // Handle specific error cases
+        switch error.code {
+        case -3931: // Already connected
+            print("Already connected to network")
+            return true
+        case -3906: // Invalid password
+            print("Error: Invalid password")
+        case -3905: // Network not found
+            print("Error: Network not found")
+        case -3908: // Timeout
+            print("Error: Connection timeout")
+        case -3903: // Authentication failed
+            print("Error: Authentication failed - might require captive portal login")
+        default:
+            print("Error connecting: \(error.localizedDescription) (code: \(error.code))")
+        }
+        exit(1)
+    }
+}
+
+// Parse command line arguments
+if CommandLine.arguments.count < 2 {
+    print("Usage: \(CommandLine.arguments[0]) SSID [password]")
+    exit(1)
+}
+
+let ssid = CommandLine.arguments[1]
+let password = CommandLine.arguments.count > 2 ? CommandLine.arguments[2] : nil
+
+if connectToNetwork(ssid: ssid, password: password) {
+    print("ok")
+    exit(0)
+}

data/swift/WifiNetworkDisconecter.swift

@@ -8,6 +8,6 @@ if let wifiInterface = CWWiFiClient.shared().interface() {
     print("ok")
     exit(0)
 } else {
-    print("error")
+    print("Failed to disconnect. One possible reason: XCode not installed.")
     exit(1)
 }

data/wifi-wand.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |spec|
   # spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.add_dependency('awesome_print', '>= 1.9.2', '< 2')
 
+  # ostruct will no longer be part of the default gems starting from Ruby 3.5.0.
+  spec.add_dependency('ostruct')
+
   # still on version 0, no need to exclude future versions, but need bug fix for pry not pry'ing
   # on last line of method:
   spec.add_dependency('pry', '>= 0.14.2')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wifi-wand
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.19.1
 platform: ruby
 authors:
 - Keith Bennett
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-09 00:00:00.000000000 Z
+date: 2024-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +149,7 @@ files:
 - sample-available-networks.yaml
 - spec/wifi-wand/models/base_model_spec.rb
 - swift/AvailableWifiNetworkLister.swift
+- swift/WifiNetworkConnecter.swift
 - swift/WifiNetworkDisconecter.swift
 - test-data/invalid-byte-sequence-network-names.txt
 - wifi-wand.gemspec
@@ -157,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Mac WiFi utility