tf2_line_parser 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tf2_line_parser (0.0.2)
+    tf2_line_parser (0.0.4)
       activesupport
 
 GEM
@@ -10,10 +10,19 @@ GEM
     activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    coderay (1.0.8)
+    coderay (1.0.9)
+    colorize (0.5.8)
+    coveralls (0.5.7)
+      colorize
+      json
+      rest-client
+      simplecov (>= 0.7)
+      thor
     diff-lcs (1.1.3)
-    i18n (0.6.1)
+    i18n (0.6.2)
+    json (1.7.7)
     method_source (0.8.1)
+    mime-types (1.21)
     multi_json (1.6.1)
     pry (0.9.12)
       coderay (~> 1.0.5)
@@ -21,6 +30,8 @@ GEM
       slop (~> 3.4)
     pry-nav (0.2.3)
       pry (~> 0.9.10)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -37,11 +48,13 @@ GEM
     spec_coverage (0.0.5)
       rspec (~> 2.0)
       simplecov
+    thor (0.17.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  coveralls
   pry-nav (~> 0.2.3)
   rspec (~> 2.12.0)
   spec_coverage (~> 0.0.5)

data/README.md

@@ -1,4 +1,4 @@
-# TF2 line parser[![Build Status](https://travis-ci.org/Arie/tf2_line_parser.png?branch=master)](http://travis-ci.org/Arie/tf2_line_parser) [![Code Climate](https://codeclimate.com/github/Arie/tf2_line_parser.png)](https://codeclimate.com/github/Arie/tf2_line_parser)
+# TF2 line parser [![Build Status](https://travis-ci.org/Arie/tf2_line_parser.png?branch=master)](http://travis-ci.org/Arie/tf2_line_parser) [![Code Climate](https://codeclimate.com/github/Arie/tf2_line_parser.png)](https://codeclimate.com/github/Arie/tf2_line_parser) [![Coverage Status](https://coveralls.io/repos/Arie/tf2_line_parser/badge.png?branch=master)](https://coveralls.io/r/Arie/tf2_line_parser)
 
 A TF2 log line parser. Unlike the other log parsers I've found, this one parses the line and returns a plain old ruby object to describe the event of the line.
 I plan to use this for my own stats parsing tool.
@@ -12,4 +12,4 @@ I plan to use this for my own stats parsing tool.
 * Enter game
 
 ## Credits
-* nTraum, I stole most of the regexes from him his [TF2Stats](https://github.com/nTraum/tf2stats/) project.
+* nTraum, I stole most of the regexes from his [TF2Stats](https://github.com/nTraum/tf2stats/) project.

data/lib/tf2_line_parser/events/event.rb

@@ -57,17 +57,5 @@ module TF2LineParser
 
     end
 
-    class PVPEvent < Event
-      def self.attributes
-        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :target_nick, :target_steamid, :target_team]
-      end
-
-      def initialize(time, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team)
-        @time = parse_time(time)
-        @player = Player.new(player_name, player_steam_id, player_team)
-        @target = Player.new(target_name, target_steam_id, target_team)
-      end
-    end
-
   end
 end

data/lib/tf2_line_parser/events/kill.rb

@@ -4,7 +4,27 @@ module TF2LineParser
     class Kill < PVPEvent
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} killed #{regex_target} with/
+        @regex ||= /#{regex_time} #{regex_player} killed #{regex_target} #{regex_weapon} #{regex_customkill}/
+      end
+
+      def self.regex_weapon
+        @regex_weapon ||= 'with "(?\'weapon\'\w*)"'
+      end
+
+      def self.regex_customkill
+        @regex_customkill ||= /(\(customkill "(?'customkill'\w*)"\))?/
+      end
+
+      def self.attributes
+        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :target_nick, :target_steamid, :target_team, :weapon, :customkill]
+      end
+
+      def initialize(time, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, weapon, customkill)
+        @time = parse_time(time)
+        @player = Player.new(player_name, player_steam_id, player_team)
+        @target = Player.new(target_name, target_steam_id, target_team)
+        @weapon = weapon
+        @customkill = customkill
       end
 
     end

data/lib/tf2_line_parser/events/match_end.rb

@@ -1,19 +1,18 @@
 module TF2LineParser
   module Events
 
-    class MatchEnd < Event
+    class MatchEnd < RoundEventWithVariables
 
