ogn_client-ruby 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a6d60e5f26f6b6c18c2e1f6e4aba695901e5473
-  data.tar.gz: 75e00d14055934f85c66acdd1c7046173425aeba
+  metadata.gz: cac6cf6364fa78e20954308deb6258c8ae789661
+  data.tar.gz: b5c802a8c11071a73549abaa50d7cf8e7cf03128
 SHA512:
-  metadata.gz: 1c1e7c3788ab24ead12e31e5cc67bd0a3a9b12cfef99885dd16cef31d5a780faf1e7f860f7d2efdbf958085904bd36d0ee7031493e15ae89624fce0cf321b8f7
-  data.tar.gz: fb2171f7a02881b8a12c160271172c9bb515e35b7498320ffa9f5ae624cd7baf31dbc0ff51d2f9ae96c2c13d0d88721a93cbf7e0669e1288ad8b8229241dd564
+  metadata.gz: e60aabf34f6e4967e9423b732d676149fda8fb1f3470d3e02b37f791b4804ddc637dfb09538dcac92ecc4687672eb4c2cf84f802d694a031f59734394ac448b1
+  data.tar.gz: 1e6903681dcb6c26c5f3612f304914b867113b7598f7816f5d907c46cbade23d8392bc0a31fa43a4d61102fa08fe402e1a818bb0e9aaed06ac33c8c9d12c67df

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.0
+ruby-2.4.1

data/.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: ruby
 rvm:
-  - 2.3.1
-  - 2.2.5
+  - 2.3.3
+  - 2.2.6
   - 2.1.10
-before_install: gem install bundler -v 1.13.2
+before_install: gem install bundler -v 1.13.6

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.2.0
+
+  * support for receiver versions <= 0.2.6
+    * renamed `Sender` to `SenderBeacon`
+    * devided `Receiver` to `ReceiverBeacon` and `ReceiverStatus`
+    * `ReceiverStatus` is *not* available for receiver versions < 0.2.6
+
+## 0.1.3
+
+  * renamed sender and receiver attributes
+    * `Sender#signal` -> `Sender#signal_quality`
+    * `Sender#power` -> `Sender#signal_power`
+    * `Receiver#signal` -> `Receiver#signal_quality`
+    * `Receiver#senders_signal` -> `Receiver#senders_signal_quality`
+    * `Receiver#good_senders_signal` -> `Receiver#good_senders_signal_quality`
+
 ## 0.1.2
 
   * support for receiver versions <= 0.2.5

data/README.md

