wifi-wand 2.17.1 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d83a3c01e4c458c0aa5d1aca6dbb2973b262988adc0c1c4613b0ec7b7f77961
-  data.tar.gz: 2a7fb69d769c652a91ac114a618aec32ac40642402e849323d0e784bc2c55699
+  metadata.gz: b3d9a52dffd83c2be845f91172481ee2df4c140d188c3374573f9c76cb43d199
+  data.tar.gz: 2962e28498baa51617b5ec42b65304065c1e4aaafd109f2de3e3da1ba8ffde30
 SHA512:
-  metadata.gz: 85e9a23e55f3457070282a38895923a650bd7a21af55969d53bfe0a9836caa7d4a752b977439234fb5aea5963f3df011793c3c6bca7276e84267b5e224a065b9
-  data.tar.gz: 4629fe47da129ac640f4ee1a9520cac6a22d55da0ec75c74e3c584b7988e90c9d85c4bf68c85c98174ea6ebf9916d68791fee8639c86aded66a029a172bbf32d
+  metadata.gz: 23a13c3964972c417dd20131718cb5614ad5a1bfccdd30ee2a52173fd0761ebe40981bd4b11e6c8808dfb3aaefc0a0178ccd8fad8d247fd6413776676af5bf3e
+  data.tar.gz: 603dbd8e5eb821df3b42112eac3c5ba92b92e953a2913a56b813190491a69b8a4a91172a2963b05f350bf65340bd007332f63e0e94601130862316970cfafeef

data/RELEASE_NOTES.md

@@ -1,3 +1,13 @@
+## 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).
+
+
 ## v2.17.1
 
 * Fix verbose output for running a Swift command. 

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
 
@@ -130,13 +111,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 +145,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."
@@ -286,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.nil?
+
+    command_output.split('SSID :').last.strip
   end
 
 
@@ -187,12 +198,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,
@@ -201,7 +209,7 @@ 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
@@ -309,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.17.1' unless defined?(VERSION)
+  VERSION = '2.19.0' 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,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: wifi-wand
 version: !ruby/object:Gem::Version
-  version: 2.17.1
+  version: 2.19.0
 platform: ruby
 authors:
 - Keith Bennett
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-26 00:00:00.000000000 Z
+date: 2024-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -19,7 +20,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
-  name: awesome_print
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,12 +31,26 @@ 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.14.2
+        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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,12 +59,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.2
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.9
-  name: bundler
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,12 +73,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.5.9
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 13.2.1
-  name: rake
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -73,6 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 13.2.1
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +96,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
-  name: rspec
   type: :development
   prerelease: false
   version_requirements: !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