tf2_line_parser 0.1.3 → 0.2.1

data/spec/lib/tf2_line_parser/parser_spec.rb

@@ -18,11 +18,14 @@ module TF2LineParser
     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) }
+    let(:csgo_log_file)   { File.expand_path('../../../fixtures/logs/csgo.log',  __FILE__) }
+    let(:csgo_log)        { File.read(csgo_log_file) }
+    let(:csgo_log_lines)  { csgo_log.lines.map(&:to_s) }
 
     describe '#new' do
 
       it 'takes the log line and gets the date from it' do
-        Parser.new(log_lines.first).parse.time.should eql Time.local(2013, 2, 7, 21, 21, 8)
+        expect(Parser.new(log_lines.first).parse.time).to eql Time.local(2013, 2, 7, 21, 21, 8)
       end
 
     end
@@ -40,7 +43,7 @@ module TF2LineParser
         player_team = 'Red'
         value = '69'
         weapon = nil
-        Events::Damage.should_receive(:new).with(anything, player_name, player_steam_id, player_team, nil, nil, nil, value, weapon)
+        expect(Events::Damage).to receive(:new).with(anything, player_name, player_steam_id, player_team, nil, nil, nil, value, weapon)
         parse(line)
       end
 
@@ -54,7 +57,7 @@ module TF2LineParser
         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)
+        expect(Events::Damage).to receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, value, weapon)
         parse(line)
       end
 
@@ -68,7 +71,7 @@ module TF2LineParser
         target_team = "Red"
         value = "102"
         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)
+        expect(Events::Damage).to receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, value, weapon)
         parse(line)
       end
 
@@ -76,7 +79,14 @@ module TF2LineParser
         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)
+        expect(Events::Airshot).to receive(:new).with(anything, anything, anything, anything, anything, anything, anything, anything, weapon, airshot)
+        parse(line).inspect
+      end
+
+      it 'recognizes sniper headshot damage' do
+        line = detailed_log_lines[3645]
+        weapon = "sniperrifle"
+        expect(Events::HeadshotDamage).to receive(:new).with(anything, anything, anything, anything, anything, anything, anything, anything, weapon)
         parse(line).inspect
       end
 
@@ -90,13 +100,13 @@ module TF2LineParser
         target_team = "Red"
         value = "98"
         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)
+        expect(Events::Damage).to 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 a round start' do
         line = log_lines[1245]
-        Events::RoundStart.should_receive(:new)
+        expect(Events::RoundStart).to receive(:new)
         parse(line)
       end
 
@@ -105,27 +115,27 @@ module TF2LineParser
         team = 'Blue'
         cap_number = '2'
         cap_name = '#Badlands_cap_cp3'
-        Events::PointCapture.should_receive(:new).with(anything, team, cap_number, cap_name)
+        expect(Events::PointCapture).to receive(:new).with(anything, team, cap_number, cap_name)
         parse(line)
       end
 
       it 'recognizes a round win' do
         line = log_lines[1439]
         winner = "Blue"
-        Events::RoundWin.should_receive(:new).with(anything, winner)
+        expect(Events::RoundWin).to receive(:new).with(anything, winner)
         parse(line)
       end
 
       it 'recognizes a stalemate round' do
         line = 'L 02/07/2013 - 21:34:05: World triggered "Round_Stalemate"'
-        Events::RoundStalemate.should_receive(:new).with(anything)
+        expect(Events::RoundStalemate).to receive(:new).with(anything)
         parse(line)
       end
 
       it 'recognizes a match end' do
         line = log_lines[4169]
         reason = "Reached Win Difference Limit"
-        Events::MatchEnd.should_receive(:new).with(anything, reason)
+        expect(Events::MatchEnd).to receive(:new).with(anything, reason)
         parse(line)
       end
 
@@ -138,7 +148,7 @@ module TF2LineParser
         target_steam_id = "STEAM_0:1:16347045"
         target_team = "Red"
         value = '1'