@@ -2,7 +2,7 @@
 [![Continuous Integration](https://img.shields.io/travis/svoop/ogn_client-ruby/master.svg?style=flat)](https://travis-ci.org/svoop/ogn_client-ruby)
 [![Code Climate](https://img.shields.io/codeclimate/github/svoop/ogn_client-ruby.svg?style=flat)](https://codeclimate.com/github/svoop/ogn_client-ruby)
 [![Gitter](https://img.shields.io/gitter/room/svoop/ogn_client-ruby.svg?style=flat)](https://gitter.im/svoop/ogn_client-ruby)
-[![Donorbox](https://img.shields.io/badge/donate-on donorbox-yellow.svg)](https://donorbox.org/bitcetera-ogn_client-ruby)
+[![Donorbox](https://img.shields.io/badge/donate-on_donorbox-yellow.svg)](https://donorbox.org/bitcetera-ogn_client-ruby)
 
 # ogn_client-ruby
 
@@ -36,8 +36,12 @@ Or install it yourself with:
 Choose a [valid callsign](http://www.aprs-is.net/Connecting.aspx#loginrules) and [appropriate filters](http://www.aprs-is.net/javAPRSFilter.aspx), then start listening to the broadcasted raw messages:
 
 ```ruby
-OGNClient::APRS.start(callsign: 'ROCT', filter: 'r/33/-97/200') do |aprs|
-  loop { puts aprs.gets }
+require 'ogn_client'
+
+OGNClient::APRS.start(callsign: "ROCT#{rand(1000)}", filter: 'r/47/2/500') do |aprs|
+  while raw = aprs.gets
+    puts raw   # do more interesting stuff here
+  end
 end
 ```
 
@@ -53,11 +57,13 @@ OGNClient::Message.parse(aprs.gets)
 
 :point_up: Raw APRS messages as returned by `aprs.gets` are "ASCII-8BIT" encoded and may contain tailing whitespace. The parser removes this whitespace and converts the string to "UTF-8".
 
-The factory method `OGNClient::Message.parse` will return one an instance of `OGNClient::Sender`, `OGNClient::Receiver`, `OGNClient::comment` or [raise an error](#errors). When this happens, either the message is crippled, the [OGN](http://glidernet.org) specifications have changed or you have found a bug in the parser code. You may want to store such messages, [file a bug](#community-support) and replay them once the bug has been fixed.
+The factory method `OGNClient::Message.parse` will return one an instance of `OGNClient::Sender`, `OGNClient::Receiver`, `OGNClient::Comment` or [raise an error](#errors). When this happens, either the message is crippled, the [OGN](http://glidernet.org) specifications have changed or you have found a bug in the parser code.
+
+In production, you may want to rescue from these errors and ignore the message. You should, however, log the offending messages messages, [file a bug](#community-support) and replay them once the bug has been fixed.
 
-#### OGNClient::Sender
+#### OGNClient::SenderBeacon
 
-Senders are usually aircraft equipped with [FLARM](https://flarm.com) (anti-collision warning system) or similar devices which broadcast position data as RF beacons.
+Sender beacons are usually coming from aircraft equipped with [FLARM](https://flarm.com) (anti-collision warning system) or similar devices which broadcast position data as RF beacons.
 
 The data is converted into the metric system since [OGN](http://glidernet.org) is primarily made for gliders which mostly use the metric system for ground speed, climb rate and so forth.
 
@@ -78,19 +84,19 @@ Attributes:
 * **flight_level** - 100 feet QNE
 * **climb_rate** - meters per second
 * **turn_rate** - revolutions per minute
-* **power** - power ratio in dBm
-* **signal** - signal to noise ratio in decibel
+* **signal_power** - power ratio in dBm
+* **signal_quality** - signal to noise ratio in decibel
 * **errors** - number of CRC errors
 * **frequency_offset** - kilohertz
 * **gps_accuracy** - array [vertical meters, horizontal meters]
-* **flarm_software_version** - version as #<Gem::Version "major.minor">
-* **flarm_hardware_version** - version as #<Gem::Version "major">
+* **flarm_software_version** - version as "major.minor"
+* **flarm_hardware_version** - version as integer
 * **flarm_id** - FLARM device ID
 * **proximity** - array of FLARM device ID tails
 
-#### OGNClient::Receiver
+#### OGNClient::ReceiverBeacon
 
-Receivers are little RF boxes which pick up the RF beacons from aircraft and relay them to the OGN servers as messages. They send their own status messages on a regular basis.
+Receivers are little RF boxes which pick up the RF beacons from aircraft and relay them to the OGN servers as messages. They send their own beacons on a regular basis.
 
 Attributes:
 * **callsign** - origin callsign
@@ -101,7 +107,18 @@ Attributes:
 * **altitude** - WG84 meters above mean sea level QNH
 * **heading** - degrees from 1 to 360
 * **ground_speed** - kilometers per hour
-* **version** - software version as #<Gem::Version "major.minor.patch">
+
+Please note: These receiver beacons contained status information up until version 0.2.5.
+
+#### OGNClient::ReceiverStatus
+
+Receivers of version 0.2.6 and higher send status messages on a regular basis:
+
+Attributes:
+* **callsign** - origin callsign
+* **receiver** - receiver callsign
+* **time** - zulu/UTC time with date
+* **version** - software version as "major.minor.patch"
 * **platform** - e.g. :arm
 * **cpu_load** - as reported by "uptime"
 * **cpu_temperature** - in degrees celsius
@@ -116,10 +133,10 @@ Attributes:
 * **senders** - number of senders received within the last hour
 * **visible_senders** - number of visible senders withint the last hour
 * **invisible_senders** - number of invisible senders ("no-track" on device or "invisible" in database)
-* **signal** - signal-to-noise ratio in decibel
-* **senders_signal** - average signal-to-noise ratio across all senders
+* **signal_quality** - signal-to-noise ratio in decibel
+* **senders_signal_quality** - average signal-to-noise ratio across all senders
 * **senders_messages** - number of messages analyzed to calculate the above
-* **good_senders_signal** - average signal-to-noise ratio in decibel of good senders (transmitting properly) within the last 24 hours
+* **good_senders_signal_quality** - average signal-to-noise ratio in decibel of good senders (transmitting properly) within the last 24 hours
 * **good_and_bad_senders** - number of good and bad senders within the last 24 hours
 * **good_senders** - number of good senders (transmitting properly) within the last 24 hours
 * **bad_senders** - number of bad senders (not transmitting properly) within the last 24 hours
@@ -142,9 +159,10 @@ They all inherit from `OGNClient::Error`. An fault-tolerant subscription could t
 
 ```ruby
 require 'ogn_client'
+require 'logger'
 
 logger = Logger.new('/tmp/ogn_client.log')
-options = { callsign: 'ROCT', filter: 'r/47/2/500' }
+options = { callsign: "ROCT#{rand(1000)}", filter: 'r/47/2/500' }
 loop do
   OGNClient::APRS.start(options) do |aprs|
     while raw = aprs.gets
@@ -160,13 +178,15 @@ loop do
 end
 ```
 
+:point_up: Receiver versions ("major.minor.patch") are will only raise an error when the offending version has a higher major or minor version digit. Patch level differences will only trigger a warning.
+
 ## Community Support
 
 * Look for developers and users on [Gitter](https://gitter.im/svoop/ogn_client-ruby).
 * Ask your questions on [Stackoverflow](https://stackoverflow.com/questions/ask?tags=ogn_client-ruby,ruby,gem).
 * Annotated source code on [omniref](https://www.omniref.com/repositories/svoop/ogn_client-ruby)
 * Bug reports, feature and pull requests are welcome on [GitHub](https://github.com/svoop/ogn_client-ruby).
-* [Donations with Stripe or PayPal](https://donorbox.org/bitcetera-ogn_client-ruby) are welcome as well. If you prefer to sponsor a feature, please create an issue on [GitHub](https://github.com/svoop/ogn_client-ruby) first and state your intentions.
+* [Donations are welcome as well](https://donorbox.org/bitcetera-ogn_client-ruby)l. If you prefer to sponsor a feature, please create an issue on [GitHub](https://github.com/svoop/ogn_client-ruby) first and state your intentions.
 
 ## Development
 
@@ -178,7 +198,7 @@ Check out the repository, install the dependencies and run the test suite:
     $ bin/setup
     $ rake
 
-If you are on Mac OS X, +guard+, +guard-minitest+ and +minitest-osx+ are also installed and therefore you get the test results as notifications by running a guard watchdog with:
+If you are on macOS, *guard*, *guard-minitest* and *minitest-osx* are also installed and therefore you get the test results as notifications by running a guard watchdog with:
 
     $ guard
 

data/lib/ogn_client.rb

@@ -5,5 +5,6 @@ require_relative 'ogn_client/errors'
 require_relative 'ogn_client/aprs'
 require_relative 'ogn_client/message'
 require_relative 'ogn_client/messages/comment'
-require_relative 'ogn_client/messages/receiver'
-require_relative 'ogn_client/messages/sender'
+require_relative 'ogn_client/messages/receiver_beacon'
+require_relative 'ogn_client/messages/receiver_status'
+require_relative 'ogn_client/messages/sender_beacon'

data/lib/ogn_client/message.rb

@@ -27,8 +27,9 @@ module OGNClient
       (?<time>\d{6})h
       (?:(?<latitude>\d{4}\.\d{2}[NS]).(?<longitude>\d{5}\.\d{2}[EW]).)?
       (?:(?<heading>\d{3})/(?<ground_speed>\d{3}))?
-      (?:/A=(?<altitude>\d{6}))?\s+
+      (?:/A=(?<altitude>\d{6}))?\s*
       (?:!W((?<latitude_enhancement>\d)(?<longitude_enhancement>\d))!)?
+      (?:\s|$)
     )x
 
     attr_reader :raw
@@ -44,8 +45,9 @@ module OGNClient
     def self.parse(raw)
       fail(OGNClient::MessageError, "raw message must be String but is #{raw.class}") unless raw.is_a? String
       raw = raw.chomp.force_encoding('ASCII-8BIT').encode('UTF-8')
-      OGNClient::Sender.new.send(:parse, raw) ||
-        OGNClient::Receiver.new.send(:parse, raw) ||
+      OGNClient::SenderBeacon.new.send(:parse, raw) ||
+        OGNClient::ReceiverStatus.new.send(:parse, raw) ||
+        OGNClient::ReceiverBeacon.new.send(:parse, raw) ||
         OGNClient::Comment.new.send(:parse, raw) ||
         fail(OGNClient::MessageError, "message payload parsing failed: `#{raw}'")
     end

data/lib/ogn_client/messages/receiver_beacon.rb

@@ -0,0 +1,21 @@
+module OGNClient
+
+  class ReceiverBeacon < Message
+
+    RECEIVER_BEACON_PATTERN = %r(^
+      .+?>APRS,(?:.+?,){1,2}
+      (?:GLIDERN|GIGA|NYMSERV)\d*:
+    )x
+
+    private
+
+    def parse(raw)
+      raw.match RECEIVER_BEACON_PATTERN do
+        super unless @raw
+        self
+      end
+    end
+
+  end
+
+end

data/lib/ogn_client/messages/receiver_status.rb

@@ -0,0 +1,161 @@
+module OGNClient
+
+  class ReceiverStatus < Message
+
+    RECEIVER_STATUS_PATTERN = %r(
+      (?:
+        v(?<version>\d+\.\d+\.\d+)
+        (?:\.(?<platform>.+?))?
+      \s)?
+      CPU:(?<cpu_load>[\d.]+)\s
+      RAM:(?<ram_free>[\d.]+)/(?<ram_total>[\d.]+)MB\s
+      NTP:(?<ntp_offset>[\d.]+)ms/(?<ntp_correction>[+-][\d.]+)ppm\s
+      (?:(?<voltage>[\d.]+)V\s)?
+      (?:(?<amperage>[\d.]+)A\s)?
+      (?:(?<cpu_temperature>[+-][\d.]+)C\s*)?
+      (?:(?<visible_senders>\d+)/(?<senders>\d+)Acfts\[1h\]\s*)?
+      (?:RF:
+        (?:
+          (?<rf_correction_manual>[+-][\d]+)
+          (?<rf_correction_automatic>[+-][\d.]+)ppm/
+        )?
+        (?<signal_quality>[+-][\d.]+)dB
+        (?:/(?<senders_signal_quality>[+-][\d.]+)dB@10km\[(?<senders_messages>\d+)\])?
+        (?:/(?<good_senders_signal_quality>[+-][\d.]+)dB@10km\[(?<good_senders>\d+)/(?<good_and_bad_senders>\d+)\])?
+      )?
+    $)x
+
+    NO_WARN_RECEIVER_VERSIONS = Gem::Dependency.new('', '>= 0.2.6', '< 0.2.8')
+    NO_FAIL_RECEIVER_VERSIONS = Gem::Dependency.new('', '< 0.3')
+
+    attr_reader :version                       # software version as "major.minor.patch"
+    attr_reader :platform                      # e.g. "ARM"
+    attr_reader :cpu_load                      # as reported by "uptime"
+    attr_reader :cpu_temperature               # degrees celsius
+    attr_reader :ram_free                      # megabytes
+    attr_reader :ram_total                     # megabytes
+    attr_reader :ntp_offset                    # milliseconds
+    attr_reader :ntp_correction                # parts-per-million
+    attr_reader :voltage                       # board voltage in V
+    attr_reader :amperage                      # board amperage in A
+    attr_reader :rf_correction_manual          # as per configuration
+    attr_reader :rf_correction_automatic       # based on GSM
+    attr_reader :senders                       # number of senders within the last hour
+    attr_reader :visible_senders               # number of visible senders within the last hour
+    attr_reader :signal_quality                # signal-to-noise ratio in decibel
+    attr_reader :senders_signal_quality        # average signal-to-noise ratio in decibel across all senders
+    attr_reader :senders_messages              # number of messages analyzed to calculate the above
+    attr_reader :good_senders_signal_quality   # average signal-to-noise ratio in decibel of good senders (transmitting properly) within the last 24 hours
+    attr_reader :good_and_bad_senders          # number of good and bad senders within the last 24 hours
+    attr_reader :good_senders                  # number of good senders (transmitting properly) within the last 24 hours
+
+    def invisible_senders
+      senders - visible_senders
+    rescue
+      nil
+    end
+
+    def bad_senders
+      good_and_bad_senders - good_senders
+    rescue
+      nil
+    end
+
+    private
+
+    def parse(raw)
+      raw.match RECEIVER_STATUS_PATTERN do |match|
+        super unless @raw
+        %i(version platform cpu_load cpu_temperature ram_free ram_total ntp_offset ntp_correction voltage amperage rf_correction_manual rf_correction_automatic senders visible_senders signal_quality senders_signal_quality senders_messages good_senders_signal_quality good_and_bad_senders good_senders).each do |attr|
+          send("#{attr}=", match[attr]) if match[attr]
+        end
+        self
+      end
+    end
+
+    def version=(raw)
+      @version = raw
+      fail(OGNClient::ReceiverError, "receiver version `#{@version}'") unless NO_FAIL_RECEIVER_VERSIONS.match?('', @version)
+      warn("WARNING: receiver version `#{@version}'") unless NO_WARN_RECEIVER_VERSIONS.match?('', @version)
+      @version
+    end
+
+    def platform=(raw)
+      @platform = raw.to_sym.downcase
+    end
+
+    def cpu_load=(raw)
+      @cpu_load = raw.to_f.round(2)
+    end
+
+    def cpu_temperature=(raw)
+      @cpu_temperature = raw.to_f.round(2)
+    end
+
+    def ram_free=(raw)
+      @ram_free = raw.to_f.round(2)
+    end
+
+    def ram_total=(raw)
+      @ram_total = raw.to_f.round(2)
+    end
+
+    def ntp_offset=(raw)
+      @ntp_offset = raw.to_f.round(2)
+    end
+
+    def ntp_correction=(raw)
+      @ntp_correction = raw.to_f.round(2)
+    end
+
+    def voltage=(raw)
+      @voltage = raw.to_f.round(3)
+    end
+
+    def amperage=(raw)
+      @amperage = raw.to_f.round(3)
+    end
+
+    def rf_correction_manual=(raw)
+      @rf_correction_manual = raw.to_i
+    end
+
+    def rf_correction_automatic=(raw)
+      @rf_correction_automatic = raw.to_f.round(1)
+    end
+
+    def senders=(raw)
+      @senders = raw.to_i
+    end
+
+    def visible_senders=(raw)
+      @visible_senders = raw.to_i
+    end
+
+    def signal_quality=(raw)
+      @signal_quality = raw.to_f.round(3)
+    end
+
+    def senders_signal_quality=(raw)
+      @senders_signal_quality = raw.to_f.round(3)
+    end
+
+    def senders_messages=(raw)
+      @senders_messages = raw.to_i
+    end
+
+    def good_senders_signal_quality=(raw)
+      @good_senders_signal_quality = raw.to_f.round(3)
+    end
+
+    def good_and_bad_senders=(raw)
+      @good_and_bad_senders = raw.to_i
+    end
+
+    def good_senders=(raw)
+      @good_senders = raw.to_i
+    end
+
+  end
+
+end

data/lib/ogn_client/messages/{sender.rb → sender_beacon.rb}

@@ -1,20 +1,20 @@
 module OGNClient
 
-  class Sender < Message
+  class SenderBeacon < Message
 
-    SENDER_PATTERN = %r(
-      id(?<details>\w{2})(?<id>\w+?)\s
-      (?<climb_rate>[+-]\d+?)fpm\s
-      (?<turn_rate>[+-][\d.]+?)rot\s
+    SENDER_BEACON_PATTERN = %r(
+      id(?<details>\w{2})(?<id>\w+?)\s?
+      (?:(?<climb_rate>[+-]\d+?)fpm\s)?
+      (?:(?<turn_rate>[+-][\d.]+?)rot\s)?
       (?:FL(?<flight_level>[\d.]+)\s)?
-      (?<signal>[\d.]+?)dB\s
-      (?<errors>\d+)e\s
-      (?<frequency_offset>[+-][\d.]+?)kHz\s?
+      (?:(?<signal_quality>[\d.]+?)dB\s)?
+      (?:(?<errors>\d+)e\s)?
+      (?:(?<frequency_offset>[+-][\d.]+?)kHz\s?)?
       (?:gps(?<gps_accuracy>\d+x\d+)\s?)?
       (?:s(?<flarm_software_version>[\d.]+)\s?)?
       (?:h(?<flarm_hardware_version>[\dA-F]{2})\s?)?
       (?:r(?<flarm_id>[\dA-F]+)\s?)?
-      (?:(?<power>[+-][\d.]+)dBm\s?)?
+      (?:(?<signal_power>[+-][\d.]+)dBm\s?)?
       (?:hear(?<proximity>.+))?
     $)x
 
@@ -50,22 +50,22 @@ module OGNClient
     attr_reader :flight_level             # 100 feet QNE
     attr_reader :climb_rate               # meters per second
     attr_reader :turn_rate                # revolutions per minute
-    attr_reader :power                    # power ratio in dBm
-    attr_reader :signal                   # signal to noise ratio in decibel
+    attr_reader :signal_power             # power ratio in dBm
+    attr_reader :signal_quality           # signal-to-noise ratio in decibel
     attr_reader :errors                   # number of CRC errors
     attr_reader :frequency_offset         # kilohertz
     attr_reader :gps_accuracy             # array [vertical meters, horizontal meters]
-    attr_reader :flarm_software_version   # version as #<Gem::Version "major.minor">
-    attr_reader :flarm_hardware_version   # version as #<Gem::Version "major">
+    attr_reader :flarm_software_version   # version as "major.minor"
+    attr_reader :flarm_hardware_version   # version as "major"
     attr_reader :flarm_id                 # FLARM device ID
     attr_reader :proximity                # array of FLARM device ID tails
 
     private
 
     def parse(raw)
-      raw.match SENDER_PATTERN do |match|
+      raw.match SENDER_BEACON_PATTERN do |match|
         super unless @raw
-        %i(details id flight_level climb_rate turn_rate power signal errors frequency_offset gps_accuracy flarm_software_version flarm_hardware_version flarm_id proximity).each do |attr|
+        %i(details id flight_level climb_rate turn_rate signal_power signal_quality errors frequency_offset gps_accuracy flarm_software_version flarm_hardware_version flarm_id proximity).each do |attr|
           send("#{attr}=", match[attr]) if match[attr]
         end
 # NOTE: [@svoop] [ruby21] workaround necessary until support for ruby21 is removed
@@ -99,12 +99,12 @@ module OGNClient
       @turn_rate = (raw.to_i / 4.0).round(1)
     end
 
-    def power=(raw)
-      @power = raw.to_f.round(3)
+    def signal_power=(raw)
+      @signal_power = raw.to_f.round(3)
     end
 
-    def signal=(raw)
-      @signal = raw.to_f.round(1)
+    def signal_quality=(raw)
+      @signal_quality = raw.to_f.round(1)
     end
 
     def errors=(raw)
@@ -120,11 +120,11 @@ module OGNClient
     end
 
     def flarm_software_version=(raw)
-      @flarm_software_version = Gem::Version.new raw
+      @flarm_software_version = raw
     end
 
     def flarm_hardware_version=(raw)
-      @flarm_hardware_version = Gem::Version.new raw.to_i(16)
+      @flarm_hardware_version = raw.to_i(16)
     end
 
     def flarm_id=(raw)

data/lib/ogn_client/version.rb

@@ -1,3 +1,3 @@
 module OGNClient
-  VERSION = "0.1.2".freeze
+  VERSION = "0.2.0".freeze
 end

data/tasks/test.rake

@@ -1,28 +1,57 @@
 require 'ogn_client'
+require 'tempfile'
+require 'fileutils'
 
 namespace :test do
 
-  desc "Receive and dump real-time APRS messages"
-  task :receiver do
-    OGNClient::APRS.start(callsign: "ROCT-#{rand(100)}") do |aprs|
-      loop do
-        print aprs.gets
-      end
-    end
+  desc "Reset the test suite"
+  task :reset do
+    FileUtils.rm_f('spec/fixtures/messages.txt')
   end
 
-  desc "Parse real-time APRS messages and test the parser"
-  task :parser do
-    callsign = "ROCT-#{rand(100)}"
+  desc "Feed live APRS messages to the parser"
+  task :live do
+    callsign = "ROCT#{rand(1000)}"
+    counter = 0
     loop do
       OGNClient::APRS.start(callsign: callsign) do |aprs|
         while raw = aprs.gets do
-          print '.'
           begin
             OGNClient::Message.parse raw
           rescue OGNClient::Error => error
-            puts
-            warn "WARNING: #{error.message}"
+            puts "ERROR: #{error.message}"
+          end
+          counter += 1
+          puts "INFO: captured #{counter} messages" if counter % 1000 == 0
+        end
+      end
+    end
+  end
+
+  namespace :live do
+    desc "Record live APRS messages"
+    task :record do
+      callsign = "ROCT#{rand(1000)}"
+      counter = 0
+      File.open("#{Dir.tmpdir}/ogn_messages.txt", "w") do |file|
+        OGNClient::APRS.start(callsign: callsign) do |aprs|
+          while raw = aprs.gets do
+            file.print raw
+            counter += 1
+            puts "INFO: captured #{counter} messages" if counter % 1000 == 0
+          end
+        end
+      end
+    end
+
+    desc "Feed recorded APRS messages to the parser"
+    task :replay do
+      File.open("#{Dir.tmpdir}/ogn_messages.txt") do |file|
+        while raw = file.gets do
+          begin
+            OGNClient::Message.parse raw
+          rescue OGNClient::Error => error
+            puts "ERROR: #{error.message}"
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ogn_client-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Sven Schwyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,8 +121,9 @@ files:
 - lib/ogn_client/errors.rb
 - lib/ogn_client/message.rb
 - lib/ogn_client/messages/comment.rb
-- lib/ogn_client/messages/receiver.rb
-- lib/ogn_client/messages/sender.rb
+- lib/ogn_client/messages/receiver_beacon.rb
+- lib/ogn_client/messages/receiver_status.rb
+- lib/ogn_client/messages/sender_beacon.rb
 - lib/ogn_client/version.rb
 - ogn_client-ruby.gemspec
 - tasks/test.rake
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Subscriber and parser for APRS messages from OGN

data/lib/ogn_client/messages/receiver.rb

@@ -1,159 +0,0 @@
-module OGNClient
-
-  class Receiver < Message
-
-    RECEIVER_PATTERN = %r(
-      (?:
-        v(?<version>\d+\.\d+\.\d+)
-        (?:\.(?<platform>.+?))?
-      \s)?
-      CPU:(?<cpu_load>[\d.]+)\s
-      RAM:(?<ram_free>[\d.]+)/(?<ram_total>[\d.]+)MB\s
-      NTP:(?<ntp_offset>[\d.]+)ms/(?<ntp_correction>[+-][\d.]+)ppm\s
-      (?:(?<voltage>[\d.]+)V\s)?
-      (?:(?<amperage>[\d.]+)A\s)?
-      (?:(?<cpu_temperature>[+-][\d.]+)C\s*)?
-      (?:(?<visible_senders>\d+)/(?<senders>\d+)Acfts\[1h\]\s*)?
-      (?:RF:
-        (?:
-          (?<rf_correction_manual>[+-][\d]+)
-          (?<rf_correction_automatic>[+-][\d.]+)ppm/
-        )?
-        (?<signal>[+-][\d.]+)dB
-        (?:/(?<senders_signal>[+-][\d.]+)dB@10km\[(?<senders_messages>\d+)\])?
-        (?:/(?<good_senders_signal>[+-][\d.]+)dB@10km\[(?<good_senders>\d+)/(?<good_and_bad_senders>\d+)\])?
-      )?
-    $)x
-
-    SUPPORTED_RECEIVER_VERSION = Gem::Version.new('0.2.5')
-
-    attr_reader :version                   # software version as #<Gem::Version "major.minor.patch">
-    attr_reader :platform                  # e.g. "ARM"
-    attr_reader :cpu_load                  # as reported by "uptime"
-    attr_reader :cpu_temperature           # degrees celsius
-    attr_reader :ram_free                  # megabytes
-    attr_reader :ram_total                 # megabytes
-    attr_reader :ntp_offset                # milliseconds
-    attr_reader :ntp_correction            # parts-per-million
-    attr_reader :voltage                   # board voltage in V
-    attr_reader :amperage                  # board amperage in A
-    attr_reader :rf_correction_manual      # as per configuration
-    attr_reader :rf_correction_automatic   # based on GSM
-    attr_reader :senders                   # number of senders within the last hour
-    attr_reader :visible_senders           # number of visible senders within the last hour
-    attr_reader :signal                    # signal-to-noise ratio in decibel
-    attr_reader :senders_signal            # average signal-to-noise ratio in decibel across all senders
-    attr_reader :senders_messages          # number of messages analyzed to calculate the above
-    attr_reader :good_senders_signal       # average signal-to-noise ratio in decibel of good senders (transmitting properly) within the last 24 hours
-    attr_reader :good_and_bad_senders      # number of good and bad senders within the last 24 hours
-    attr_reader :good_senders              # number of good senders (transmitting properly) within the last 24 hours
-
-    def invisible_senders
-      senders - visible_senders
-    rescue
-      nil
-    end
-
-    def bad_senders
-      good_and_bad_senders - good_senders
-    rescue
-      nil
-    end
-
-    private
-
-    def parse(raw)
-      raw.match RECEIVER_PATTERN do |match|
-        super unless @raw
-        %i(version platform cpu_load cpu_temperature ram_free ram_total ntp_offset ntp_correction voltage amperage rf_correction_manual rf_correction_automatic senders visible_senders signal senders_signal senders_messages good_senders_signal good_and_bad_senders good_senders).each do |attr|
-          send("#{attr}=", match[attr]) if match[attr]
-        end
-        self
-      end
-    end
-
-    def version=(raw)
-      @version = Gem::Version.new(raw)
-      fail(OGNClient::ReceiverError, "unsupported receiver version: `#{@raw}'") if @version > SUPPORTED_RECEIVER_VERSION
-      @version
-    end
-
-    def platform=(raw)
-      @platform = raw.to_sym.downcase
-    end
-
-    def cpu_load=(raw)
-      @cpu_load = raw.to_f.round(2)
-    end
-
-    def cpu_temperature=(raw)
-      @cpu_temperature = raw.to_f.round(2)
-    end
-
-    def ram_free=(raw)
-      @ram_free = raw.to_f.round(2)
-    end
-
-    def ram_total=(raw)
-      @ram_total = raw.to_f.round(2)
-    end
-
-    def ntp_offset=(raw)
-      @ntp_offset = raw.to_f.round(2)
-    end
-
-    def ntp_correction=(raw)
-      @ntp_correction = raw.to_f.round(2)
-    end
-
-    def voltage=(raw)
-      @voltage = raw.to_f.round(3)
-    end
-
-    def amperage=(raw)
-      @amperage = raw.to_f.round(3)
-    end
-
-    def rf_correction_manual=(raw)
-      @rf_correction_manual = raw.to_i
-    end
-
-    def rf_correction_automatic=(raw)
-      @rf_correction_automatic = raw.to_f.round(1)
-    end
-
-    def senders=(raw)
-      @senders = raw.to_i
-    end
-
-    def visible_senders=(raw)
-      @visible_senders = raw.to_i
-    end
-
-    def signal=(raw)
-      @signal = raw.to_f.round(3)
-    end
-
-    def senders_signal=(raw)
-      @senders_signal = raw.to_f.round(3)
-    end
-
-    def senders_messages=(raw)
-      @senders_messages = raw.to_i
-    end
-
-    def good_senders_signal=(raw)
-      @good_senders_signal = raw.to_f.round(3)
-    end
-
-    def good_and_bad_senders=(raw)
-      @good_and_bad_senders = raw.to_i
-    end
-
-    def good_senders=(raw)
-      @good_senders = raw.to_i
-    end
-
-  end
-
-end