ruby_wifi_scanner 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90daf1cf8fb63b5af08330c4685e5031792f730246a1579c4ca8f153ef48a5ec
-  data.tar.gz: 1dd0e27fe74cbe7a0e9ebb7ea7c94815ec79220569a442d350f0e7783c7f1285
+  metadata.gz: 5214504fd208f3dfe71db7013359528894339660a003be86e6a739c9d07f54d8
+  data.tar.gz: fb0ac2e0dde5ceea42d98e04af19fd7e8e1a0251fd2d4c0bdf781d80848c7d6e
 SHA512:
-  metadata.gz: f0f46982d73459444588fb3eb40633f4b1efbac1d6bc93a92585825abe40679823546c185218dd7e43d59fd0662acdf540ad1964b707aa22feca99e2c510092a
-  data.tar.gz: 7b3b431f2a1cd63377d7b392ea99518f31e00e01ade356609b8215fc7cbbeaeb07c14edddff93dc79168524026771848d5c9a93cbbf009288593f42f310045c4
+  metadata.gz: 7c6aba5413ac050e6656be419aba6f48c3981e7bfe7cb481985c41fd3d7e45138d565a5f83a3ee0aeedc66db8545fb2b13e6a29ac0541fbc726b24d920b2a030
+  data.tar.gz: f4bc4d5459f23f6df01c5fa455eb8ad02a3300b3749888aac5d0554cbadd812a8c9258c3f4f269a19ee0b044d8f1c4aa6b9015c4f76dfc8945f2ab4c0a820e18

data/CHANGELOG.md

@@ -1,9 +1,28 @@
+#  (2019-09-17)
+
+
+### Bug Fixes
+
+* Fixed a bug where an unnamed SSID for OS X would cause an error ([b0e38a1](https://github.com/D3MNetworks/ruby-wifi-scanner/commit/b0e38a1))
+* Linux actually works now ([bb21dfb](https://github.com/D3MNetworks/ruby-wifi-scanner/commit/bb21dfb))
+* No longer omitting hidden SSIDs on OS X ([5257451](https://github.com/D3MNetworks/ruby-wifi-scanner/commit/5257451))
+
+
+### Features
+
+* Added filtering on network type and directed scan ([d824c56](https://github.com/D3MNetworks/ruby-wifi-scanner/commit/d824c56))
+* Displaying channel in print_fmt ([8607e3d](https://github.com/D3MNetworks/ruby-wifi-scanner/commit/8607e3d))
+* First release ([6078fa3](https://github.com/D3MNetworks/ruby-wifi-scanner/commit/6078fa3))
+
+
+
 #  (2019-05-27)
 
 
 ### Bug Fixes
 
-* Fixed a bug where an unnamed SSID for OS X would cause an error ([7a42b41](https://github.com/D3MNetworks/ruby-wifi-scanner/commit/7a42b41))
+* Fixed a bug where an unnamed SSID for OS X would cause an error ([b0e38a1](https://github.com/D3MNetworks/ruby-wifi-scanner/commit/b0e38a1))
+* Linux actually works now ([bb21dfb](https://github.com/D3MNetworks/ruby-wifi-scanner/commit/bb21dfb))
 
 
 ### Features

data/exe/rws

@@ -2,6 +2,27 @@
 
 require "bundler/setup"
 require "ruby_wifi_scanner"
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: example.rb [options]"
+
+  opts.on("-d", "--deep", "Run a longer deep scan") do |v|
+    options[:deep] = v
+  end
+
+  opts.on("-f", "--freq=FREQ", "Choose 2 or 5") do |v|
+    options[:freq] = v
+  end
+end.parse!
+
 
 scanner = RubyWifiScanner::Scanner.create
-puts scanner.print_fmt
+
+if options[:deep]
+  scanner.deep_scan
+end
+
+
+puts scanner.print_fmt(options)

data/lib/ruby_wifi_scanner/osx_scanner.rb

@@ -3,13 +3,13 @@ module RubyWifiScanner
 
     protected
 
-    def parse
-      split = raw_scan.split "\n"
+    def parse scan_str
+      split = scan_str.split "\n"
       resp = []
       split[1..-1].each do |row|
         break if row == ""
-        m = row.strip.match(/(?<ssid>\w+)? ?(?<rssi>[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}) (?<level>-?[\d]{1,4})/i)
-        resp << WifiInfo.new(m[:ssid], m[:rssi], m[:level]) if m
+        m = row.strip.match(/(?<ssid>\w*)? ?(?<rssi>[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}) (?<level>-?[\d]{1,4})\s\s(?<channel>[0-9,+-]+)/i)
+        resp << WifiInfo.new(m[:ssid], m[:rssi], m[:level], m[:channel]) if m
       end
       resp.compact
     end
@@ -19,6 +19,15 @@ module RubyWifiScanner
         %x{/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport --scan}
     end
 
+    def directed_scan ssid
+      user = `whoami`.chomp
+      if user == 'root'
+        %x{/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -z --scan='#{ssid}'}
+      else
+        raise 'Deep scan must be ran as root'
+      end
+    end
+
   end
 end
 

data/lib/ruby_wifi_scanner/scanner.rb

@@ -2,7 +2,7 @@ module RubyWifiScanner
   class Scanner
     attr_reader :networks
 
-    WifiInfo = Struct.new(:ssid, :rssi, :level)
+    WifiInfo = Struct.new(:ssid, :rssi, :level, :channel)
 
     def self.create(raw_scan=nil)
       case
@@ -24,15 +24,41 @@ module RubyWifiScanner
 
     def initialize(raw_scan = nil)
       @raw_scan = raw_scan || self.raw_scan
-      @networks = parse.sort_by { |w| -w.level }
+      @networks = parse(@raw_scan).sort_by { |w| -w.level }
     end
 
-    def print_fmt
-      @networks.map do |n|
-        "#{n.rssi}\t#{n.level}\t#{n.ssid}"
+    def deep_scan
+      ssids = @networks.map(&:ssid).uniq
+      @networks = []
+
+      ssids.each do |ssid|
+        @networks += parse directed_scan ssid
       end
     end
 
+    def print_fmt freq: nil, **kargs
+      @networks.select do |n|
+        if freq.nil?
+          true
+        else
+          channel, _ = n.channel.split ?,
+
+          if freq == '2'
+            channel.to_i <= 14
+          else
+            channel.to_i >= 32 && channel.to_i <= 73
+          end
+        end
+
+
+      end.map do |n|
+        "#{n.rssi}\t#{n.level}\t#{n.channel}\t#{n.ssid}"
+      end
+    end
+
+    def print_json
+    end
+
     protected
 
     def parse

data/lib/ruby_wifi_scanner/version.rb

@@ -1,3 +1,3 @@
 module RubyWifiScanner
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/version_bump

@@ -1,3 +1,4 @@
 #!/bin/bash
 
-/usr/local/bin/conventional-changelog -p angular -i CHANGELOG.md -s
+# /usr/local/bin/conventional-changelog -p angular -i CHANGELOG.md -s
+conventional-changelog -p angular -i CHANGELOG.md -s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wifi_scanner
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Uri Gorelik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler