tac_scribe 0.6.0 → 0.7.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f357b6fb0a4a45accdc07e20ff29fe6a93c66d7b88665ea51a652ca28a2b1d4
-  data.tar.gz: b01e4759b8e523fee4541b71b43102fcb62d228a15b3c87bb6b969fc33e6e206
+  metadata.gz: d9a4c4ff87f88c46b4a02e0cd8a0ac729f9932b5a82db7b8851aa9180183e0f9
+  data.tar.gz: 3011df9a3162d4209bd12f5d6a1383de4e4f26f624316112dcf6c973f8bfabbc
 SHA512:
-  metadata.gz: fc97730d7e4b521a46987f2ea01d2680715933571ce33218e8ad69033a35df0b9722fcc123af082d71cd70487d7caab60765d171c5b29301445d0ec6c3178ea8
-  data.tar.gz: 3e27a7a3957fab068f168dad158a6ae555faab3a40fa8535c0ee65629fe8d4915255c41890ff0d0ea79e3a36b24e8642d4df4f3747a891fd90b175e4883a9a59
+  metadata.gz: 5434ff0ddcae2e7f9036695851b5a309b5d33a28f2b7be01a3fe61914aedb0f99fe2e5e4b7260c5b0da1f86e780e6761ec80c8de3fbad94ade95c4375b380066
+  data.tar.gz: 38b1e100620beed93ce87f813cdcbbe42646cfbc1e3bba8ac59ee564f1b219ca96f7e3959fb171fb2f7e5ce19dd6217c767940f5758bec1954fa43cdf0f28b19

data/.ruby-version

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

data/CHANGELOG.md

@@ -4,20 +4,48 @@ 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).
 
-## [0.6.0]
+## [Unreleased]
+
+## [0.7.3] - 2020-08-10
+### Changed
+- Bug fixes after adding CinC support.
+
+## [0.7.2] - 2020-08-10
+### Added
+- Support for "Commander-In-Chief" to get airbase information
+
+## [0.7.1] - 2020-08-10
+### Changed
+- Fixed issue where "name" fields were not being populated
+  if airfields were not being loaded first
+
+## [0.7.0] - 2020-07-5
+### Changed
+- Synced Lat/Lon calculations with DCS and fixed issue where
+  calculations were incorrect if only one value was updated
+
+## [0.6.2] - 2020-04-19
+### Changed
+- Fixed typo causing app to fail
+
+## [0.6.1] - 2020-04-19
+### Changed
+- Test build for gem issue
+
+## [0.6.0] - 2020-04-19
 ### Added
 - Calculates and stores speed of units
 
 ### Fixed
 - Made more robust against failures and more logging messages
 
-## [0.5.0]
+## [0.5.0] - 2020-03-17
 ### Changed
 - Added missing db column to migration file
 - Clear the cache on server restart
 - Add more info to logging
 
-## [0.4.0]
+## [0.4.0] - 2020-03-13
 ### Changed
 - Switch to periodic writing to the database
 

data/exe/tac_scribe

@@ -10,6 +10,8 @@ options = {
   tacview_port: 42_674,
   tacview_password: nil,
   tacview_client_name: 'TacScribe',
+  cinc_enabled: false,
+  cinc_port: 9000,
   db_host: 'localhost',
   db_port: 5432,
   db_name: 'tac_scribe',
@@ -43,6 +45,17 @@ OptionParser.new do |opts|
     options[:tacview_client_name] = v
   end
 
+  opts.separator "\nCommander-In-Chief Options"
+  opts.on('-b', '--enable-cinc',
+          'Is Cinc enabled? (Default: false)') do |_v|
+    options[:cinc_enabled] = true
+  end
+  opts.on('-m', '--cinc-port=port',
+          'Cinc server port (Default: 9001)') do |v|
+    options[:cinc_port] = v
+  end
+  
+
   opts.separator "\nDatabase Options"
   opts.on('-o', '--db-host=host',
           'Postgresql server hostname / IP (Default: localhost)') do |v|
@@ -52,7 +65,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
@@ -92,6 +105,11 @@ end.parse!
   exit(1)
 end
 
+if(options[:populate_airfields] && options[:cinc_enabled])
+  puts "You cannot populate airfields AND enable Cinc at the same time"
+  exit(1)
+end
+
 TacScribe::Daemon.new(
   tacview_host: options[:tacview_host],
   tacview_port: options[:tacview_port],
@@ -105,5 +123,7 @@ TacScribe::Daemon.new(
   verbose_logging: options[:verbose],
   thread_count: options[:threads].to_i,
   populate_airfields: options[:populate_airfields],
-  whitelist: options[:whitelist]
+  whitelist: options[:whitelist],
+  cinc_enabled: options[:cinc_enabled],
+  cinc_port: options[:cinc_port]
 ).start_processing

data/lib/tac_scribe/cache.rb

@@ -23,11 +23,12 @@ module TacScribe
     end
 
     def write_object(object)
-      if reference_latitude != 0 || reference_longitude != 0
+      if (reference_latitude != 0 || reference_longitude != 0) && object[:type] != "Ground+Static+Aerodrome"
         localize_position(object)
       end
 
       id = object[:object_id]
+      id ||= object[:id].to_s
       object[:id] = id
 
       cache_object = @@cache[id]
@@ -38,18 +39,29 @@ module TacScribe
         object.delete(key)
       end
 
-      if object[:coalition]
+      # https://wiki.hoggitworld.com/view/DCS_singleton_coalition
+      # Tacview returns a string, CinC returns an integer so we
+      # only do the conversion if there is a string.
+      if object[:coalition] && object[:coalition].is_a?(String)
         object[:coalition] = case object[:coalition]
-                             when 'Allies'
-                               0
-                             when 'Enemies'
-                               1
-                             else
+                             when 'Enemies' # Enemies is Bluefor
                                2
+                             when 'Allies' # Allies is Redfor
+                               1
+                             else # Neutral
+                               0
                              end
       end
 
-      if cache_object
+      if object[:type] = "Ground+Static+Aerodrome"
+        object[:heading] = object[:wind_heading] ? object[:wind_heading] : 0
+        object[:speed] = object[:wind_speed] ? object[:wind_speec] : 0
+        object.delete(:wind_heading)
+        object.delete(:wind_speed)
+        object.delete(:category)
+        cache_object = object
+        # No-op
+      elsif cache_object
         object[:heading] = calculate_heading(cache_object, object)
         object[:speed] = calculate_speed(cache_object, object)
         cache_object.merge!(object)
@@ -83,6 +95,8 @@ module TacScribe
 
     def clear
       @@cache.clear
+      self.reference_latitude = nil
+      self.reference_longitude = nil
     end
 
     private
@@ -100,13 +114,13 @@ module TacScribe
       longitude = if object.key?(:longitude)
                     object[:longitude]
                   else
-                    cache_object[:position].y
+                    cache_object[:position].x
                   end
 
       latitude = if object.key?(:latitude)
                    object[:latitude]
                  else
-                   cache_object[:position].x
+                   cache_object[:position].y
                  end
 
       # This "Point" class is not lat/long aware which is why we are

data/lib/tac_scribe/daemon.rb

@@ -3,6 +3,7 @@
 require 'json'
 require 'tacview_client'
 require 'set'
+require 'cinc'
 require_relative 'datastore'
 require_relative 'cache'
 require_relative 'event_queue'
@@ -15,7 +16,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:, whitelist: nil)
+                   populate_airfields:, whitelist: nil, cinc_enabled:, cinc_port:)
       Datastore.instance.configure do |config|
         config.host = db_host
         config.port = db_port
