tac_scribe 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 982a3d54dbd52c5d2bc541f58d09b6c0343f522a8d3b4ddcb399d9c575969043
-  data.tar.gz: f4bb78f70f1993b5b427f7330f2be7b9621045edcc6875496a3e386ad0471c6e
+  metadata.gz: fbfc0be279d9733cd25267ab92c6becbf892281fb24900093e05d3b85c624777
+  data.tar.gz: 56a214ae80a0c7d1bfc52183a02bb3e0529eaf076648d04e1b63ae6f20f804f5
 SHA512:
-  metadata.gz: 70d21673d4f39172e609a807d96c7caf9b74f1fd68361e659ab43e2c1a993b169cf05aaef71654c5f08971d69c7e582196f3eb9c41876d0666b8c6eba9b241ca
-  data.tar.gz: d89e9d38ca8a73285316aac94067d251f28023634c3d10a5e8d2b651a98bac6a80c365281f4f66873350519cc65d98c6d15d7d246e9dddb213482ab653d937f8
+  metadata.gz: 5c5cfc5ad13980e00c54cf39ce499fdc77733454be1499594a55e4acfac42b9f4ea738c4f05144a3db21778eb71c8747c7d1813771e808684b8048c4564b71d5
+  data.tar.gz: 643fc7c958b7d2e5452651700d83ca677e8b56987bcd6a253697ccd39f9d1ef774e6971486acea9f2b97960d67616e911dd34e801f5a3377a8f6700d0720e06f

data/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+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.2.0] - 2019-10-13
+### Added
+- JRuby support
+
+### Changed
+- Improve logging of events with number of events processed.
+
+
+## [0.1.1] - 2019-09-05
+### Added
+- Added Net::HTTP error handling
+

data/README.md

@@ -41,6 +41,13 @@ See the `db` folder for information on running the database migrations.
 
 Bug reports and pull requests are welcome on GitLab at https://gitlab.com/overlord-bot/tac-scribe.
 
+### Adding Data
+
+There are incomplete data-files for this project whose completion would
+be very helpful. See the `data` folder. Current tasks needed are:
+
+* Complete the list of all airfields in DCS with their position information
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/data/airfields.json

@@ -0,0 +1,121 @@
+[{
+    "lon": 45.01909093846007,
+    "lat": 41.637735936261556,
+    "alt": 464.5004577636719,
+    "name": "Vaziani"
+  },
+  {
+    "lon": 44.94687659192431,
+    "lat": 41.67471935873423,
+    "alt": 479.69482421875,
+    "name": "Tbilisi-Lochini"
+  },
+  {
+    "lon": 43.62488628801948,
+    "lat": 43.50998473505967,
+    "alt": 430.01043701171875,
+    "name": "Nalchik"
+  },
+  {
+    "lon": 38.92520230077506,
+    "lat": 45.087429883845076,
+    "alt": 30.010032653808594,
+    "name": "Krasnodar-Center"
+  },
+  {
+    "lon": 37.35978347755592,
+    "lat": 45.01317473377168,
+    "alt": 43.00004196166992,
+    "name": "Anapa-Vityazevo"
+  },
+  {
+    "lon": 41.876483823101026,
+    "lat": 41.93210535345338,
+    "alt": 18.01001739501953,
+    "name": "Kobuleti"
+  },
+  {
+    "lon": 43.100679733081456,
+    "lat": 44.21864682380681,
+    "alt": 320.01031494140625,
+    "name": "Mineralnye Vody"
+  },
+  {
+    "lon": 44.62032726210201,
+    "lat": 43.79130325093825,
+    "alt": 154.61184692382812,
+    "name": "Mozdok"
+  },
+  {
+    "lon": 44.94718306531669,
+    "lat": 41.64116326678661,
+    "alt": 449.4102478027344,
+    "name": "Soganlug"
+  },
+  {
+    "lon": 44.588922553542936,
+    "lat": 43.20850098738094,
+    "alt": 524.0057983398438,
+    "name": "Beslan"
+  },
+  {
+    "lon": 42.49568635853585,
+    "lat": 42.179154028210135,
+    "alt": 45.010047912597656,
+    "name": "Kutaisi"
+  },
+  {
+    "lon": 37.786226060479564,
+    "lat": 44.6733296041269,
+    "alt": 40.010040283203125,
+    "name": "Novorossiysk"
+  },
+  {
+    "lon": 40.021427482235985,
+    "lat": 44.67144025735508,
+    "alt": 180.01019287109375,
+    "name": "Maykop-Khanskaya"
+  },
+  {
+    "lon": 39.924231880466095,
+    "lat": 43.43937843405085,
+    "alt": 30.010034561157227,
+    "name": "Sochi-Adler"
+  },
+  {
+    "lon": 41.142447588488196,
+    "lat": 42.852741071634995,
+    "alt": 13.339526176452637,
+    "name": "Sukhumi-Babushara"
+  },
+  {
+    "lon": 42.061021312855914,
+    "lat": 42.23872808157328,
+    "alt": 13.23994255065918,
+    "name": "Senaki-Kolkhi"
+  },
+  {
+    "lon": 40.56417576840064,
+    "lat": 43.124233340197144,
+    "alt": 21.01003074645996,
+    "name": "Gudauta"
+  },
+  {
+    "lon": 37.985886938697085,
+    "lat": 44.961383022734175,
+    "alt": 20.010303497314453,
+    "name": "Krymsk"
+  },
+  {
+    "lon": 38.0041463505281,
+    "lat": 44.56767458600406,
+    "alt": 22.00992202758789,
+    "name": "Gelendzhik"
+  },
+  {
+    "lon": 39.20306690632454,
+    "lat": 45.0460996415433,
+    "alt": 34.01003646850586,
+    "name": "Krasnodar-Pashkovsky"
+  }
+]

