tf2_line_parser 0.1.1 → 0.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2ZkN2ViOTA5OWI4MzIyZmNhMjAxN2VhNmRjNGRlMjA4MTM1MTQzZg==
-  data.tar.gz: !binary |-
-    MGVjYjdlMzQ4YWJjYzVhYWUyMTJhMzg1YzE2NTI2MTQ2NDhhN2MyZg==
+SHA1:
+  metadata.gz: 2825ff230816070e4e8366d22597a64357f120a8
+  data.tar.gz: 3243bedc7c00fb567f1960c1ba69578d0fb2260b
 SHA512:
-  metadata.gz: !binary |-
-    YWFjNmUyMTg1ZDE0ZGQwMmEzZTkzZTRjZjI4YzFmY2VmM2UwZDYzYjAzOTM1
-    ZWUxYzAzMzQ0MzI2NGM0NWUyYTg4YWM3YTYwMGY5YWE1MTVhMThkYTUyYWVm
-    OWRjOGMzMTNlZGZlZTdlZTJmNjQ0NDZjMzcyMWUyYjRhNTE5MGI=
-  data.tar.gz: !binary |-
-    M2FjMTNiOWJlOTFiZTg5ZmZmZTc4NmM1YjdhNDE3ZWI2Mzk0YzM5NzkxOThh
-    NTQyODI3MDcyNzRiMGQ5MmYxYzBlZDVhNzFjZDhhY2Y0OGEyYjk0MTIxZTY0
-    ZDVhNmVkNzA2YTA4ZjVlZWJjYzBmZmQ3YjZiNTNmYWZiNTdjNmI=
+  metadata.gz: c85bba52b3f353a25408c7b5d25d6c7769c6bdc2c18875f6cf18c1b9c7d9b5cae29066fd0f619c397135130bd33ae0366b023441794597be8e93bfce4c2a2904
+  data.tar.gz: aa4400c2b4245f4c1a3bd7bfb13ca7d54ffb56f959055233dcca404dfca5c6b45d8ec4212bd800eae83d76a5680cbd211ea24a732be7a0787d6c8d1f1d0f7187

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
   - 1.9.3
-  - rbx-19mode
+  - rbx
   - jruby-19mode
 script: ./script/ci

data/Gemfile.lock

@@ -1,41 +1,43 @@
 PATH
   remote: .
   specs:
-    tf2_line_parser (0.1.0)
+    tf2_line_parser (0.1.2)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    coderay (1.0.9)
-    colorize (0.5.8)
-    coveralls (0.6.7)
-      colorize
+      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.4)
-    i18n (0.6.9)
-    method_source (0.8.1)
-    mime-types (1.23)
-    minitest (4.7.5)
-    multi_json (1.7.7)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    i18n (0.6.11)
+    json (1.8.1)
+    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)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    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)
@@ -44,15 +46,19 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.5)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tins (1.3.2)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/lib/tf2_line_parser.rb

@@ -9,6 +9,7 @@ require "tf2_line_parser/events/round_event_without_variables"
 require "tf2_line_parser/events/round_event_with_variables"
 require "tf2_line_parser/events/score"
 require "tf2_line_parser/events/role_change"
+require "tf2_line_parser/events/damage"
 Dir[File.dirname(__FILE__) + '/tf2_line_parser/events/*.rb'].each {|file| require file }
 require "tf2_line_parser/line"
 

data/lib/tf2_line_parser/events/airshot.rb

@@ -0,0 +1,31 @@
+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})?)$/
+      end
+
+      def self.regex_airshot
+        @regex_airshot ||= /(\(airshot "(?'airshot'\w*)"\))?/
+      end
+
+      def self.attributes
+        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :target_nick, :target_steamid, :target_team, :value, :weapon, :airshot]
+      end
+
+      def initialize(time, player_name, player_steamid, player_team, target_name, target_steamid, target_team, value, weapon, airshot)
+        @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
+        @airshot = (airshot.to_i == 1)
+      end
+
+    end
+  end
+end

data/lib/tf2_line_parser/events/damage.rb

