tac_scribe 0.2.1-java → 0.7.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad06d7c2f742a8d35c641bf120a6f95391902ea57719669cc53cd80186a14493
-  data.tar.gz: e35b648c32b18fe4628ee4a3a46adb6a378f2639d2e85a9cd6743b5d57624f7d
+  metadata.gz: 9dc052878565aa0a92dca2eaf35fceec802af0ee74b7f316ea4efb2d243cef81
+  data.tar.gz: 601360e067fbf0812f9e4e77af1eb1ed724544a01db91a8df81e4c0e903922d9
 SHA512:
-  metadata.gz: 9a0fb2a75b2d1c66ff44aca4bbcdb3bf905032c20f631230c4491cfc8c696de3059b947e89c245b30c624d6c89a37f20bb9f24a38e0acc876bfefb409b04a442
-  data.tar.gz: 3502da2ea575e6a40a87599c2a117ccdbf12417b59feef9dd92628c9f56c46a1b642795203437d7b81321eda4c4c64e67e23d5203cb8ec4cf1c63bf6529c5f97
+  metadata.gz: ba986646a11ca3315dd2a6b3e54b0c1ff6766f239d73540779645055ddd2710e32e28a7409dffea1482a5b50d88f08f9ed4a80e9b65ed5152daa90e9965d457f
+  data.tar.gz: 519a7874ef8a1f9ec48f34626e5b34e05850c0a532228dd8dd175a96c5fae39ae531792bea547ecb98530df96c5c9745dc714a834cbed712c4ae9dfe5e26ff09

data/.rubocop.yml

@@ -14,7 +14,10 @@ Metrics/BlockLength:
     # There isn't much sense breaking up the OptionParser block since splitting
     # into db and tacview option methods will just break the method length cop
     # and splitting further doesn't aid readability
-    - exe/start_scribe
+    - exe/tac_scribe
+    # Cannot really avoid this
+    - tac_scribe.gemspec
+    
 Metrics/MethodLength:
   Exclude:
     # Breaking up the initializer doesn't really do much for readability
@@ -29,3 +32,13 @@ Style/GlobalVars:
   Exclude:
     # Using a global variable makes it available to the Pry console
     - bin/console
+AllCops:
+  Exclude:
+    # These files will need a MAJOR refactoring to get rid of these warnings
+    - lib/tac_scribe/cache.rb
+    - lib/tac_scribe/datastore.rb
+    - lib/tac_scribe/daemon.rb
+ClassVars:
+  Exclude:
+    # We are fine with this and understand the risks. We are not inheriting.
+    - lib/tac_scribe/event_processor.rb

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.3
+ruby-2.7.0

data/CHANGELOG.md

@@ -4,7 +4,50 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.7.1]
+### Changed
+- Fixed issue where "name" fields were not being populated
+  if airfields were not being loaded first
+
+## [0.7.0]
+### Changed
+- Synced Lat/Lon calculations with DCS and fixed issue where
+  calculations were incorrect if only one value was updated
+
+## [0.6.2]
+### Changed
+- Fixed typo causing app to fail
+
+## [0.6.1]
+### Changed
+- Test build for gem issue
+
+## [0.6.0]
+### Added
+- Calculates and stores speed of units
+
+### Fixed
+- Made more robust against failures and more logging messages
+
+## [0.5.0]
+### Changed
+- Added missing db column to migration file
+- Clear the cache on server restart
+- Add more info to logging
+
+## [0.4.0]
+### Changed
+- Switch to periodic writing to the database
+
+## [0.3.0] - 2019-10-27
+### Changed
+- Changed the command-line name to match gem
+
+### Fixed
+- Sleep between connection attempts
+
+### Added
+- Unit type filtering
 
 ## [0.2.1] - 2019-10-13
 ### Changed

data/README.md

@@ -21,9 +21,32 @@ Or install it yourself as:
 
 ## Usage
 
-You can run the tool using the `start_scribe` command. Use the `--help`
+You can run the tool using the `tac_scribe` command. Use the `--help`
 option for information on required arguments
 
+### Whitelist
+
+If you want to restrict what units get written to the database (e.g. for
+performance reasons) then create a whitelist file and pass that in with
+the whitelist option. For example if you only care about air units
+and landing areas create a file like the following:
+
+`whitelist.txt`
+
+With the following content
+
+```
+Sea+Watercraft+AircraftCarrier
+Air+Rotorcraft
+Air+FixedWing
+Ground+Static+Aerodrome
+Navaid+Static+Bullseye
+```
+
+and add `-w whitelist.txt` to the command-line.
+
+The unit type is the type provided by Tacview and it must be an exact match
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then,

data/data/whitelist.example

@@ -0,0 +1,5 @@
+Sea+Watercraft+AircraftCarrier
+Air+Rotorcraft
+Air+FixedWing
+Ground+Static+Aerodrome
+Navaid+Static+Bullseye

data/db/001_create_unit_table.rb

@@ -12,7 +12,9 @@ Sequel.migration do
       String :group, null: true
       Integer :coalition
       Integer :heading
+      Integer :speed
       Time :updated_at
+      Boolean :deleted
       # TODO: GIST Index on the position
     end
   end

data/exe/{start_scribe → tac_scribe}

@@ -15,7 +15,8 @@ options = {
   db_name: 'tac_scribe',
   verbose_logging: false,
   threads: 1,
-  populate_airfields: false
+  populate_airfields: false,
+  whitelist: nil
 }
 
 OptionParser.new do |opts|
@@ -51,7 +52,7 @@ OptionParser.new do |opts|
           'Postgresql server port (Default: 5432)') do |v|
     options[:db_port] = v
   end
-  opts.on('-u', '--db-username=username',
+  opts.on('-u', '--db-user=username',
           'Postgresql username (Required)') do |v|
     options[:db_user] = v
   end
@@ -76,6 +77,10 @@ OptionParser.new do |opts|
           'Verbose logging') do |_v|
     options[:verbose] = true
   end
+  opts.on('-w', '--whitelist=whitelist',
+          'Whitelist filename') do |v|
+    options[:whitelist] = v
+  end
 end.parse!
 
 %i[db_user db_password].each do |parameter|
@@ -99,5 +104,6 @@ TacScribe::Daemon.new(
   db_password: options[:db_password],
   verbose_logging: options[:verbose],
   thread_count: options[:threads].to_i,
-  populate_airfields: options[:populate_airfields]
+  populate_airfields: options[:populate_airfields],
+  whitelist: options[:whitelist]
 ).start_processing

data/lib/tac_scribe/cache.rb

