tf2_line_parser 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2825ff230816070e4e8366d22597a64357f120a8
-  data.tar.gz: 3243bedc7c00fb567f1960c1ba69578d0fb2260b
+SHA256:
+  metadata.gz: e22961d8f12fb908e7200eeeab6dbf8ead59064e36b58585577947df3363aeac
+  data.tar.gz: 065b72078b85b1bf414f7d7cc318cfb7c7c315e3beb417d19e0ded93120b3f11
 SHA512:
-  metadata.gz: c85bba52b3f353a25408c7b5d25d6c7769c6bdc2c18875f6cf18c1b9c7d9b5cae29066fd0f619c397135130bd33ae0366b023441794597be8e93bfce4c2a2904
-  data.tar.gz: aa4400c2b4245f4c1a3bd7bfb13ca7d54ffb56f959055233dcca404dfca5c6b45d8ec4212bd800eae83d76a5680cbd211ea24a732be7a0787d6c8d1f1d0f7187
+  metadata.gz: 464ac8116f2e6857c17156d5c6ed6f48dd8ca1d4c5367cb08ef0bb38e72e9e70675741c140b9722f223309df3c027500f86e726bd4d7e7447826b4e44047687e
+  data.tar.gz: eb66bc6afc1dc620003d19b9d812fe13f4bc8718a8a1c4bb50e2ce459fc83cdd1c192ee0fa44094ec01f38022b2ce8a711d288fa51a72e8bcf5d45634cbed739

data/.gitignore

@@ -12,6 +12,7 @@ test/tmp
 test/version_tmp
 tmp
 rspec.html
+vendor/bundle
 
 # RBX files
 .rbx/

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
+cache: bundler
 rvm:
-  - 1.9.3
-  - rbx
-  - jruby-19mode
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
 script: ./script/ci
+sudo: false

data/Gemfile.lock

@@ -1,63 +1,62 @@
 PATH
   remote: .
   specs:
-    tf2_line_parser (0.1.2)
+    tf2_line_parser (0.2.0)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.5)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+    activesupport (5.1.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    coderay (1.1.0)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    diff-lcs (1.2.5)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.5)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    diff-lcs (1.3)
     docile (1.1.5)
-    i18n (0.6.11)
-    json (1.8.1)
+    i18n (0.8.4)
+    json (2.1.0)
     method_source (0.8.2)
-    mime-types (2.3)
-    minitest (5.4.0)
-    multi_json (1.10.1)
-    netrc (0.7.7)
-    pry (0.10.1)
+    minitest (5.10.2)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     pry-nav (0.2.4)
       pry (>= 0.9.10, < 0.11.0)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    simplecov (0.9.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.1)
     slop (3.6.0)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tins (1.3.2)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tins (1.15.0)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -65,6 +64,9 @@ PLATFORMS
 
 DEPENDENCIES
   coveralls
-  pry-nav (~> 0.2.3)
-  rspec (~> 2.13.0)
+  pry-nav
+  rspec (~> 3.5.0)
   tf2_line_parser!
+
+BUNDLED WITH
+   1.14.5

data/lib/tf2_line_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "tf2_line_parser/version"
 require "tf2_line_parser/parser"
 require "tf2_line_parser/player"
@@ -7,6 +8,7 @@ require "tf2_line_parser/events/pvp_event"
 require "tf2_line_parser/events/player_action_event"
 require "tf2_line_parser/events/round_event_without_variables"
 require "tf2_line_parser/events/round_event_with_variables"
+require "tf2_line_parser/events/connect"
 require "tf2_line_parser/events/score"
 require "tf2_line_parser/events/role_change"
 require "tf2_line_parser/events/damage"

data/lib/tf2_line_parser/events/airshot.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
 module TF2LineParser
   module Events
 
     class Airshot < Damage
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} triggered "damage" #{regex_damage_against}\(damage "(?'value'\d+)"\)(?:( #{regex_realdamage})?( #{regex_weapon})?( #{regex_airshot})?)$/
+        @regex ||= /#{regex_time} #{regex_player} triggered "damage" #{regex_damage_against}\(damage "(?'value'\d+)"\)(?:( #{regex_realdamage})?( #{regex_weapon})?( #{regex_airshot})?)$/.freeze
       end
 
       def self.regex_airshot
-        @regex_airshot ||= /(\(airshot "(?'airshot'\w*)"\))?/
+        @regex_airshot ||= /(\(airshot "(?'airshot'\w*)"\))?/.freeze
       end
 
       def self.attributes

data/lib/tf2_line_parser/events/assist.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module TF2LineParser
   module Events
 
     class Assist < PVPEvent
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} triggered "kill assist" against #{regex_target}/
+        @regex ||= /#{regex_time} #{regex_player} triggered "kill assist" against #{regex_target}/.freeze
       end
 
     end

data/lib/tf2_line_parser/events/capture_block.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module TF2LineParser
   module Events
 
     class CaptureBlock < Event
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} triggered "captureblocked" #{regex_cap}/
+        @regex ||= /#{regex_time} #{regex_player} triggered "captureblocked" #{regex_cap}/.freeze
       end
 
       def self.attributes

data/lib/tf2_line_parser/events/charge_deployed.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module TF2LineParser
   module Events
 
     class ChargeDeployed < Event
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} triggered "chargedeployed"/
+        @regex ||= /#{regex_time} #{regex_player} triggered "chargedeployed"/.freeze
       end
 
       def self.attributes

data/lib/tf2_line_parser/events/chat.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module TF2LineParser
   module Events
 
@@ -19,7 +20,7 @@ module TF2LineParser
     class Say < Chat
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} say #{regex_message}/
+        @regex ||= /#{regex_time} #{regex_player} say #{regex_message}/.freeze
       end
 
     end
@@ -27,7 +28,7 @@ module TF2LineParser
     class TeamSay < Chat
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} say_team #{regex_message}/
+        @regex ||= /#{regex_time} #{regex_player} say_team #{regex_message}/.freeze
       end
 
     end

data/lib/tf2_line_parser/events/connect.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module TF2LineParser
+  module Events
+
+
+    class Connect < Event
+
+      def initialize(time, player_name, player_steam_id, player_team, message)
+        @time = parse_time(time)
+        @player = Player.new(player_name, player_steam_id, player_team)
+        @message = message
+      end
+
+      def self.attributes
+        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :message]
+      end
+
+      def self.regex
+        @regex ||= /#{regex_time} #{regex_player} connected, address #{regex_message}/.freeze
+      end
+
+    end
+
+  end
+end

data/lib/tf2_line_parser/events/console_say.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module TF2LineParser
   module Events
 
     class ConsoleSay < Event
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_console} say #{regex_message}/
+        @regex ||= /#{regex_time} #{regex_console} say #{regex_message}/.freeze
       end
 
       def self.attributes

data/lib/tf2_line_parser/events/current_score.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module TF2LineParser
   module Events
 
     class CurrentScore < Score
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_team} current score #{regex_score} with .*/
+        @regex ||= /#{regex_time} #{regex_team} current score #{regex_score} with .*/.freeze
       end
 
     end

data/lib/tf2_line_parser/events/damage.rb

@@ -1,22 +1,23 @@
+# frozen_string_literal: true
 module TF2LineParser
   module Events
 
     class Damage < Event
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} triggered "damage" #{regex_damage_against}\(damage "(?'value'\d+)"\)(?:( #{regex_realdamage})?( #{regex_weapon})?)$/
+        @regex ||= /#{regex_time} #{regex_player} triggered "damage" #{regex_damage_against}\(damage "(?'value'\d+)"\)(?:( #{regex_realdamage})?( #{regex_weapon})?)$/.freeze
       end
 
       def self.regex_damage_against
-        @regex_damage_against ||= /(against #{regex_target} )?/
+        @regex_damage_against ||= /(against #{regex_target} )?/.freeze
       end
 
       def self.regex_realdamage
-        @regex_realdamage ||= /(\(realdamage "(?'realdamage'\w*)"\))?/
+        @regex_realdamage ||= /(\(realdamage "(?'realdamage'\w*)"\))?/.freeze
       end
 
       def self.regex_weapon
-        @regex_weapon ||= /(\(weapon "(?'weapon'\w*)"\))?/
+        @regex_weapon ||= /(\(weapon "(?'weapon'\w*)"\))?/.freeze
       end
 
       def self.attributes

data/lib/tf2_line_parser/events/domination.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module TF2LineParser
   module Events
 
     class Domination < PVPEvent
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} triggered "domination" against #{regex_target}.*/
+        @regex ||= /#{regex_time} #{regex_player} triggered "domination" against #{regex_target}.*/.freeze
       end
 
     end

data/lib/tf2_line_parser/events/event.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module TF2LineParser
 
   module Events
@@ -10,39 +11,39 @@ module TF2LineParser
 
 
       def self.time_format
-        @time_format ||= '%m/%d/%Y - %T'
+        @time_format ||= '%m/%d/%Y - %T'.freeze
       end
 
       def self.regex_time
-        @regex_time ||= 'L (?\'time\'.*):'
+        @regex_time ||= 'L (?\'time\'.*):'.freeze
       end
 
       def self.regex_player
-        @regex_player ||= '"(?\'player_nick\'.+)<(?\'player_uid\'\d+)><(?\'player_steamid\'(\[\S+\]|STEAM_\S+))><(?\'player_team\'Red|Blue|Spectator)>"'
+        @regex_player ||= '"(?\'player_nick\'.+)<(?\'player_uid\'\d+)><(?\'player_steamid\'(\[\S+\]|STEAM_\S+))><(?\'player_team\'Red|Blue|Spectator|TERRORIST|CT||)>"'.freeze
       end
 
       def self.regex_target
-        @regex_target ||= '"(?\'target_nick\'.+)<(?\'target_uid\'\d+)><(?\'target_steamid\'(\[\S+\]|STEAM_\S+))><(?\'target_team\'Red|Blue)>"'
+        @regex_target ||= '"(?\'target_nick\'.+)<(?\'target_uid\'\d+)><(?\'target_steamid\'(\[\S+\]|STEAM_\S+))><(?\'target_team\'Red|Blue|TERRORIST|CT)>"'.freeze
       end
 
       def self.regex_cap
-        @regex_cap ||= '\(cp "(?\'cp_number\'\d+)"\) \(cpname "(?\'cp_name\'.\w*)'
+        @regex_cap ||= '\(cp "(?\'cp_number\'\d+)"\) \(cpname "(?\'cp_name\'.\w*)'.freeze
       end
 
       def self.regex_console
-        @regex_console ||= '"Console<0><Console><Console>"'
+        @regex_console ||= '"Console<0><Console><Console>"'.freeze
       end
 
       def self.regex_message
-        @regex_message ||= '"(?\'message\'.*)"'
+        @regex_message ||= '"(?\'message\'.*)"'.freeze
       end
 
       def self.types
         #ordered by how common the messages are
         @types ||= [Damage, Heal, PickupItem, Assist, Kill, CaptureBlock, PointCapture, ChargeDeployed,
-                    MedicDeath, RoleChange, Spawn, Airshot, Suicide, Say, TeamSay, Domination, Revenge, RoundWin, CurrentScore,
-                    RoundLength, RoundStart, ConsoleSay, MatchEnd, FinalScore,
-                    RoundStalemate, Unknown]
+                    MedicDeath, RoleChange, Spawn, Airshot, HeadshotDamage, Suicide, Say, TeamSay, Domination, Revenge, RoundWin, CurrentScore,
+                    RoundLength, RoundStart, Connect, ConsoleSay, MatchEnd, FinalScore,
+                    RoundStalemate, Unknown].freeze
       end
 
       def self.regex_results(matched_line)

data/lib/tf2_line_parser/events/final_score.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module TF2LineParser
   module Events
 
     class FinalScore < Score
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_team} final score #{regex_score} with .*/
+        @regex ||= /#{regex_time} #{regex_team} final score #{regex_score} with .*/.freeze
       end
 
     end

data/lib/tf2_line_parser/events/headshot_damage.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+module TF2LineParser
+  module Events
+
+    class HeadshotDamage < Damage
+
+      def self.regex
+        @regex ||= /#{regex_time} #{regex_player} triggered "damage" #{regex_damage_against}\(damage "(?'value'\d+)"\)(?:( #{regex_realdamage})?( #{regex_weapon})?) #{regex_headshot}$/.freeze
+      end
+
+      def self.regex_headshot
+        @regex_headshot ||=  '\(headshot "(?\'headshot\'\d+)"\)'.freeze
+      end
+
+      def self.attributes
+        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :target_nick, :target_steamid, :target_team, :value, :weapon]
+      end
+
+      def initialize(time, player_name, player_steamid, player_team, target_name, target_steamid, target_team, value, weapon)
+        @time = parse_time(time)
+        @player = Player.new(player_name, player_steamid, player_team)
+        if target_name
+          @target = Player.new(target_name, target_steamid, target_team)
+        end
+        @value = value.to_i
+        @weapon = weapon
+      end
+
+    end
+  end
+end
+