-        Events::Heal.should_receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, value)
+        expect(Events::Heal).to receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, value)
         parse(line)
       end
 
@@ -152,7 +162,7 @@ module TF2LineParser
         target_team = "Blue"
         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)
+        expect(Events::Kill).to receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team, weapon, customkill)
         parse(line)
       end
 
@@ -160,7 +170,7 @@ module TF2LineParser
         line = log_lines[1951]
         weapon = "sniperrifle"
         customkill = "headshot"
-        Events::Kill.should_receive(:new).with(anything, anything, anything, anything, anything, anything, anything, weapon, customkill)
+        expect(Events::Kill).to receive(:new).with(anything, anything, anything, anything, anything, anything, anything, weapon, customkill)
         parse(line)
       end
 
@@ -172,10 +182,19 @@ module TF2LineParser
         target_name = "Epsilon Mitsy"
         target_steam_id = "STEAM_0:0:16858056"
         target_team = "Red"
-        Events::Assist.should_receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team)
+        expect(Events::Assist).to receive(:new).with(anything, player_name, player_steam_id, player_team, target_name, target_steam_id, target_team)
         parse(line)
       end
 
+      it 'recognizes connect' do
+        line = log_lines[9]
+        name = "Epsilon numlocked"
+        steam_id =  "STEAM_0:1:16347045"
+        team = ''
+        message = "0.0.0.0:27005"
+        expect(Events::Connect).to receive(:new).with(anything, name, steam_id, team, message)
+        parse(line)
+      end
 
       it 'recognizes chat' do
         line = log_lines[89]
@@ -183,7 +202,7 @@ module TF2LineParser
         steam_id =  "STEAM_0:1:12124893"
         team = 'Red'
         message = "it's right for the ping"
-        Events::Say.should_receive(:new).with(anything, name, steam_id, team, message)
+        expect(Events::Say).to receive(:new).with(anything, name, steam_id, team, message)
         parse(line)
       end
 
@@ -193,7 +212,7 @@ module TF2LineParser
         steam_id = "STEAM_0:1:18504112"
         team = 'Blue'
         message = ">>> USING UBER <<<[info] "
-        Events::TeamSay.should_receive(:new).with(anything, name, steam_id, team, message)
+        expect(Events::TeamSay).to receive(:new).with(anything, name, steam_id, team, message)
         parse(line)
       end
 
@@ -205,7 +224,7 @@ module TF2LineParser
         target_name = "broder jukebox"
         target_steam_id = "STEAM_0:1:13978585"
         target_team =  "Blue"
-        Events::Domination.should_receive(:new).with(anything, name, steam_id, team, target_name, target_steam_id, target_team)
+        expect(Events::Domination).to receive(:new).with(anything, name, steam_id, team, target_name, target_steam_id, target_team)
         parse(line)
       end
 
@@ -217,7 +236,7 @@ module TF2LineParser
         target_name = "Epsilon basH."
         target_steam_id = "STEAM_0:1:15829615"
         target_team =  "Red"
-        Events::Revenge.should_receive(:new).with(anything, name, steam_id, team, target_name, target_steam_id, target_team)
+        expect(Events::Revenge).to receive(:new).with(anything, name, steam_id, team, target_name, target_steam_id, target_team)
         parse(line)
       end
 
@@ -225,7 +244,7 @@ module TF2LineParser
         line = log_lines[1442]
         team = "Blue"
         score = "1"
-        Events::CurrentScore.should_receive(:new).with(anything, team, score)
+        expect(Events::CurrentScore).to receive(:new).with(anything, team, score)
         parse(line)
       end
 
@@ -233,7 +252,7 @@ module TF2LineParser
         line = log_lines[4170]
         team = "Red"
         score = "6"
-        Events::FinalScore.should_receive(:new).with(anything, team, score)
+        expect(Events::FinalScore).to receive(:new).with(anything, team, score)
         parse(line)
       end
 
@@ -243,13 +262,13 @@ module TF2LineParser
         steam_id = "STEAM_0:1:1895232"
         team = "Blue"
         item = 'medkit_medium'
-        Events::PickupItem.should_receive(:new).with(anything, name, steam_id, team, item)
+        expect(Events::PickupItem).to receive(:new).with(anything, name, steam_id, team, item)
         parse(line)
       end
 
       it 'recognizes stalemate round' do
         line = 'L 02/07/2013 - 21:21:08: World triggered "Round_Stalemate"'
-        Events::RoundStalemate.should_receive(:new).with(anything)
+        expect(Events::RoundStalemate).to receive(:new).with(anything)
         parse(line)
       end
 
@@ -258,14 +277,14 @@ module TF2LineParser
         name = "broder mirelin"
         steam_id = "STEAM_0:1:18504112"
         team = "Blue"
-        Events::ChargeDeployed.should_receive(:new).with(anything, name, steam_id, team)
+        expect(Events::ChargeDeployed).to receive(:new).with(anything, name, steam_id, team)
         parse(line)
 
         line = detailed_log_lines[782]
         name = "flo ❤"
         steam_id = "STEAM_0:1:53945481"
         team = "Blue"
-        Events::ChargeDeployed.should_receive(:new).with(anything, name, steam_id, team)
+        expect(Events::ChargeDeployed).to receive(:new).with(anything, name, steam_id, team)
         parse(line)
       end
 
@@ -278,19 +297,19 @@ module TF2LineParser
         killer_steam_id = "STEAM_0:1:16347045"
         killer_team = "Red"
         healing = "1975"
-        Events::MedicDeath.should_receive(:new).with(anything, killer_name, killer_steam_id, killer_team, medic_name, medic_steam_id, medic_team, healing, "0")
+        expect(Events::MedicDeath).to receive(:new).with(anything, killer_name, killer_steam_id, killer_team, medic_name, medic_steam_id, medic_team, healing, "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, anything, "1")
+        expect(Events::MedicDeath).to receive(:new).with(anything, anything, anything, anything, anything, anything, anything, anything, "1")
         parse(uberdrop)
       end
 
       it 'recognizes medic healing on death' do
         line = '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, "6478", anything)
+        expect(Events::MedicDeath).to receive(:new).with(anything, anything, anything, anything, anything, anything, anything, "6478", anything)
         parse(line)
       end
 
@@ -300,14 +319,14 @@ module TF2LineParser
         player_steam_id = "STEAM_0:1:159631"
         player_team = "Blue"
         role = 'scout'
-        Events::RoleChange.should_receive(:new).with(anything, player_name, player_steam_id, player_team, role)
+        expect(Events::RoleChange).to receive(:new).with(anything, player_name, player_steam_id, player_team, role)
         parse(line)
       end
 
       it 'recognizes round length' do
         line = log_lines[2275]
         length = "237.35"
-        Events::RoundLength.should_receive(:new).with(anything, length)
+        expect(Events::RoundLength).to receive(:new).with(anything, length)
         parse(line)
       end
 
@@ -318,7 +337,7 @@ module TF2LineParser
         team = "Red"
         cap_number = "2"
         cap_name = "#Badlands_cap_cp3"
-        Events::CaptureBlock.should_receive(:new).with(anything, name, steam_id, team, cap_number, cap_name)
+        expect(Events::CaptureBlock).to receive(:new).with(anything, name, steam_id, team, cap_number, cap_name)
         parse(line)
       end
 
@@ -328,7 +347,7 @@ module TF2LineParser
         steam_id = "STEAM_0:0:2829363"
         team = "Red"
         suicide_method = "world"
-        Events::Suicide.should_receive(:new).with(anything, name, steam_id, team, suicide_method)
+        expect(Events::Suicide).to receive(:new).with(anything, name, steam_id, team, suicide_method)
         parse(line)
       end
 
@@ -338,7 +357,7 @@ module TF2LineParser
         steam_id = "STEAM_0:0:50979748"
         team = "Red"
         klass = "Soldier"
-        Events::Spawn.should_receive(:new).with(anything, name, steam_id, team, klass)
+        expect(Events::Spawn).to receive(:new).with(anything, name, steam_id, team, klass)
         parse(line)
       end
 
@@ -346,7 +365,7 @@ module TF2LineParser
         line = log_lines[0]
         time = "02/07/2013 - 21:21:08"
         unknown = 'Log file started (file "logs/L0207006.log") (game "/home/hz00112/tf2/orangebox/tf") (version "5198")'
-        Events::Unknown.should_receive(:new).with(time, unknown)
+        expect(Events::Unknown).to receive(:new).with(time, unknown)
         parse(line)
       end
 
@@ -369,8 +388,28 @@ module TF2LineParser
         end
       end
 
+      it 'recognizes cs:go chat' do
+        line = csgo_log_lines[299]
+        name = "• Ben •"
+        steam_id =  "STEAM_1:0:160621749"
+        team = 'TERRORIST'
+        message = "!rcon changelevel de_dust2"
+        expect(Events::Say).to receive(:new).with(anything, name, steam_id, team, message)
+        parse(line)
+      end
+
+      it "doesn't fall for twiikuu's cheeky name" do
+        player_name = 't<1><[U:1:123456]><Red>" say "'
+        line = %Q|L 02/07/2013 - 21:22:08: "#{player_name}<5><[U:1:1337]><Red>" say "!who"|
 
-    end
+        name = 't<1><[U:1:123456]><Red>" say "'
+        steam_id = "[U:1:1337]"
+        team = 'Red'
+        message = "!who"
+        expect(Events::Say).to receive(:new).with(anything, name, steam_id, team, message)
 
+        parse(line)
+      end
+    end
   end
 end

data/spec/lib/tf2_line_parser/player_spec.rb

@@ -8,7 +8,7 @@ module TF2LineParser
     it "compares based on steam_id" do
       p1 = Player.new("Arie", "12345", "Red")
       p2 = Player.new("Arie fakenicking", "12345", "Red")
-      p1.should eq p2
+      expect(p1).to eq p2
     end
 
   end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]

data/tf2_line_parser.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "activesupport"
   gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency "pry-nav",        "~> 0.2.3"
-  gem.add_development_dependency "rspec",          "~> 2.13.0"
+  gem.add_development_dependency "pry-nav"
+  gem.add_development_dependency "rspec", "~> 3.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tf2_line_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Arie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,30 +42,30 @@ dependencies:
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.5.0
 description: A gem to parse log lines from TF2 servers
 email: rubygems@ariekanarie.nl
 executables: []
@@ -85,12 +85,14 @@ files:
 - lib/tf2_line_parser/events/capture_block.rb
 - lib/tf2_line_parser/events/charge_deployed.rb
 - lib/tf2_line_parser/events/chat.rb
+- lib/tf2_line_parser/events/connect.rb
 - lib/tf2_line_parser/events/console_say.rb
 - lib/tf2_line_parser/events/current_score.rb
 - lib/tf2_line_parser/events/damage.rb
 - lib/tf2_line_parser/events/domination.rb
 - lib/tf2_line_parser/events/event.rb
 - lib/tf2_line_parser/events/final_score.rb
+- lib/tf2_line_parser/events/headshot_damage.rb
 - lib/tf2_line_parser/events/heal.rb
 - lib/tf2_line_parser/events/kill.rb
 - lib/tf2_line_parser/events/match_end.rb
@@ -115,11 +117,11 @@ files:
 - lib/tf2_line_parser/parser.rb
 - lib/tf2_line_parser/player.rb
 - lib/tf2_line_parser/version.rb
-- 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/csgo.log
 - spec/fixtures/logs/detailed_damage.log
 - spec/fixtures/logs/example.log
 - spec/fixtures/logs/new_log.log
@@ -147,14 +149,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.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/csgo.log
 - spec/fixtures/logs/detailed_damage.log
 - spec/fixtures/logs/example.log
 - spec/fixtures/logs/new_log.log