@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+require 'georuby'
+require 'sequel'
+require 'sequel-postgis-georuby'
+require 'singleton'
+require 'concurrent-ruby'
+require 'haversine'
+
+module TacScribe
+  # The in-memory cache that is updated by events in real-time before the data
+  # is synced to the DB
+  class Cache
+    include Singleton
+    include GeoRuby::SimpleFeatures
+
+    @@cache = Concurrent::Hash.new
+
+    attr_accessor :reference_latitude, :reference_longitude
+
+    def data
+      @@cache
+    end
+
+    def write_object(object)
+      if reference_latitude != 0 || reference_longitude != 0
+        localize_position(object)
+      end
+
+      id = object[:object_id]
+      object[:id] = id
+
+      cache_object = @@cache[id]
+
+      object[:position] = set_position(object, cache_object)
+
+      %i[object_id latitude longitude color country].each do |key|
+        object.delete(key)
+      end
+
+      # https://wiki.hoggitworld.com/view/DCS_singleton_coalition
+      if object[:coalition]
+        object[:coalition] = case object[:coalition]
+                             when 'Enemies' # Enemies is Bluefor
+                               2
+                             when 'Allies' # Allies is Redfor
+                               1
+                             else # Neutral
+                               0
+                             end
+      end
+
+      if cache_object
+        object[:heading] = calculate_heading(cache_object, object)
+        object[:speed] = calculate_speed(cache_object, object)
+        cache_object.merge!(object)
+      else
+        object[:heading] = -1
+        object[:speed] = 0
+        cache_object = object
+      end
+
+      if !cache_object.key?(:altitude) || !cache_object[:altitude]
+        cache_object[:altitude] = 0
+      end
+      if !cache_object.key?(:coalition) || !cache_object[:coalition]
+        cache_object[:coalition] = 2
+      end
+
+      cache_object[:pilot] = nil unless cache_object.key?(:pilot)
+
+      cache_object[:group] = nil unless cache_object.key?(:group)
+
+      cache_object[:deleted] = false unless cache_object.key?(:deleted)
+
+      cache_object[:updated_at] = Time.now
+
+      @@cache[id] = cache_object
+    end
+
+    def delete_object(id)
+      @@cache[id][:deleted] = true if @@cache[id]
+    end
+
+    def clear
+      @@cache.clear
+      self.reference_latitude = nil
+      self.reference_longitude = nil
+    end
+
+    private
+
+    def localize_position(object)
+      if reference_latitude && object.key?(:latitude)
+        object[:latitude] = reference_latitude + object[:latitude]
+      end
+      if reference_longitude && object.key?(:longitude)
+        object[:longitude] = reference_longitude + object[:longitude]
+      end
+    end
+
+    def set_position(object, cache_object)
+      longitude = if object.key?(:longitude)
+                    object[:longitude]
+                  else
+                    cache_object[:position].x
+                  end
+
+      latitude = if object.key?(:latitude)
+                   object[:latitude]
+                 else
+                   cache_object[:position].y
+                 end
+
+      # This "Point" class is not lat/long aware which is why we are
+      # flipping things up here because when it converts to SQL we need
+      # the long to be first since that is what postgresql expects.
+      Point.from_x_y(longitude, latitude)
+    end
+
+    def calculate_heading(cache_object, object)
+      if cache_object[:position] == object[:position]
+        return cache_object[:heading]
+      end
+
+      begin
+        cache_object[:position].bearing_to(object[:position]).to_i
+      rescue Math::DomainError => e
+        puts 'Could not calculate heading: ' + e.message
+        puts 'Old Position: ' + cache_object[:position].inspect
+        puts 'New Position: ' + object[:position].inspect
+      end
+    end
+
+    def calculate_speed(cache_object, object)
+      time = object[:game_time] - cache_object[:game_time]
+
+      start_point = cache_object[:position]
+      end_point = object[:position]
+
+      # Because of the above issues with Point and Lat/Lon
+      # the values are reverse here :(
+      distance = Haversine.distance(start_point.y, start_point.x,
+                                    end_point.y, end_point.x).to_meters
+
+      speed =  distance / time
+
+      speed.to_i
+    end
+  end
+end

data/lib/tac_scribe/daemon.rb

@@ -2,7 +2,9 @@
 
 require 'json'
 require 'tacview_client'
+require 'set'
 require_relative 'datastore'
+require_relative 'cache'
 require_relative 'event_queue'
 require_relative 'event_processor'
 
@@ -13,7 +15,7 @@ module TacScribe
     def initialize(db_host:, db_port:, db_name:, db_user:, db_password:,
                    tacview_host:, tacview_port:, tacview_password:,
                    tacview_client_name:, verbose_logging:, thread_count:,
-                   populate_airfields:)
+                   populate_airfields:, whitelist: nil)
       Datastore.instance.configure do |config|
         config.host = db_host
         config.port = db_port
@@ -23,11 +25,14 @@ module TacScribe
       end
       Datastore.instance.connect
 
-      @event_queue = EventQueue.new verbose_logging: verbose_logging
+      @event_queue = EventQueue.new
+
+      @verbose_logging = verbose_logging
 
       @populate_airfields = populate_airfields
       @thread_count = thread_count