data/exe/start_scribe

@@ -14,7 +14,8 @@ options = {
   db_port: 5432,
   db_name: 'tac_scribe',
   verbose_logging: false,
-  threads: 1
+  threads: 1,
+  populate_airfields: false
 }
 
 OptionParser.new do |opts|
@@ -63,6 +64,10 @@ OptionParser.new do |opts|
     options[:db_name] = v
   end
   opts.separator "\nMisc options"
+  opts.on('-f', '--populate-airfields',
+          'Populate DCS airfield locations') do |_v|
+    options[:populate_airfields] = true
+  end
   opts.on('-t', '--threads=threads',
           'Thread Count (Default: 1)') do |v|
     options[:threads] = v
@@ -93,5 +98,6 @@ TacScribe::Daemon.new(
   db_user: options[:db_user],
   db_password: options[:db_password],
   verbose_logging: options[:verbose],
-  thread_count: options[:threads].to_i
+  thread_count: options[:threads].to_i,
+  populate_airfields: options[:populate_airfields]
 ).start_processing

data/lib/tac_scribe/daemon.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'json'
 require 'tacview_client'
 require_relative 'datastore'
 require_relative 'event_queue'
@@ -11,7 +12,8 @@ module TacScribe
   class Daemon
     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:)
+                   tacview_client_name:, verbose_logging:, thread_count:,
+                   populate_airfields:)
       Datastore.instance.configure do |config|
         config.host = db_host
         config.port = db_port
@@ -23,6 +25,7 @@ module TacScribe
 
       @event_queue = EventQueue.new verbose_logging: verbose_logging
 
+      @populate_airfields = populate_airfields
       @thread_count = thread_count
       @processing_threads = []
 
@@ -46,6 +49,7 @@ module TacScribe
         @event_queue.events.clear
         Datastore.instance.truncate_table
         start_processing_threads
+        populate_airfields if @populate_airfields
         @client.connect
         sleep 30
       # Rescuing reliably from Net::HTTP is a complete bear so rescue
@@ -74,5 +78,21 @@ module TacScribe
         end
       end
     end
+
+    def populate_airfields
+      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
+        })
+      end
+    end
   end
 end

data/lib/tac_scribe/datastore.rb

@@ -75,9 +75,15 @@ module TacScribe
     private
 
     def connection_string
-      "postgres://#{@configuration.username}:#{@configuration.password}@" \
-          "#{@configuration.host}:#{@configuration.port}" \
-          "/#{@configuration.database}"
+      if RUBY_PLATFORM == 'java'
+        "jdbc:postgresql://#{@configuration.host}:#{@configuration.port}/" \
+        "#{@configuration.database}?user=#{@configuration.username}&" \
+        "password=#{configuration.password}"
+      else
+        "postgres://#{@configuration.username}:#{@configuration.password}@" \
+        "#{@configuration.host}:#{@configuration.port}" \
+        "/#{@configuration.database}"
+      end
     end
 
     def get_unit(id)

data/lib/tac_scribe/event_queue.rb

@@ -11,12 +11,14 @@ module TacScribe
     def initialize(verbose_logging:)
       @verbose_logging = verbose_logging
       @events = Queue.new
+      @event_count = 0
 
       return unless verbose_logging == true
 
       Thread.new do
         loop do
-          puts "Queue Size: #{@events.size}"
+          puts "#{Time.now.strftime("%FT%T")} - Queue Size: #{@events.size} \t Events Processed: #{@event_count}"
+          @event_count = 0
           sleep 1
         end
       end
@@ -40,6 +42,7 @@ module TacScribe
     # @option event [BigDecimal] :altitude The object altitude above sea level
     #   in meters to 1 decimal place.
     def update_object(event)
+      @event_count += 1
       events << { type: :update_object, event: event, time: @time }
     end
 
@@ -48,6 +51,7 @@ module TacScribe
     # @param object_id [String] A hexadecimal number representing the object
     #   ID
     def delete_object(object_id)
+      @event_count += 1
       events << { type: :delete_object, object_id: object_id }
     end
 

data/lib/tac_scribe/version.rb

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

data/tac_scribe.gemspec

@@ -24,8 +24,14 @@ Gem::Specification.new do |spec|
 
   spec.metadata['yard.run'] = 'yri'
 
+  if RUBY_PLATFORM == 'java'
+    # TODO: Specifying a verison chokes bundler for some reason
+    spec.add_dependency 'activerecord-jdbcpostgresql-adapter'
+  else
+    spec.add_dependency 'pg', '~>1.1'
+  end
+
   spec.add_dependency 'georuby', '~>2.5'
-  spec.add_dependency 'pg', '~>1.1'
   spec.add_dependency 'sequel', '~>5.22'
   # The following gem is newish and not heavily updated so the chances
   # of an API breaking change are higher then normal. Therefore lock the

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tac_scribe
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeffrey Jones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: georuby
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: georuby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -179,12 +179,14 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- data/airfields.json
 - db/001_create_unit_table.rb
 - db/README.md
 - exe/start_scribe