-      def self.regex
-        @regex ||= /#{regex_time} World triggered "Game_Over" reason "(?'reason'.*)"/
+      def self.round_variable_regex
+        @round_variable_regex ||= /reason "(?'reason'.*)"/
       end
 
-      def self.attributes
-        @attributes ||= [:time, :reason]
+      def self.round_type
+        "Game_Over"
       end
 
-      def initialize(time, reason)
-        @time = parse_time(time)
-        @reason = reason
+      def self.round_variable
+        @round_variable ||= :reason
       end
 
     end

data/lib/tf2_line_parser/events/medic_death.rb

@@ -1,10 +1,25 @@
 module TF2LineParser
   module Events
 
-    class MedicDeath < PVPEvent
+    class MedicDeath < Event
 
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} triggered "medic_death" against #{regex_target}.*/
+        @regex ||= /#{regex_time} #{regex_player} triggered "medic_death" against #{regex_target} #{regex_medic_death_info}/
+      end
+
+      def self.regex_medic_death_info
+        @regex_healing ||= '\(healing "(?\'healing\'\d+)"\) \(ubercharge "(?\'ubercharge\'\d+)"\)'
+      end
+
+      def self.attributes
+        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :target_nick, :target_steamid, :target_team, :ubercharge]
+      end
+
+      def initialize(time, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, ubercharge)
+        @time = parse_time(time)
+        @player = Player.new(player_name, player_steam_id, player_team)
+        @target = Player.new(target_name, target_steam_id, target_team)
+        @ubercharge = (ubercharge == "1")
       end
 
     end

data/lib/tf2_line_parser/events/pickup_item.rb

@@ -1,24 +1,18 @@
 module TF2LineParser
   module Events
 
-    class PickupItem < Event
+    class PickupItem < PlayerActionEvent
 
-      def self.regex
-        @regex ||= /#{regex_time} #{regex_player} picked up item #{regex_item}/
+      def self.action_text
+        @action_text ||= "picked up item"
       end
 
-      def self.regex_item
+      def self.regex_action
         @regex_item ||= '\"(?\'item\'.*)\"'
       end
 
-      def self.attributes
-        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :item]
-      end
-
-      def initialize(time, player_name, player_steam_id, player_team, item)
-        @time = parse_time(time)
-        @player = Player.new(player_name, player_steam_id, player_team)
-        @item = item
+      def self.item
+        :item
       end
 
     end

data/lib/tf2_line_parser/events/player_action_event.rb

@@ -0,0 +1,23 @@
+module TF2LineParser
+
+  module Events
+
+    class PlayerActionEvent < Event
+
+      def self.regex
+        @regex ||= /#{regex_time} #{regex_player} #{action_text} #{regex_action}/
+      end
+
+      def self.attributes
+        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, self.item]
+      end
+
+      def initialize(time, player_name, player_steam_id, player_team, item = self.class.item)
+        @time = parse_time(time)
+        @player = Player.new(player_name, player_steam_id, player_team)
+        instance_variable_set("@#{self.class.item}", item)
+      end
+
+    end
+  end
+end

data/lib/tf2_line_parser/events/pvp_event.rb

@@ -0,0 +1,17 @@
+module TF2LineParser
+
+  module Events
+
+    class PVPEvent < Event
+      def self.attributes
+        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :target_nick, :target_steamid, :target_team]
+      end
+
+      def initialize(time, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team)
+        @time = parse_time(time)
+        @player = Player.new(player_name, player_steam_id, player_team)
+        @target = Player.new(target_name, target_steam_id, target_team)
+      end
+    end
+  end
+end

data/lib/tf2_line_parser/events/role_change.rb

@@ -1,24 +1,18 @@
 module TF2LineParser
   module Events
 
-    class RoleChange < Event
+    class RoleChange < PlayerActionEvent
 
-      def self.regex
-        @regex ||= /#{regex_time} #{regex_player} changed role to #{regex_role}/
+      def self.action_text
+        @action_text ||= "changed role to"
       end
 
-      def self.regex_role
+      def self.regex_action
         @regex_role ||= '\"(?\'role\'.*)\"'
       end
 
-      def self.attributes
-        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :role]
-      end
-
-      def initialize(time, player_name, player_steam_id, player_team, role)
-        @time = parse_time(time)
-        @player = Player.new(player_name, player_steam_id, player_team)
-        @role = role
+      def self.item
+        :role
       end
 
     end