@@ -4,24 +4,33 @@ module TF2LineParser
     class Damage < Event
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} triggered "damage" #{regex_damage_against}\(damage "(?'value'\d+)"\)/
+        @regex ||= /#{regex_time} #{regex_player} triggered "damage" #{regex_damage_against}\(damage "(?'value'\d+)"\)(?:( #{regex_realdamage})?( #{regex_weapon})?)$/
       end
 
       def self.regex_damage_against
         @regex_damage_against ||= /(against #{regex_target} )?/
       end
 
+      def self.regex_realdamage
+        @regex_realdamage ||= /(\(realdamage "(?'realdamage'\w*)"\))?/
+      end
+
+      def self.regex_weapon
+        @regex_weapon ||= /(\(weapon "(?'weapon'\w*)"\))?/
+      end
+
       def self.attributes
-        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :target_nick, :target_steamid, :target_team, :value]
+        @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)
+      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

data/lib/tf2_line_parser/events/event.rb

@@ -6,7 +6,7 @@ module TF2LineParser
 
       attr_accessor :time, :type, :cap_number, :cap_name, :message, :unknown
       attr_accessor :team, :score, :value, :item, :role, :length, :method
-      attr_accessor :player, :target, :healing, :ubercharge, :customkill, :weapon
+      attr_accessor :player, :target, :healing, :ubercharge, :customkill, :weapon, :airshot
 
 
       def self.time_format
@@ -18,11 +18,11 @@ module TF2LineParser
       end
 
       def self.regex_player
-        @regex_player ||= '"(?\'player_nick\'.+)<(?\'player_uid\'\d+)><(?\'player_steamid\'STEAM_\S+)><(?\'player_team\'Red|Blue)>"'
+        @regex_player ||= '"(?\'player_nick\'.+)<(?\'player_uid\'\d+)><(?\'player_steamid\'(\[\S+\]|STEAM_\S+))><(?\'player_team\'Red|Blue|Spectator)>"'
       end
 
       def self.regex_target
-        @regex_target ||= '"(?\'target_nick\'.+)<(?\'target_uid\'\d+)><(?\'target_steamid\'STEAM_\S+)><(?\'target_team\'Red|Blue)>"'
+        @regex_target ||= '"(?\'target_nick\'.+)<(?\'target_uid\'\d+)><(?\'target_steamid\'(\[\S+\]|STEAM_\S+))><(?\'target_team\'Red|Blue)>"'
       end
 
       def self.regex_cap
@@ -40,7 +40,7 @@ module TF2LineParser
       def self.types
         #ordered by how common the messages are
         @types ||= [Damage, Heal, PickupItem, Assist, Kill, CaptureBlock, PointCapture, ChargeDeployed,
-                    MedicDeath, RoleChange, Spawn, Suicide, Say, TeamSay, Domination, Revenge, RoundWin, CurrentScore,
+                    MedicDeath, RoleChange, Spawn, Airshot, Suicide, Say, TeamSay, Domination, Revenge, RoundWin, CurrentScore,
                     RoundLength, RoundStart, ConsoleSay, MatchEnd, FinalScore,
                     RoundStalemate, Unknown]
       end

data/lib/tf2_line_parser/version.rb

@@ -1,3 +1,3 @@
 module TF2LineParser
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/spec/fixtures/logs/airshot.log

@@ -0,0 +1 @@
+L 05/15/2014 - 18:22:27: "super sanic<5><STEAM_0:0:64268661><Red>" triggered "damage" against "kerrieebOb<11><STEAM_0:0:11431287><Blue>" (damage "47") (weapon "tf_projectile_rocket") (airshot "1")

data/spec/fixtures/logs/new_log.log

@@ -0,0 +1 @@
+L 08/22/2014 - 00:30:31: "iM yUKi intel @i52<6><[U:1:3825470]><Blue>" triggered "damage" against "mix^ enigma @ i52<8><[U:1:33652944]><Red>" (damage "78") (realdamage "67") (weapon "tf_projectile_rocket")

data/spec/lib/tf2_line_parser/parser_spec.rb

@@ -12,6 +12,12 @@ module TF2LineParser
     let(:detailed_log_file)   { File.expand_path('../../../fixtures/logs/detailed_damage.log',  __FILE__) }
     let(:detailed_log)        { File.read(detailed_log_file) }
     let(:detailed_log_lines)  { detailed_log.lines.map(&:to_s) }