@@ -34,13 +35,20 @@ module TacScribe
       @threads = {}
       @whitelist = Set.new(IO.read(whitelist).split) if whitelist
 
-      @client = TacviewClient::Client.new(
+      @tacview_client = TacviewClient::Client.new(
         host: tacview_host,
         port: tacview_port,
         password: tacview_password,
         processor: @event_queue,
         client_name: tacview_client_name
       )
+
+      if cinc_enabled
+        @cinc_client = Cinc::Client.new(
+          host: tacview_host,
+          port: cinc_port
+        )
+      end
     end
 
     # Starts processing and reconnects if the client was disconnected.
@@ -55,16 +63,19 @@ module TacScribe
         Datastore.instance.truncate_table
         Cache.instance.clear
         start_processing_threads
+        start_cinc_thread
         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
+        @tacview_client.connect
         # 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
@@ -101,6 +112,30 @@ module TacScribe
       @threads[:processing] = event_processor_thread
     end
 
+    def start_cinc_thread
+      return unless @cinc_client
+      cinc_thread = Thread.new do
+        loop do
+          @cinc_client.connect
+          while true
+            @cinc_client.get_airbases.each do |airbase|
+              @event_queue.update_object Hash[airbase.map{ |k, v| [k.to_sym, v] }]
+            end
+            sleep 60
+          end
+          rescue StandardError => e
+            puts 'Exception in cinc thread'
+            puts e.message
+            puts e.backtrace
+            sleep 30
+            next
+        end
+      end
+
+      cinc_thread.name = 'Cinc Processor'
+      @threads[:cinc] = cinc_thread
+    end
+
     def start_db_sync_thread
       db_write_thread = Thread.new do
         loop do
@@ -152,7 +187,7 @@ module TacScribe
           altitude: BigDecimal(airfield['alt'].to_s),
           type: 'Ground+Static+Aerodrome',
           name: airfield['name'],
-          coalition: 2
+          coalition: 0 # Neutral
         )
       end
     end

data/lib/tac_scribe/event_processor.rb

@@ -28,6 +28,7 @@ module TacScribe
       rescue StandardError => e
         puts wrapped_event
         puts e.inspect
+        puts e.backtrace
         next
       end
     end
@@ -65,8 +66,11 @@ module TacScribe
     # @option event [BigDecimal] :altitude The object altitude above sea level
     #   in meters to 1 decimal place.
     def update_object(event, time)
-      return if ignore_unit?(even)
+      return if ignore_unit?(event)
 
+      # Hack to make sure the :name field is present so that it is included
+      # in the SQL
+      event[:name] = nil unless event.has_key?(:name)
       event[:game_time] = time
 
       self.events_processed += 1

data/lib/tac_scribe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TacScribe
-  VERSION = '0.6.0'
+  VERSION = '0.7.3.rc1'
 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,6 +26,8 @@ Gem::Specification.new do |spec|
 
   spec.metadata['yard.run'] = 'yri'
 
+  spec.platform = RUBY_PLATFORM == 'java' ? 'java' : 'ruby'
+
   if RUBY_PLATFORM == 'java'
     spec.add_dependency 'activerecord-jdbcpostgresql-adapter'
   else
@@ -39,6 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'haversine', '~>0.3'
   spec.add_dependency 'sequel-postgis-georuby', '0.1.2'
   spec.add_dependency 'tacview_client', '~>0.1'
+  spec.add_dependency 'cinc', '~>0.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -46,4 +51,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.6.0
+  version: 0.7.3.rc1
 platform: ruby
 authors:
 - Jeffrey Jones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2020-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: cinc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  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
@@ -244,11 +272,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Write Tacview data to PostGIS database