data/lib/tf2_line_parser/events/round_event_with_variables.rb

@@ -0,0 +1,22 @@
+module TF2LineParser
+  module Events
+
+    class RoundEventWithVariables < Event
+
+      def self.regex
+        @regex ||= /#{regex_time} World triggered "#{round_type}" #{round_variable_regex}/
+      end
+
+      def self.attributes
+        @attributes ||= [:time, round_variable]
+      end
+
+      def initialize(time, round_variable)
+        @time = parse_time(time)
+        instance_variable_set("@#{self.class.round_variable}", round_variable)
+      end
+
+    end
+
+  end
+end

data/lib/tf2_line_parser/events/round_event_without_variables.rb

@@ -0,0 +1,21 @@
+module TF2LineParser
+  module Events
+
+    class RoundEventWithoutVariables < Event
+
+      def self.regex
+        @regex ||= /#{regex_time} World triggered "#{round_type}"/
+      end
+
+      def self.attributes
+        @attributes ||= [:time]
+      end
+
+      def initialize(time)
+        @time = parse_time(time)
+      end
+
+    end
+
+  end
+end

data/lib/tf2_line_parser/events/round_length.rb

@@ -1,19 +1,18 @@
 module TF2LineParser
   module Events
 
-    class RoundLength < Event
+    class RoundLength < RoundEventWithVariables
 
-      def self.regex
-        @regex ||= /#{regex_time} World triggered "Round_Length" \(seconds \"(?'length'.*)"\)/
+      def self.round_type
+        @round_type ||= "Round_Length"
       end
 
-      def self.attributes
-        @attributes ||= [:time, :length]
+      def self.round_variable_regex
+        @round_variable_regex ||= /\(seconds \"(?'length'.*)"\)/
       end
 
-      def initialize(time, length)
-        @time = parse_time(time)
-        @length = length
+      def self.round_variable
+        @round_variable ||= :length
       end
 
     end

data/lib/tf2_line_parser/events/round_stalemate.rb

@@ -1,18 +1,10 @@
 module TF2LineParser
   module Events
 
-    class RoundStalemate < Event
+    class RoundStalemate < RoundEventWithoutVariables
 
-      def self.regex
-        @regex ||= /#{regex_time} World triggered "Round_Stalemate"/
-      end
-
-      def self.attributes
-        @attributes ||= [:time]
-      end
-
-      def initialize(time)
-        @time = parse_time(time)
+      def self.round_type
+        @round_type ||= "Round_Stalemate"
       end
 
     end

data/lib/tf2_line_parser/events/round_start.rb

@@ -1,18 +1,10 @@
 module TF2LineParser
   module Events
 
-    class RoundStart < Event
+    class RoundStart < RoundEventWithoutVariables
 
-      def self.regex
-        @regex ||= /#{regex_time} World triggered "Round_Start"/
-      end
-
-      def self.attributes
-        @attributes ||= [:time]
-      end
-
-      def initialize(time)
-        @time = parse_time(time)
+      def self.round_type
+        @round_type ||= "Round_Start"
       end
 
     end

data/lib/tf2_line_parser/events/round_win.rb

@@ -1,20 +1,20 @@
 module TF2LineParser
   module Events
 
-    class RoundWin < Event
+    class RoundWin < RoundEventWithVariables
 
-      def self.regex
-        @regex ||= /#{regex_time} World triggered "Round_Win" \(winner "(?'team'Red|Blue)"\)/
+      def self.round_type
+        @round_type ||= "Round_Win"
       end
 
-      def self.attributes
-        @attributes ||= [:time, :team]
+      def self.round_variable_regex
+        @round_variable_regex ||= /\(winner "(?'team'Red|Blue)"\)/
       end
 
-      def initialize(time, team)
-        @time = parse_time(time)
-        @team = team
+      def self.round_variable
+        @round_variable ||= :team
       end
+
     end
 
   end

data/lib/tf2_line_parser/events/suicide.rb

@@ -1,24 +1,18 @@
 module TF2LineParser
   module Events
 
-    class Suicide < Event
+    class Suicide < PlayerActionEvent
 
-      def self.regex
-        @regex ||= /#{regex_time} #{regex_player} committed suicide with #{regex_suicide}/
+      def self.action_text
+        @action_text ||= "committed suicide with"
       end
 
-      def self.regex_suicide
+      def self.regex_action
         @regex_role ||= '\"(?\'method\'\w*)\"'
       end
 
-      def self.attributes
-        @attributes ||= [:time, :player_nick, :player_steamid, :player_team, :method]
-      end
-
-      def initialize(time, player_name, player_steam_id, player_team, method)
-        @time = parse_time(time)
-        @player = Player.new(player_name, player_steam_id, player_team)
-        @method = method
+      def self.item
+        :method
       end
 
     end

data/lib/tf2_line_parser/version.rb

@@ -1,3 +1,3 @@
 module TF2LogLineParser
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/tf2_line_parser.rb

@@ -3,6 +3,10 @@ require "tf2_line_parser/parser"
 require "tf2_line_parser/player"
 
 require "tf2_line_parser/events/event"
+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/score"
 Dir[File.dirname(__FILE__) + '/tf2_line_parser/events/*.rb'].each {|file| require file }
 require "tf2_line_parser/line"

data/spec/lib/tf2_line_parser/parser_spec.rb

@@ -89,7 +89,17 @@ module TF2LineParser
         target_name = "broder jukebox"
         target_steam_id = "STEAM_0:1:13978585"
         target_team = "Blue"
-        Events::Kill.should_receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team)
+        weapon = "pistol_scout"
+        customkill = nil
+        Events::Kill.should_receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, weapon, customkill)
+        parse(line)
+      end
+
+      it 'recognizes headshot kills' do
+        line = log_lines[1951]
+        weapon = "sniperrifle"
+        customkill = "headshot"
+        Events::Kill.should_receive(:new).with(anything, anything, anything, anything, anything, anything, anything, weapon, customkill)
         parse(line)
       end
 
@@ -199,10 +209,17 @@ module TF2LineParser
         killer_name = "Epsilon numlocked"
         killer_steam_id = "STEAM_0:1:16347045"
         killer_team = "Red"
-        Events::MedicDeath.should_receive(:new).with(anything, killer_name, killer_steam_id, killer_team, medic_name, medic_steam_id, medic_team)
+        uber = false
+        Events::MedicDeath.should_receive(:new).with(anything, killer_name, killer_steam_id, killer_team, medic_name, medic_steam_id, medic_team, "0")
         parse(line)
       end
 
+      it 'recognizes medic uberdrops' do
+        uberdrop = 'L 10/04/2012 - 21:43:06: "TLR Traxantic<28><STEAM_0:1:1328042><Red>" triggered "medic_death" against "cc//Admirable<3><STEAM_0:0:154182><Blue>" (healing "6478") (ubercharge "1")'
+        Events::MedicDeath.should_receive(:new).with(anything, anything, anything, anything, anything, anything, anything, "1")
+        parse(uberdrop)
+      end
+
       it 'recognizes role changes' do
         line = log_lines[1712]
         player_name = "broder bybben"

data/spec/spec_helper.rb

@@ -1,2 +1,11 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
+
 require 'pry-nav'
 require "tf2_line_parser"

data/tf2_line_parser.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'http://github.com/Arie/tf2_line_parser'
 
   gem.add_dependency "activesupport"
+  gem.add_development_dependency 'coveralls'
   gem.add_development_dependency "pry-nav",        "~> 0.2.3"
   gem.add_development_dependency "rspec",          "~> 2.12.0"
   gem.add_development_dependency "spec_coverage",  "~> 0.0.5"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tf2_line_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -103,9 +119,13 @@ files:
 - lib/tf2_line_parser/events/match_end.rb
 - lib/tf2_line_parser/events/medic_death.rb
 - lib/tf2_line_parser/events/pickup_item.rb
+- lib/tf2_line_parser/events/player_action_event.rb
 - lib/tf2_line_parser/events/point_capture.rb
+- lib/tf2_line_parser/events/pvp_event.rb
 - lib/tf2_line_parser/events/revenge.rb
 - lib/tf2_line_parser/events/role_change.rb
+- lib/tf2_line_parser/events/round_event_with_variables.rb
+- lib/tf2_line_parser/events/round_event_without_variables.rb
 - lib/tf2_line_parser/events/round_length.rb
 - lib/tf2_line_parser/events/round_stalemate.rb
 - lib/tf2_line_parser/events/round_start.rb
@@ -157,4 +177,3 @@ test_files:
 - spec/lib/tf2_line_parser/parser_spec.rb
 - spec/lib/tf2_line_parser/player_spec.rb
 - spec/spec_helper.rb
-has_rdoc: