ruby_wifi_scanner 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11203ff609e63334559ff5c04eed2c29a2b85caa70e4630f09a03b88772e0cad
-  data.tar.gz: a4320ffcacef6deeae4e6a500275d3fc3bb9e6c2a43cbe9700244cf4fe48607f
+  metadata.gz: 90daf1cf8fb63b5af08330c4685e5031792f730246a1579c4ca8f153ef48a5ec
+  data.tar.gz: 1dd0e27fe74cbe7a0e9ebb7ea7c94815ec79220569a442d350f0e7783c7f1285
 SHA512:
-  metadata.gz: 5e80e9d9a207913568e254101a0214a29de4bd5da638081b8a186f990ba049ba4a1a74a3e900e836999444a974ff5c3dda226acb1235aaf0f8ce2076eb8aacd6
-  data.tar.gz: 221981969a0c834a91f68d577deab8f6020d32189d2f553ecb14e4225c907d3b2b9d196493ded53e29a825b3d707ab8fca96ade4e748fa6235bf8b2a1cb4e763
+  metadata.gz: f0f46982d73459444588fb3eb40633f4b1efbac1d6bc93a92585825abe40679823546c185218dd7e43d59fd0662acdf540ad1964b707aa22feca99e2c510092a
+  data.tar.gz: 7b3b431f2a1cd63377d7b392ea99518f31e00e01ade356609b8215fc7cbbeaeb07c14edddff93dc79168524026771848d5c9a93cbbf009288593f42f310045c4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_wifi_scanner (0.1.4)
+    ruby_wifi_scanner (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "ruby_wifi_scanner"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/ruby_wifi_scanner/linux_scanner.rb

@@ -1,19 +1,27 @@
 module RubyWifiScanner
   class LinuxScanner < Scanner
-
     protected
 
     def parse
-      res = raw_scan.split "\n"
-      res[1..-1].map do |row|
-        m = row.strip.match(/(?<level>-?[\d.]{4,6})\s+(?<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})\s*(?<ssid>\w+)?/i)
-        WifiInfo.new(m[:ssid], m[:rssi], m[:level]) if m
+      scan = raw_scan.scan(/
+        ^BSS\s([a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2}:[a-f0-9]{2})
+        .+?
+        signal:\s([\d.-]+?)\sdBm$
+        .+?
+        SSID:\s(\w+?)$
+      /mx)
+
+      scan.map do |rssi,level,ssid|
+        WifiInfo.new(ssid, rssi, level)
       end
     end
 
     def raw_scan
-      @raw_scan ||=
-        %x{sudo iw dev $DEVICE scan | awk -f wlan_scan.awk | sort}
+      return @raw_scan if @raw_scan
+
+      device = ENV["DEVICE"] || 'wlan0'
+
+      @raw_scan = %x{sudo iw dev #{device} scan}
     end
   end
 end

data/lib/ruby_wifi_scanner/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wifi_scanner
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Uri Gorelik
@@ -82,6 +82,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - exe/rws
 - lib/ruby_wifi_scanner.rb
 - lib/ruby_wifi_scanner/linux_scanner.rb