-      @processing_threads = []
+      @threads = {}
+      @whitelist = Set.new(IO.read(whitelist).split) if whitelist
 
       @client = TacviewClient::Client.new(
         host: tacview_host,
@@ -45,53 +50,112 @@ module TacScribe
     # for example
     def start_processing
       loop do
-        kill_processing_threads
+        puts 'Starting processing loop'
         @event_queue.clear
         Datastore.instance.truncate_table
+        Cache.instance.clear
         start_processing_threads
+        start_db_sync_thread
+        start_reporting_thread
         populate_airfields if @populate_airfields
+        @threads.each_pair do |key, _value|
+          puts "#{key} thread started"
+        end
         @client.connect
-        sleep 30
+        # If this code is executed it means we have been disconnected without
+        # exceptions. We will still sleep to stop a retry storm. Just not as
+        # long.
+        puts "Disconnected from Tacview"
+        kill_threads
+        sleep 10
       # Rescuing reliably from Net::HTTP is a complete bear so rescue
       # StandardError. It ain't pretty but it is reliable. We will puts
       # the exception just in case
       # https://stackoverflow.com/questions/5370697/what-s-the-best-way-to-handle-exceptions-from-nethttp
       rescue StandardError => e
+        puts 'Exception in processing loop'
         puts e.message
         puts e.backtrace
+        kill_threads
+        sleep 30
         next
       end
     end
 
-    def kill_processing_threads
-      @processing_threads.each do |thr|
-        thr.kill
-        thr.join
+    def kill_threads
+      puts 'Killing Threads'
+      @threads.each_pair do |key, thread|
+        puts "Killing #{key} thread"
+        thread.kill
+        thread.join
       end
     end
 
     def start_processing_threads
-      @thread_count.times do
-        @processing_threads << Thread.new do
-          EventProcessor.new(datastore: Datastore.instance,
-                             event_queue: @event_queue).start
+      @event_processor = EventProcessor.new(cache: Cache.instance,
+                                            datastore: Datastore.instance,
+                                            event_queue: @event_queue,
+                                            whitelist: @whitelist)
+      event_processor_thread = Thread.new do
+        @event_processor.start
+      end
+      event_processor_thread.name = 'Event Processor'
+      @threads[:processing] = event_processor_thread
+    end
+
+    def start_db_sync_thread
+      db_write_thread = Thread.new do
+        loop do
+          sleep 1
+          deleted = Datastore.instance.write_objects(Cache.instance.data.values)
+          deleted.each { |id| Cache.instance.data.delete(id) }
+        rescue StandardError
+          next
+        end
+      end
+      db_write_thread.name = 'Database Writing'
+      @threads[:database] = db_write_thread
+    end
+
+    def start_reporting_thread
+      return unless @verbose_logging
+
+      reporting_thread = Thread.new do
+        sleep 5
+        loop do
+          puts "#{Time.now.strftime('%FT%T')}\t" \
+               "Events Incoming: #{@event_queue.events_written}\t" \
+               "Processed: #{@event_processor.events_processed}\t" \
+               "Ignored: #{@event_processor.events_ignored}\t" \
+               "Queue Size: #{@event_queue.size}\t" \
+               "Objects Written: #{Datastore.instance.written}\t" \
+               "Deleted: #{Datastore.instance.deleted}"
+          @event_queue.events_written = 0
+          @event_processor.events_processed = 0
+          @event_processor.events_ignored = 0
+          Datastore.instance.written = 0
+          Datastore.instance.deleted = 0
+          sleep 1
         end
       end
+      reporting_thread.name = 'Reporting'
+      @threads[:reporting] = reporting_thread
     end
 
     def populate_airfields
-      json = File.read(File.join(File.dirname(__FILE__), '../../data/airfields.json'))
+      json = File.read(File.join(File.dirname(__FILE__),
+                                 '../../data/airfields.json'))
       airfields = JSON.parse(json)
       airfields.each_with_index do |airfield, i|
-        @event_queue.update_object({
-            object_id: (45_000_000 + i).to_s,
-            latitude: BigDecimal(airfield['lat'].to_s),
-            longitude: BigDecimal(airfield['lon'].to_s),
-            altitude: BigDecimal(airfield['alt'].to_s),
-            type: 'Ground+Static+Aerodrome',
-            name: airfield['name'],
-            coalition: 2
-        })
+        @event_queue.update_object(
+          object_id: (45_000_000 + i).to_s,
+          latitude: BigDecimal(airfield['lat'].to_s),
+          longitude: BigDecimal(airfield['lon'].to_s),
+          altitude: BigDecimal(airfield['alt'].to_s),
+          type: 'Ground+Static+Aerodrome',
+          name: airfield['name'],
+          coalition: 0 # Neutral
+        )
       end
     end
   end

data/lib/tac_scribe/datastore.rb

@@ -14,7 +14,7 @@ module TacScribe
     include Singleton
     include GeoRuby::SimpleFeatures
 
-    attr_accessor :db
+    attr_accessor :db, :written, :deleted
 
     @configuration = nil
     @db = nil
@@ -52,24 +52,29 @@ module TacScribe
       @db[:units].truncate
     end
 
-    def write_object(event, timestamp)
-      unit = get_unit(event[:object_id])
-
-      # Tacview omits values that don't change to save
-      # data bandwidth and storage. If something has not changed then
-      # use the old value
-      current_position = get_position(event, unit)
-
-      if unit
-        update_unit(event, unit, current_position, timestamp)
-      else
-        insert_unit(event, current_position, timestamp)
+    def write_objects(objects)
+      objects = objects.map do |object|
+        obj = object.clone
+        obj.delete(:game_time)
+        obj
       end
-    end
 
-    def delete_object(object_id)
-      count = @db[:units].where(id: object_id).delete
-      "Deleted #{object_id} #{object_id.class} - #{count}"
+      @db[:units].insert_conflict(
+        constraint: :units_pkey,
+        update: { position: Sequel[:excluded][:position],
+                  altitude: Sequel[:excluded][:altitude],
+                  heading: Sequel[:excluded][:heading],
+                  speed: Sequel[:excluded][:speed],
+                  updated_at: Sequel[:excluded][:updated_at],
+                  deleted: Sequel[:excluded][:deleted] }
+      )
+                 .multi_insert(objects)
+      deleted_ids = @db[:units].where(deleted: true).select_map(:id)
+      @db[:units].where(deleted: true).delete
+      self.written = objects.size
+      self.deleted = deleted_ids.size
+
+      deleted_ids
     end
 
     private
@@ -85,56 +90,5 @@ module TacScribe
         "/#{@configuration.database}"
       end
     end
-
-    def get_unit(id)
-      @db[:units].where(id: id).first
-    end
-
-    def update_unit(event, unit, current_position, timestamp)
-      heading = calculate_heading(unit[:position],
-                                  current_position,
-                                  unit[:heading])
-
-      @db[:units].where(id: event[:object_id]).update(
-        position: current_position[:lat_lon],
-        altitude: current_position[:altitude],
-        heading: heading,
-        updated_at: timestamp
-      )
-    end
-
-    def insert_unit(event, current_position, timestamp)
-      @db[:units].insert(id: event[:object_id],
-                         position: current_position[:lat_lon],
-                         altitude: current_position[:altitude],
-                         type: event[:type],
-                         name: event[:name],
-                         group: event[:group],
-                         pilot: event[:pilot],
-                         coalition: event[:coalition] == 'Allies' ? 0 : 1,
-                         updated_at: timestamp)
-    end
-
-    def get_position(event, unit)
-      {
-        lat_lon: Point.from_x_y(
-          event.fetch(:longitude) { unit ? unit[:position].y : nil },
-          event.fetch(:latitude) { unit ? unit[:position].x : nil }
-        ),
-        altitude: event.fetch(:altitude) { unit ? unit[:altitude] : nil }
-      }
-    end
-
-    def calculate_heading(old_position, current_position, current_heading)
-      return current_heading if old_position == current_position[:lat_lon]
-
-      begin
-        old_position.bearing_to(current_position[:lat_lon]).to_i
-      rescue Math::DomainError => e
-        puts 'Could not calculate heading: ' + e.message
-        puts 'Old Position: ' + old_position.inspect
-        puts 'New Position: ' + current_position.inspect
-      end
-    end
   end
 end

data/lib/tac_scribe/event_processor.rb

@@ -2,23 +2,33 @@
 
 require 'tacview_client/base_processor'
 require 'time'
-require_relative 'datastore'
+require 'concurrent-ruby'
+require_relative 'cache'
 
 module TacScribe
   # Processes the events emitted by the Ruby Tacview Client
   class EventProcessor
-    def initialize(datastore:, event_queue:)
+    @@ignored_units = Concurrent::Set.new
+
+    attr_accessor :events_processed, :events_ignored
+
+    def initialize(cache:, datastore:, event_queue:, whitelist: nil)
+      @cache = cache
       @datastore = datastore
       @event_queue = event_queue
+      @whitelist = whitelist
+      self.events_processed = 0
+      self.events_ignored = 0
     end
 
     def start
       loop do
-        wrapped_event = @event_queue.get_event
+        wrapped_event = @event_queue.shift
         process_event(wrapped_event)
       rescue StandardError => e
         puts wrapped_event
         puts e.inspect
+        puts e.backtrace
         next
       end
     end
@@ -29,6 +39,10 @@ module TacScribe
         update_object(wrapped_event[:event], wrapped_event[:time])
       when :delete_object
         delete_object(wrapped_event[:object_id])
+      when :set_latitude
+        update_latitude wrapped_event[:value]
+      when :set_longitude
+        update_longitude wrapped_event[:value]
       end
     end
 
@@ -52,35 +66,50 @@ module TacScribe
     # @option event [BigDecimal] :altitude The object altitude above sea level
     #   in meters to 1 decimal place.
     def update_object(event, time)
-      if @event_queue.reference_latitude || @event_queue.reference_longitude
-        localize_position(event)
+      return if ignore_unit?(event)
+
+      # Hack to make sure the :name field is present so that it is included
+      # in the SQL
+      event[:name] = "" unless event.has_key?(:name)
+      event[:game_time] = time
+
+      self.events_processed += 1
+      @cache.write_object(event)
+    end
+
+    def ignore_unit?(event)
+      if @@ignored_units.include?(event[:object_id])
+        self.events_ignored += 1
+        return true
       end
 
-      @datastore.write_object(event, time)
+      if @whitelist && event[:type] && !@whitelist.include?(event[:type])
+        @@ignored_units << event[:object_id]
+        self.events_ignored += 1
+        return true
+      end
+
+      false
     end
 
     # Process a delete event for an object
     #
-    # @param object_id [String] A hexadecimal number representing the object
-    #   ID
-    def delete_object(object_id)
-      @datastore.delete_object(object_id)
+    # @param id [String] A hexadecimal number representing the object ID
+    def delete_object(id)
+      if @@ignored_units.delete?(id)
+        nil
+      else
+        @cache.delete_object(id)
+      end
+      self.events_processed += 1
     end
 
-    # If we have reference lat/long then use that as a base and update the event
-    # position
-    def localize_position(event)
-      # There is no combination of layouts for these lines that doesn' trip
-      # at least one rubocop cop so just ignore the guard clause. The best
-      # one is using an inline if but that breaks the line length.
-      # rubocop:disable Style/GuardClause
-      if event[:latitude]
-        event[:latitude] = @event_queue.reference_latitude + event[:latitude]
-      end
-      if event[:longitude]
-        event[:longitude] = @event_queue.reference_longitude + event[:longitude]
-      end
-      # rubocop:enable Style/GuardClause
+    def update_latitude(value)
+      Cache.instance.reference_latitude = value
+    end
+
+    def update_longitude(value)
+      Cache.instance.reference_longitude = value
     end
   end
 end

data/lib/tac_scribe/event_queue.rb

@@ -6,32 +6,22 @@ require 'time'
 module TacScribe
   # Processes the events emitted by the Ruby Tacview Client
   class EventQueue < TacviewClient::BaseProcessor
-    attr_accessor :reference_latitude, :reference_longitude
+    attr_accessor :events_written
 
-    def initialize(verbose_logging:)
-      @verbose_logging = verbose_logging
+    def initialize
       @events = Queue.new
-      @event_write = 0
-      @event_read = 0
-
-      return unless verbose_logging == true
-
-      Thread.new do
-        loop do
-          puts "#{Time.now.strftime("%FT%T")} - Queue Size: #{@events.size} \t Events Added: #{@event_write} \t Events Processed: #{@event_read}"
-          @event_write = 0
-          @event_read = 0
-          sleep 1
-        end
-      end
+      self.events_written = 0
     end
 
     def clear
       @events.clear
     end
 
-    def get_event
-      @event_read += 1
+    def size
+      @events.size
+    end
+
+    def shift
       @events.shift
     end
 
@@ -53,7 +43,7 @@ module TacScribe
     # @option event [BigDecimal] :altitude The object altitude above sea level
     #   in meters to 1 decimal place.
     def update_object(event)
-      @event_write += 1
+      self.events_written += 1
       @events << { type: :update_object, event: event, time: @time }
     end
 
@@ -62,7 +52,7 @@ module TacScribe
     # @param object_id [String] A hexadecimal number representing the object
     #   ID
     def delete_object(object_id)
-      @event_write += 1
+      self.events_written += 1
       @events << { type: :delete_object, object_id: object_id }
     end
 
@@ -81,9 +71,9 @@ module TacScribe
     def set_property(property:, value:)
       case property
       when 'ReferenceLatitude'
-        self.reference_latitude = BigDecimal(value)
+        @events << { type: :set_latitude, value: BigDecimal(value) }
       when 'ReferenceLongitude'
-        self.reference_longitude = BigDecimal(value)
+        @events << { type: :set_longitude, value: BigDecimal(value) }
       when 'ReferenceTime'
         @reference_time = @time = Time.parse(value)
       end

data/lib/tac_scribe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TacScribe
-  VERSION = '0.2.1'
+  VERSION = '0.7.1'
 end

data/tac_scribe.gemspec

@@ -4,6 +4,8 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tac_scribe/version'
 
+puts "RUBY_PLATFORM = #{RUBY_PLATFORM}"
+
 Gem::Specification.new do |spec|
   spec.name          = 'tac_scribe'
   spec.version       = TacScribe::VERSION
@@ -24,9 +26,9 @@ Gem::Specification.new do |spec|
 
   spec.metadata['yard.run'] = 'yri'
 
+  spec.platform = RUBY_PLATFORM == 'java' ? 'java' : 'ruby'
+
   if RUBY_PLATFORM == 'java'
-    # TODO: Specifying a verison chokes bundler for some reason
-    spec.platform = 'java'
     spec.add_dependency 'activerecord-jdbcpostgresql-adapter'
   else
     spec.add_dependency 'pg', '~>1.1'
@@ -37,6 +39,8 @@ Gem::Specification.new do |spec|
   # The following gem is newish and not heavily updated so the chances
   # of an API breaking change are higher then normal. Therefore lock the
   # version
+  spec.add_dependency 'concurrent-ruby', '~>1.1.5'
+  spec.add_dependency 'haversine', '~>0.3'
   spec.add_dependency 'sequel-postgis-georuby', '0.1.2'
   spec.add_dependency 'tacview_client', '~>0.1'
 
@@ -46,4 +50,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~>0.73'
   spec.add_development_dependency 'simplecov', '~>0.17'
   spec.add_development_dependency 'yard', '~>0.9'
+  spec.add_development_dependency 'pry-byebug', '~>3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tac_scribe
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.7.1
 platform: java
 authors:
 - Jeffrey Jones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-12 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.22'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+  name: concurrent-ruby
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  name: haversine
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -164,11 +192,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  name: pry-byebug
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 description: Write Tacview data to PostGIS database
 email:
 - jeff@jones.be
 executables:
-- start_scribe
+- tac_scribe
 extensions: []
 extra_rdoc_files: []
 files:
@@ -187,10 +229,12 @@ files:
 - bin/console
 - bin/setup
 - data/airfields.json
+- data/whitelist.example
 - db/001_create_unit_table.rb
 - db/README.md
-- exe/start_scribe
+- exe/tac_scribe
 - lib/tac_scribe.rb
+- lib/tac_scribe/cache.rb
 - lib/tac_scribe/daemon.rb
 - lib/tac_scribe/datastore.rb
 - lib/tac_scribe/event_processor.rb
@@ -219,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 2.7.10
 signing_key:
 specification_version: 4
 summary: Write Tacview data to PostGIS database