+    let(:airshot_log_file)    { File.expand_path('../../../fixtures/logs/airshot.log',  __FILE__) }
+    let(:airshot_log)         { File.read(airshot_log_file) }
+    let(:airshot_log_lines)   { airshot_log.lines.map(&:to_s) }
+    let(:new_log_file)    { File.expand_path('../../../fixtures/logs/new_log.log',  __FILE__) }
+    let(:new_log)         { File.read(new_log_file) }
+    let(:new_log_lines)   { new_log.lines.map(&:to_s) }
 
     describe '#new' do
 
@@ -33,7 +39,22 @@ module TF2LineParser
         player_steam_id = "STEAM_0:1:16347045"
         player_team = 'Red'
         value = '69'
-        Events::Damage.should_receive(:new).with(anything, player_name, player_steam_id, player_team, nil, nil, nil, value)
+        weapon = nil
+        Events::Damage.should_receive(:new).with(anything, player_name, player_steam_id, player_team, nil, nil, nil, value, weapon)
+        parse(line)
+      end
+
+      it 'recognizes new steam id log lines with detailed damage' do
+        line = new_log_lines[0]
+        player_name = "iM yUKi intel @i52"
+        player_steam_id = "[U:1:3825470]"
+        player_team = 'Blue'
+        target_team = "Red"
+        target_name = "mix^ enigma @ i52"
+        target_steam_id = "[U:1:33652944]"
+        value = '78'
+        weapon = "tf_projectile_rocket"
+        Events::Damage.should_receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, value, weapon)
         parse(line)
       end
 
@@ -46,10 +67,19 @@ module TF2LineParser
         target_steam_id = "STEAM_0:0:43087158"
         target_team = "Red"
         value = "102"
-        Events::Damage.should_receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, value)
+        weapon = "tf_projectile_pipe"
+        Events::Damage.should_receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, value, weapon)
         parse(line)
       end
 
+      it 'recognizes airshots' do
+        line = airshot_log_lines[0]
+        weapon = "tf_projectile_rocket"
+        airshot = "1"
+        Events::Airshot.should_receive(:new).with(anything, anything, anything, anything, anything, anything, anything, anything, weapon, airshot)
+        parse(line).inspect
+      end
+
       it 'ignores realdamage' do
         line = detailed_log_lines[65]
         player_name = "LittleLies"
@@ -59,7 +89,8 @@ module TF2LineParser
         target_steam_id = "STEAM_0:0:43087158"
         target_team = "Red"
         value = "98"
-        Events::Damage.should_receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, value)
+        weapon = "tf_projectile_pipe"
+        Events::Damage.should_receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, value, weapon)
         parse(line)
       end
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: tf2_line_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Arie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
 description: A gem to parse log lines from TF2 servers
@@ -72,14 +72,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coverage
-- .gitignore
-- .rspec
-- .travis.yml
+- ".coverage"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
 - lib/tf2_line_parser.rb
+- lib/tf2_line_parser/events/airshot.rb
 - lib/tf2_line_parser/events/assist.rb
 - lib/tf2_line_parser/events/capture_block.rb
 - lib/tf2_line_parser/events/charge_deployed.rb
@@ -117,9 +118,11 @@ files:
 - lib/tidy_bytes_monkey_patch.rb
 - script/bundler
 - script/ci
+- spec/fixtures/logs/airshot.log
 - spec/fixtures/logs/broder_vs_epsilon.log
 - spec/fixtures/logs/detailed_damage.log
 - spec/fixtures/logs/example.log
+- spec/fixtures/logs/new_log.log
 - spec/fixtures/logs/special_characters.log
 - spec/fixtures/logs/very_special_characters.log
 - spec/lib/tf2_line_parser/parser_spec.rb
@@ -135,27 +138,28 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: TF2 log line parser
 test_files:
+- spec/fixtures/logs/airshot.log
 - spec/fixtures/logs/broder_vs_epsilon.log
 - spec/fixtures/logs/detailed_damage.log
 - spec/fixtures/logs/example.log
+- spec/fixtures/logs/new_log.log
 - spec/fixtures/logs/special_characters.log
 - spec/fixtures/logs/very_special_characters.log
 - spec/lib/tf2_line_parser/parser_spec.rb
 - spec/lib/tf2_line_parser/player_spec.rb
 - spec/spec_helper.rb
-has_rdoc: