steam_hlds_log_parser 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 3e50cd7e02251eb8f005cffa7db04028ef24c230
-  data.tar.gz: 088c9c2ae149c651c7c221885c5df6e3cbcb0b70
+  data.tar.gz: bd893345adf64a1cd18271c4213ecaecfa0aa09e
+  metadata.gz: eb18a8ebc669f69ce843443295743e2577608eba
 SHA512: 
-  metadata.gz: fe0846e0981463819ccd9e033c2ed5249fc2b6e0c63c59b5333089f635bfd7bca0660d451e059677aba809a4db8484fd1d11e7da661ea6b8a2b94f6c41617a6d
-  data.tar.gz: 6850d1f8eabfaf9fb55c5e3a3878c90582675d4ffab294a66d34499a1515187b026fd78dee4ef38754a1e35c850776f88019d06452e40f7a4e0a047b35bcb80e
+  data.tar.gz: 1db3bee454617d173c1077e655da535df1fb8cb406dbb74f369aebe91b26aff5dc0a6aac245d01073ce4fc593bb7ffc9f14d321bc8b19da654acc1be40268956
+  metadata.gz: 6ce8847b3758d2576bd08c67ca1f78f360d03b1be89e9b824e2e5ba64c980228bbffc8dc09ba71411775d1e5531d4ed1c28e06cb0a66bf90c46b13c4825c4871

data/examples/example-2.rb

@@ -14,6 +14,8 @@ options = {
   :host                 => "0.0.0.0",
   :port                 => 27115,
   :locale               => :en,
+  :display_end_map      => true,
+  :display_end_round    => true,
   :display_kills        => true,
   :display_actions      => true,
   :display_changelevel  => true,

data/lib/steam_hlds_log_parser/client.rb

@@ -16,6 +16,8 @@ module SteamHldsLogParser
     # @option options [String] :host (0.0.0.0) IP Address the client will be running, usually localhost
     # @option options [Integer] :port (27115) Port will be listening to
     # @option options [Symbol] :locale (:en) Set the language of returned content
+    # @option options [Boolean] :display_end_map (true) Enable display of score at the end of each map
+    # @option options [Boolean] :display_end_round (true) Enable display of score after each round 
     # @option options [Boolean] :display_kills (true) Enable kills / frags detail 
     # @option options [Boolean] :display_actions (true) Enable players actions / defuse / ... detail
     # @option options [Boolean] :display_changelevel (true) Enable changelevel (map) display
@@ -29,6 +31,8 @@ module SteamHldsLogParser
         :host                 => "0.0.0.0",
         :port                 => 27115,
         :locale               => :en,
+        :display_end_map      => true,
+        :display_end_round    => true,
         :display_kills        => true,
         :display_actions      => true,
         :display_changelevel  => true,

data/lib/steam_hlds_log_parser/handler.rb

@@ -46,14 +46,14 @@ module SteamHldsLogParser
     def receive_data(data)
 
       # L 05/10/2000 - 12:34:56: Team "CT" scored "17" with "0" players
-      if data.gsub(/Team "([A-Z]+)" scored "(\d+)" with "(\d+)"/).count > 0
+      if @options[:display_end_map] && data.gsub(/Team "([A-Z]+)" scored "(\d+)" with "(\d+)"/).count > 0
         winner, winner_score = data.match(/Team "(.+)" scored "(\d+)" with/).captures
-        content = { :type => 'map_ends', :params => { :winner => get_short_team_name(winner), :score => winner_score } } 
+        content = { :type => 'end_map', :params => { :winner => get_short_team_name(winner), :score => winner_score } } 
 
       # L 05/10/2000 - 12:34:56: Team "CT" triggered "CTs_Win" (CT "3") (T "0")
-      elsif data.gsub(/: Team "[A-Z]+" triggered/).count > 0
+      elsif @options[:display_end_map] && data.gsub(/: Team "[A-Z]+" triggered/).count > 0
         winner, type, score_ct, score_t = data.match(/Team "([A-Z]+)" triggered "([A-Za-z_]+)" \(CT "(\d+)"\) \(T "(\d+)"\)/i).captures
-        content = { :type => 'victory', :params => { :score_ct => score_ct, :score_t => score_t } }
+        content = { :type => 'end_round', :params => { :score_ct => score_ct, :score_t => score_t } }
 
       # L 05/10/2000 - 12:34:56: "Killer | Player<66><STEAM_ID_LAN><TERRORIST>" killed "Killed | Player<60><STEAM_ID_LAN><CT>" with "ak47"
       elsif @options[:display_kills] && data.gsub(/(\>" killed ")/).count > 0

data/lib/steam_hlds_log_parser/version.rb

@@ -1,4 +1,4 @@
 module SteamHldsLogParser
   # Gem Version
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/client_spec.rb

@@ -37,6 +37,14 @@ module SteamHldsLogParser
           expect(default_client.options[:locale].class).to be(Symbol)
           expect(default_client.options[:locale]).to be(:en)
         end
+        it "has a default 'display_end_map'" do
+          expect(default_client.options[:display_end_map]).not_to be_nil      
+          expect(default_client.options[:display_end_map]).to be_true      
+        end
+        it "has a default 'display_end_round'" do
+          expect(default_client.options[:display_end_round]).not_to be_nil      
+          expect(default_client.options[:display_end_round]).to be_true      
+        end
         it "has a default 'display_kills'" do
           expect(default_client.options[:display_kills]).not_to be_nil      
           expect(default_client.options[:display_kills]).to be_true      
@@ -87,6 +95,14 @@ module SteamHldsLogParser
           expect(custom_client.options[:locale].class).to be(Symbol)      
           expect(custom_client.options[:locale]).to be(:fr)  
         end
+        it "has a default 'display_end_map'" do
+          expect(custom_client.options[:display_end_map]).not_to be_nil      
+          expect(custom_client.options[:display_end_map]).to be_false      
+        end
+        it "has a default 'display_end_round'" do
+          expect(custom_client.options[:display_end_round]).not_to be_nil      
+          expect(custom_client.options[:display_end_round]).to be_false      
+        end
         it "has a custom 'display_kills'" do
           expect(custom_client.options[:display_kills]).not_to be_nil      
           expect(custom_client.options[:display_kills]).to be_false  

data/spec/handler_spec.rb

@@ -53,20 +53,20 @@ module SteamHldsLogParser
             end
           end
 
-          context "when data is 'map_ends'" do
-            it "returns Hash on map_ends" do
+          context "when data is 'end_map'" do
+            it "returns a Hash" do
               data = '# L 05/10/2000 - 12:34:56: Team "CT" scored "17" with "0" players"'
-              expected = {:type=>"map_ends", :params=>{:winner=>"CT", :score=>"17"}}
+              expected = {:type=>"end_map", :params=>{:winner=>"CT", :score=>"17"}}
               expect(@handler.receive_data(data).class).to be(RSpecDisplayer)
               expect(@handler.receive_data(data).data).to eq(expected)
               expect(@handler.receive_data(data).data.class).to be(Hash)
             end
           end
 
-          context "when data is 'victory'" do
-            it "returns Hash on victory" do
+          context "when data is 'end_round'" do
+            it "returns a Hash" do
               data = '# L 05/10/2000 - 12:34:56: Team "CT" triggered "CTs_Win" (CT "3") (T "0")'
-              expected = {:type=>"victory", :params=>{:score_ct=>"3", :score_t=>"0"}}
+              expected = {:type=>"end_round", :params=>{:score_ct=>"3", :score_t=>"0"}}
               expect(@handler.receive_data(data).class).to be(RSpecDisplayer)
               expect(@handler.receive_data(data).data).to eq(expected)
               expect(@handler.receive_data(data).data.class).to be(Hash)
@@ -74,7 +74,7 @@ module SteamHldsLogParser
           end
 
           context "when data is 'killed' (STEAM_ID_LAN)" do
-            it "returns Hash on killed" do
+            it "returns a Hash" do
               data = '# L 05/10/2000 - 12:34:56: "Killer | Player<66><STEAM_ID_LAN><TERRORIST>" killed "Killed | Player<60><STEAM_ID_LAN><CT>" with "ak47"'
               expected = {:type=>"kill", :params => {:killer_team=>"T", :killer=>"Killer | Player",  :killed_team=>"CT", :killed=>"Killed | Player", :weapon=>"ak47"}}
               expect(@handler.receive_data(data).class).to be(RSpecDisplayer)
@@ -84,7 +84,7 @@ module SteamHldsLogParser
           end
 
           context "when data is 'killed' (STEAM_0:0:12345)" do
-            it "returns Hash on killed" do
+            it "returns a Hash" do
               data = '# L 05/10/2000 - 12:34:56: "Killer | Player<66><STEAM_0:0:12345><TERRORIST>" killed "Killed | Player<60><STEAM_0:0:12345><CT>" with "ak47"'
               expected = {:type=>"kill", :params => {:killer_team=>"T", :killer=>"Killer | Player",  :killed_team=>"CT", :killed=>"Killed | Player", :weapon=>"ak47"}}
               expect(@handler.receive_data(data).class).to be(RSpecDisplayer)
@@ -94,7 +94,7 @@ module SteamHldsLogParser
           end
 
           context "when data is 'suicide' (STEAM_ID_LAN)" do
-            it "returns Hash on suicide" do
+            it "returns a Hash" do
               data = '# L 05/10/2000 - 12:34:56: "Player<66><STEAM_ID_LAN><TERRORIST>" committed suicide with "worldspawn" (world)'
               expected = {:type=>"suicide", :params=>{:killed=>"Player"}}
               expect(@handler.receive_data(data).class).to be(RSpecDisplayer)
@@ -104,7 +104,7 @@ module SteamHldsLogParser
           end
 
           context "when data is 'suicide' (STEAM_0:0:12345)" do
-            it "returns Hash on suicide" do
+            it "returns a Hash" do
               data = '# L 05/10/2000 - 12:34:56: "Player<66><STEAM_0:0:12345><TERRORIST>" committed suicide with "worldspawn" (world)'
               expected = {:type=>"suicide", :params=>{:killed=>"Player"}}
               expect(@handler.receive_data(data).class).to be(RSpecDisplayer)
@@ -114,7 +114,7 @@ module SteamHldsLogParser
           end
 
           context "when data is 'event' (STEAM_ID_LAN)" do
-            it "returns Hash on event" do
+            it "returns a Hash" do
               data = '# L 05/10/2000 - 12:34:56: "Killer | Player<66><STEAM_ID_LAN><CT>" triggered "Defused_The_Bomb"'
               expected = {:type=>"event", :params=> {:person_team=>"CT", :person=>"Killer | Player", :event_item=>"Defused_The_Bomb", :event_i18n=>"defused the bomb"}}
               expect(@handler.receive_data(data).class).to be(RSpecDisplayer)
@@ -124,7 +124,7 @@ module SteamHldsLogParser
           end
 
           context "when data is 'event' (STEAM_0:0:12345)" do
-            it "returns Hash on event" do
+            it "returns a Hash" do
               data = '# L 05/10/2000 - 12:34:56: "Killer | Player<66><STEAM_0:0:12345><CT>" triggered "Defused_The_Bomb"'
               expected = {:type=>"event", :params=> {:person_team=>"CT", :person=>"Killer | Player", :event_item=>"Defused_The_Bomb", :event_i18n=>"defused the bomb"}}
               expect(@handler.receive_data(data).class).to be(RSpecDisplayer)
@@ -134,7 +134,7 @@ module SteamHldsLogParser
           end
 
           context "when data is 'changelevel'" do
-            it "returns Hash on changelevel" do
+            it "returns a Hash" do
               data = '# L 05/10/2000 - 12:34:56: Loading map "de_dust2"'
               expected = {:type=>"loading_map", :params=>{:map=>"de_dust2"}}
               expect(@handler.receive_data(data).class).to be(RSpecDisplayer)
@@ -144,7 +144,7 @@ module SteamHldsLogParser
           end
 
           context "when data is 'chat'" do
-            it "returns Hash on changelevel" do
+            it "returns a Hash" do
               data = '# L 05/10/2000 - 12:34:56: "Player<15><STEAM_0:0:12345><TERRORIST>" say "gg" (dead)'
               expected = {:type=>"chat", :params=>{:player=>"Player", :player_team=>"T", :chat=>"gg"}}
               expect(@handler.receive_data(data).class).to be(RSpecDisplayer)
@@ -154,7 +154,7 @@ module SteamHldsLogParser
           end
           
           context "when data is 'team_chat'" do
-            it "returns Hash on changelevel" do
+            it "returns a Hash" do
               data = '# L 05/10/2000 - 12:34:56: "Player<15><STEAM_0:0:12345><TERRORIST>" say_team "Rush B"'
               expected = {:type=>"team_chat", :params=>{:player=>"Player", :player_team=>"T", :chat=>"Rush B"}}
               expect(@handler.receive_data(data).class).to be(RSpecDisplayer)
@@ -185,7 +185,7 @@ module SteamHldsLogParser
 
           subject { @custom_handler }
           context "when 'displayer' is set" do
-            it "returns Hash on changelevel provided by 'displayer'" do
+            it "returns a Hash provided by 'displayer'" do
               data = '# L 05/10/2000 - 12:34:56: Loading map "de_dust2"'
               expected = {:type=>"loading_map", :params=>{:map=>"de_dust2"}}
               expect(@custom_handler.displayer).to be(RSpecDisplayer)

data/spec/helper_spec.rb

@@ -46,6 +46,8 @@ def custom_options
     :host                 => "127.0.0.1",
     :port                 => 12345,
     :locale               => :fr,
+    :display_end_map      => false,
+    :display_end_round    => false,
     :display_kills        => false,
     :display_actions      => false,
     :display_changelevel  => false,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: steam_hlds_log_parser
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Thomas VIAL
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-01 00:00:00 Z
+date: 2013-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler