biscuit-monitor 0.0.2 → 0.0.3

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.log
+*.log.*
 *.rbc
 .bundle
 .config
@@ -18,3 +19,4 @@ test/version_tmp
 tmp
 /.bin
 /vendor/bundle
+/.idea

data/Gemfile

@@ -6,5 +6,13 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rspec'
+end
+
+group :development do
+  gem 'ap'
+  gem 'debugger'
+  gem 'hirb'
+  gem 'interactive_editor'
+  gem 'tmuxinator'
+  gem 'wirble'
 end

data/bin/biscuit-monitor

@@ -1,8 +1,17 @@
 #!/usr/bin/env ruby -w
 # encoding: utf-8
 
-$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+trap('SIGINT') { throw :ctrl_c }
 
-require 'biscuit-monitor'
+catch :ctrl_c do
+  begin
+    $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 
-Biscuit::Monitor::CLI.start
+    require 'biscuit-monitor'
+
+    Biscuit::Monitor::CLI.start
+  rescue SystemExit, Interrupt
+    raise
+  rescue Exception => ex
+  end
+end

data/bin/console

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby -w
+# encoding: utf-8
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
+
+require 'biscuit-monitor'
+require 'irb'
+require 'irb/completion'
+
+include Biscuit::Monitor
+
+IRB.start

data/biscuit-monitor.gemspec

@@ -15,8 +15,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Biscuit::Monitor::VERSION
 
-  gem.add_runtime_dependency 'thor'
+  gem.add_runtime_dependency 'colorize'
   gem.add_runtime_dependency 'multi_json'
   gem.add_runtime_dependency 'oj'
-  gem.add_runtime_dependency 'colorize'
+  gem.add_runtime_dependency 'sequel'
+  gem.add_runtime_dependency 'sqlite3'
+  gem.add_runtime_dependency 'thor'
+  gem.add_runtime_dependency 'nokogiri-plist'
 end

data/lib/biscuit-monitor/access_point_scanner.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+module Biscuit
+  module Monitor
+
+    require 'nokogiri-plist'
+
+    class AccessPointScanner
+
+      SCAN_ACCESS_POINTS = %x[/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport --scan --xml]
+
+      attr_reader :found_access_points, :scanned_on
+
+      def exec
+        @scanned_on = Time.now.utc
+
+        @found_access_points = raw_found_access_points.map do |access_point|
+          { ssid: access_point["SSID"].strip, ssid_name: access_point["SSID_STR"], bssid: access_point["BSSID"], rssi: access_point["RSSI"], scanned_on: @scanned_on }
+        end
+      end
+
+      def raw_found_access_points
+        @raw_found_access_points ||= Nokogiri::PList(SCAN_ACCESS_POINTS)
+      end
+
+      def scan
+        SCAN_ACCESS_POINTS
+      end
+    end
+  end
+end

data/lib/biscuit-monitor/cinr.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+require 'colorize'
+
+module Biscuit
+  module Monitor
+    class Cinr
+      attr_accessor :level
+
+      def initialize(level)
+        @level = Integer(level)
+      end
+
+      def message
+        "CINR: #{@level}dBs".colorize(foreground_color)
+      end
+
+      def foreground_color
+        case
+          when @level > 24 then
+            :green
+          when (13..24).include?(@level) then
+            :light_green
+          when (8..12).include?(@level) then
+            :yellow
+          when (3..7).include?(@level) then
+            :light_red
+          when @level < 3 then
+            :red
+          else
+            :white
+        end
+      end
+    end
+  end
+end

data/lib/biscuit-monitor/cli.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+module Biscuit
+  module Monitor
+
+    require 'thor'
+
+    class CLI < Thor
+      default_task :monitor
+
+      desc 'monitor', 'Start monitoring your biscuit.'
+      method_option :device_ip, default: '192.168.1.1', aliases: '-d'
+      method_option :polling_frequency_in_seconds, default: 3, aliases: '-f'
+
+      def monitor
+        Biscuit::Monitor::Poller.new(options[:device_ip], Integer(options[:polling_frequency_in_seconds])).poll
+      end
+    end
+  end
+end

data/lib/biscuit-monitor/poller.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+
+module Biscuit
+  module Monitor
+    class Poller
+      def initialize(device_ip, polling_frequency_in_seconds)
+        @device_ip = device_ip
+        @polling_frequency_in_seconds = polling_frequency_in_seconds
+      end
+
+      def poll
+        until false
+          begin
+
+            ss = SignalStrength.new(@device_ip)
+            ss.exec
+
+            message = ''
+            message << ss.cinr
+            message << ' '
+            message << ss.rssi
+
+            write message
+
+            Thread.new do
+              ap = AccessPointScanner.new
+              ap.exec
+              ap.found_access_points.each do |access_point|
+                DB_CONN[:wi_fi_access_points].insert(access_point)
+                LOGGER.debug(access_point)
+              end
+            end
+
+            Thread.new(ss.response) do |sig_str|
+              DB_CONN[:wi_max_statuses].insert(sig_str)
+              LOGGER.debug(sig_str)
+            end
+
+          rescue Errno::EHOSTUNREACH => err
+
+            write "Cannot find the biscuit. Check your connection. Tail #{LOG_FILE} for details."
+            LOGGER.error(err.inspect)
+
+          rescue StandardError => err
+
+            write "There was an error talking to your biscuit. Tail #{LOG_FILE} for details."
+            LOGGER.error(err.inspect)
+
+          ensure
+
+            sleep @polling_frequency_in_seconds # TODO when error increase length of time until next check to avoid spamming error log
+
+          end
+        end
+      end
+
+      private
+
+      def clear_last_message
+        (@last_message || '').length.times { print "\b" }
+      end
+
+      def write(message)
+        clear_last_message
+        print message
+        @last_message = message
+      end
+    end
+  end
+end
+

data/lib/biscuit-monitor/rssi.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+require 'colorize'
+
+module Biscuit
+  module Monitor
+    class Rssi
+      attr_accessor :level
+
+      def initialize(level)
+        @level = Integer(level)
+      end
+
+      def message
+        "RSSI: #{@level}dBs".colorize(foreground_color)
+      end
+
+      def foreground_color
+        case
+          when @level > -50 then
+            :green
+          when @level < -100 then
+            :red
+          else
+            :yellow
+        end
+      end
+    end
+  end
+end

data/lib/biscuit-monitor/signal_strength.rb

@@ -0,0 +1,72 @@
+# encoding: utf-8
+
+module Biscuit
+  module Monitor
+
+    %w< multi_json net/http uri >.each { |dep| require dep }
+
+    class SignalStrength
+      attr_reader :response
+
+      def initialize(device_ip)
+        @device_ip = device_ip
+      end
+
+      def exec
+        @response = parse(parse_javascript_to_json(Net::HTTP.get(device_uri)))[:data]
+        @response.merge!(captured_on: Time.now.utc)
+      end
+
+      def cinr
+        Cinr.new(@response[:cinr]).message
+      end
+
+      def rssi
+        Rssi.new(@response[:rssi]).message
+      end
+
+      private
+
+      def device_uri
+        URI.parse("http://#@device_ip/cgi-bin/webmain.cgi?act=act_wimax_status&param=WIMAX_LINK_STATUS,WIMAX_DEVICE_STATUS")
+        # TODO get the battery status
+        # URI.parse("http://#{@device_ip}/cgi-bin/webmain.cgi?act_battery_status&TYPE=BISCUIT&param=BATTERY_STATUS")
+      end
+
+      def parse(document)
+        data = {}
+        hash = MultiJson.decode(document, symbolize_keys: true)
+        hash.delete(:list)
+        hash.each do |k, v|
+          data[k] = if v.class == String && /^-?\d+$/ =~ v
+                      Integer(v)
+                    elsif v.class == Hash
+                      idata = {}
+                      v.each do |ik, iv|
+                        idata[ik] = if iv.class == String && /^-?\d+$/ =~ iv
+                                      Integer(iv)
+                                    else
+                                      iv
+                                    end
+                      end
+                      idata
+                    else
+                      v
+                    end
+        end
+        data
+      end
+
+      def parse_javascript_to_json(document)
+        document = document.downcase.split.join
+        document.gsub!(/'/, '"')
+        document.gsub!(/:(\d*),/, ':"\1",')
+        document.gsub!(/(\w*):"/, '"\1":"')
+        document.gsub!(/(\w*):{/, '"\1": {')
+        document.gsub!(/(\w*):\[/, '"\1": [')
+        document.gsub!(/":"/, '": "')
+        document.gsub!(/,/, ', ')
+      end
+    end
+  end
+end

data/lib/biscuit-monitor/version.rb

@@ -1,5 +1,7 @@
+# encoding: utf-8
+
 module Biscuit
   module Monitor
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/biscuit-monitor.rb

@@ -1,147 +1,25 @@
 # encoding: utf-8
 
-require 'biscuit-monitor/version'
-require 'colorize'
-require 'logger'
-require 'multi_json'
-require 'net/http'
-require 'thor'
-require 'uri'
-
 module Biscuit
   module Monitor
-    trap("SIGINT") { throw :ctrl_c }
-
-    class Monitor
-      def initialize(device_ip)
-        @logger = Logger.new('biscuit-monitor.log', 10, 1024000)
-        @device_ip = device_ip
-        @seconds = 3
-      end
-
-      def device_uri
-        URI.parse("http://#{@device_ip}/cgi-bin/webmain.cgi?act=act_wimax_status&param=WIMAX_LINK_STATUS,WIMAX_DEVICE_STATUS")
-        # TODO get the battery status
-        # URI.parse("http://#{@device_ip}/cgi-bin/webmain.cgi?act_battery_status&TYPE=BISCUIT&param=BATTERY_STATUS")
-      end
-
-      def clear_last_message
-        (@last_message || "").length.times { print "\b" }
-      end
-
-      def cinr_foreground_color(cinr)
-        case
-        when cinr > 24
-          :green
-        when (13..24).include?(cinr)
-          :light_green
-        when (8..12).include?(cinr)
-          :yellow
-        when (3..7).include?(cinr)
-          :light_red
-        when cinr < 3
-          :red
-        end
-      end
-
-      def rssi_foreground_color (rssi)
-        case
-        when rssi > -50
-          :green
-        when rssi < -100
-          :red
-        else
-          :yellow
-        end
-      end
-
-      def poll
-        catch :ctrl_c do
-          begin
-            response = parse(scrub_response(Net::HTTP.get(device_uri)))
-
-            cinr = Integer(response[:data][:cinr])
-            rssi = Integer(response[:data][:rssi])
-
-            message = "CINR: #{cinr}dBs".colorize(cinr_foreground_color(cinr))
-            message << " ".uncolorize
-            message << "RSSI: #{rssi}dBs".colorize(rssi_foreground_color(rssi))
-
-            write message
-            @logger.debug(response)
-
-          rescue Errno::EHOSTUNREACH => err
-
-            write "Cannot find the biscuit. Check your connection."
-            @logger.error(err.inspect)
-
-          rescue StandardError => err
-
-            write "There was an error checking your biscuit. See the logfile for details."
-            @logger.error(err.inspect)
-
-          ensure
-
-            sleep @seconds  # TODO when error increase length of time until next check to avoid spamming error log
-          end until false
-
-        end
-      end
-
-      def write(message)
-        clear_last_message
-        print message
-        @last_message = message
-      end
-
 
+    %w< etc logger sequel sqlite3 >.each { |dep| require dep }
 
-      def parse(document)
-        data = {}
-        hash = MultiJson.decode(document, symbolize_keys: true)
-        hash.delete(:list)
-        hash.each do |k,v|
-          data[k] = if v.class == String && /^-?\d+$/ =~ v
-                      Integer(v)
-                    elsif v.class == Hash
-                      idata = {}
-                      v.each do |ik, iv|
-                        idata[ik] = if iv.class == String && /^-?\d+$/ =~ iv
-                                      Integer(iv)
-                                    else
-                                      iv
-                                    end
-                      end
-                      idata
-                    else
-                      v
-                    end
-        end
-        data
-      end
+    HOME_DIR = Etc.getpwuid.dir
+    biscuit_monitor_root_dir = "#{HOME_DIR}/.biscuit-monitor"
+    Dir.mkdir(biscuit_monitor_root_dir) unless File.directory?(biscuit_monitor_root_dir)
+    biscuit_monitor_log_dir = "#{biscuit_monitor_root_dir}/log"
+    Dir.mkdir(biscuit_monitor_log_dir) unless File.directory?(biscuit_monitor_log_dir)
 
+    LOG_FILE = "#{biscuit_monitor_log_dir}/biscuit-monitor.log"
+    LOGGER = Logger.new(LOG_FILE, 10, 1024000)
 
-      def scrub_response(document)
-        document = document.split.join
-        document.gsub!(/'/, '"')
-        document.gsub!(/:(\d*),/, ':"\1",')
-        document.gsub!(/(\w*):"/, '"\1":"')
-        document.gsub!(/(\w*):{/, '"\1": {')
-        document.gsub!(/(\w*):\[/, '"\1": [')
-        document.gsub!(/":"/, '": "')
-        document.gsub!(/,/, ', ')
-      end
+    DB_CONN = Sequel.sqlite("#{biscuit_monitor_root_dir}/biscuit_monitor.db", loggers: [LOGGER])
 
-    end
+    Sequel.extension :migration
+    Sequel::Migrator.apply(DB_CONN, File.expand_path(File.dirname(__FILE__)) + '/migrations')
 
-    class CLI < Thor
-      default_task :start
 
-      desc "start", "Start monitoring your biscuit."
-      method_option :device_ip, :default => "192.168.1.1", :aliases => "-d"
-      def start
-        Biscuit::Monitor::Monitor.new(options[:device_ip]).poll
-      end
-    end
+    %w< version cinr rssi access_point_scanner poller cli signal_strength >.each { |dep| require "biscuit-monitor/#{dep}" }
   end
 end

data/lib/migrations/001_create_wi_max_statuses.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+Sequel.migration do
+  change do
+    create_table :wi_max_statuses do
+      primary_key :id
+      Integer :cf # 2657000
+      Integer :cinr # 35
+      Integer :rssi # -56
+      Integer :tx_power # -11
+      String :bsid # "00:00:02:26:27:93"
+      String :dev_s # "dataconnected"
+      String :dummy09 # "xx"
+      String :wimax_device_status # "success"
+      String :wimax_link_status # "success"
+      String :captured_on
+    end
+  end
+end

data/lib/migrations/002_create_wi_fi_access_points.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+Sequel.migration do
+  change do
+    create_table :wi_fi_access_points do
+      primary_key :id
+      String :ssid
+      String :ssid_name
+      Integer :rssi # -56
+      String :bssid # "00:00:02:26:27:93"
+      String :scanned_on
+    end
+  end
+end