Merge branch '1.3-stable'

koraktor · Jan 4, 2015 · 455415f · 455415f
2 parents c8a7b69 + b1264a7
commit 455415f
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@
  * [ENHANCEMENT] Removed old hackish master server functionality
  * [ENHANCEMENT] Removed deprecated aliases from SteamId
 
+## Version 1.3.10 / 2015-01-04
+
+ * [BUGFIX] Fixed problems with game inventories
+ * [PERFORMANCE] Optimized GoldSrc RCON requests
+ * [ENHANCEMENT] Specify minimum Ruby version in gem specification
+
 ## Version 1.3.9 / 2014-07-22
 
  * [IMPROVEMENT] Simplified and improved socket error handling
@@ -20,7 +26,7 @@
 
  * [ENHANCEMENT] Add support for additional group information
  * [IMPROVEMENT] Improve handling of UTF-8 characters in server replies
- * [IMPROVEMENT] Other improvments
+ * [IMPROVEMENT] Other improvements
 
 ## Version 1.3.7 / 2013-09-02
 
@@ -96,7 +102,7 @@
  * [BUGFIX] Use `A2S_PLAYER` packet to challenge game servers
  * [BUGFIX] Fixed several URL related problems
  * [BUGFIX] Fixed Web API not working without an API key
- * [PERFORMACE] Optimized fetching of Steam group members
+ * [PERFORMANCE] Optimized fetching of Steam group members
 
 ## Version 1.1.0 / 2011-12-13
 
@@ -239,7 +245,7 @@
  * [FEATURE] Support for *Team Fortress 2* stats and achievements
  * [FEATURE] Support for split RCON replies
  * [FEATURE] Support for compressed query replies
- * [ENHANCEMENT] Better support for HTLV servers
+ * [ENHANCEMENT] Better support for HLTV servers
  * [ENHANCEMENT] XML cache for `GameStats`
  * [ENHANCEMENT] Use correct packet names
  * [BUGFIX] Fixed fetching of `SteamId` data

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2008-2013, Sebastian Staudt
+Copyright (c) 2008-2015, Sebastian Staudt
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/lib/steam-condenser/community/dota2/dota2_inventory.rb b/lib/steam-condenser/community/dota2/dota2_inventory.rb
@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2012, Sebastian Staudt
+# Copyright (c) 2012-2014, Sebastian Staudt
 
 require 'steam-condenser/community/dota2/dota2_item'
 require 'steam-condenser/community/game_inventory'
@@ -27,7 +27,7 @@ def initialize(steam_id64)
     end
 
     # The class representing DotA 2 items
-    @@item_class = Dota2Item
+    @item_class = Dota2Item
 
   end
 

diff --git a/lib/steam-condenser/community/dota2/dota2_item.rb b/lib/steam-condenser/community/dota2/dota2_item.rb
@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2012, Sebastian Staudt
+# Copyright (c) 2012-2014, Sebastian Staudt
 
 require 'steam-condenser/community/game_item'
 
@@ -10,9 +10,7 @@ module SteamCondenser::Community
   # Represents a DotA 2 item
   #
   # @author Sebastian Staudt
-  class Dota2Item
-
-    include GameItem
+  class Dota2Item < GameItem
 
     # Creates a new instance of a DotA 2 item with the given data
     #

diff --git a/lib/steam-condenser/community/dota2/dota2_test_inventory.rb b/lib/steam-condenser/community/dota2/dota2_test_inventory.rb
@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2012, Sebastian Staudt
+# Copyright (c) 2012-2014, Sebastian Staudt
 
 require 'steam-condenser/community/dota2/dota2_item'
 require 'steam-condenser/community/game_inventory'
@@ -27,7 +27,7 @@ def initialize(steam_id64)
     end
 
     # The class representing DotA 2 items
-    @@item_class = Dota2Item
+    @item_class = Dota2Item
 
   end
 

diff --git a/lib/steam-condenser/community/game_inventory.rb b/lib/steam-condenser/community/game_inventory.rb
@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2011-2013, Sebastian Staudt
+# Copyright (c) 2011-2014, Sebastian Staudt
 
 require 'steam-condenser/community/cacheable'
 require 'steam-condenser/community/game_item'
@@ -50,7 +50,7 @@ class GameInventory
     # @return [SteamId] The Steam ID of the owner of this inventory
     attr_reader :user
 
-    @@item_class = GameItem
+    @item_class = GameItem
 
     @@schema_language = 'en'
 
@@ -133,7 +133,7 @@ def [](index)
     def fetch
       params = { :SteamID => @user.steam_id64 }
       result = WebApi.json! "IEconItems_#@app_id", 'GetPlayerItems', 1, params
-      item_class = self.class.send :class_variable_get, :@@item_class
+      item_class = self.class.instance_variable_get :@item_class
 
       @items = []
       @preliminary_items = []

diff --git a/lib/steam-condenser/community/game_item.rb b/lib/steam-condenser/community/game_item.rb
@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2011-2013, Sebastian Staudt
+# Copyright (c) 2011-2014, Sebastian Staudt
 
 require 'steam-condenser/community/web_api'
 
@@ -11,7 +11,7 @@ module SteamCondenser::Community
   # in a game
   #
   # @author Sebastian Staudt
-  module GameItem
+  class GameItem
 
     # Return the attributes of this item
     #

diff --git a/lib/steam-condenser/community/portal2/portal2_inventory.rb b/lib/steam-condenser/community/portal2/portal2_inventory.rb
@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2011-2012, Sebastian Staudt
+# Copyright (c) 2011-2014, Sebastian Staudt
 
 require 'steam-condenser/community/game_inventory'
 require 'steam-condenser/community/portal2/portal2_item'
@@ -27,7 +27,7 @@ def initialize(steam_id64)
     end
 
     # The class representing Portal 2 items
-    @@item_class = Portal2Item
+    @item_class = Portal2Item
 
   end
 end
diff --git a/lib/steam-condenser/community/portal2/portal2_item.rb b/lib/steam-condenser/community/portal2/portal2_item.rb
@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2011-2012, Sebastian Staudt
+# Copyright (c) 2011-2014, Sebastian Staudt
 
 require 'steam-condenser/community/game_item'
 
@@ -10,9 +10,7 @@ module SteamCondenser::Community
   # Represents a Portal 2 item
   #
   # @author Sebastian Staudt
-  class Portal2Item
-
-    include GameItem
+  class Portal2Item < GameItem
 
     # The names of the bots available in Portal 2
     BOTS = [ :pbody, :atlas ]

diff --git a/lib/steam-condenser/community/tf2/tf2_beta_inventory.rb b/lib/steam-condenser/community/tf2/tf2_beta_inventory.rb
@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2011-2012, Sebastian Staudt
+# Copyright (c) 2011-2014, Sebastian Staudt
 
 require 'steam-condenser/community/game_inventory'
 require 'steam-condenser/community/tf2/tf2_item'
@@ -27,7 +27,7 @@ def initialize(steam_id64)
       super APP_ID, steam_id64
     end
 
-    @@item_class = TF2Item
+    @item_class = TF2Item
 
   end
 end
diff --git a/lib/steam-condenser/community/tf2/tf2_inventory.rb b/lib/steam-condenser/community/tf2/tf2_inventory.rb
@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2010-2012, Sebastian Staudt
+# Copyright (c) 2010-2014, Sebastian Staudt
 
 require 'steam-condenser/community/game_inventory'
 require 'steam-condenser/community/tf2/tf2_item'
@@ -27,7 +27,7 @@ def initialize(steam_id64)
     end
 
     # The class representing Team Fortress 2 items
-    @@item_class = TF2Item
+    @item_class = TF2Item
 
   end
 end
diff --git a/lib/steam-condenser/community/tf2/tf2_item.rb b/lib/steam-condenser/community/tf2/tf2_item.rb
@@ -1,7 +1,7 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2010-2012, Sebastian Staudt
+# Copyright (c) 2010-2014, Sebastian Staudt
 
 require 'steam-condenser/community/game_item'
 
@@ -10,9 +10,7 @@ module SteamCondenser::Community
   # Represents a Team Fortress 2 item
   #
   # @author Sebastian Staudt
-  class TF2Item
-
-    include GameItem
+  class TF2Item < GameItem
 
     # The names of the classes available in Team Fortress 2
     CLASSES = [ :scout, :sniper, :soldier, :demoman, :medic, :heavy, :pyro, :spy ]

diff --git a/lib/steam-condenser/servers/sockets/goldsrc_socket.rb b/lib/steam-condenser/servers/sockets/goldsrc_socket.rb
@@ -95,7 +95,6 @@ def rcon_exec(password, command)
       rcon_challenge if @rcon_challenge.nil? || @is_hltv
 
       rcon_send "rcon #@rcon_challenge #{password} #{command}"
-      rcon_send "rcon #@rcon_challenge #{password}"
       if @is_hltv
         begin
           response = reply.response
@@ -112,6 +111,8 @@ def rcon_exec(password, command)
         raise SteamCondenser::Error::RCONBan
       end
 
+      rcon_send "rcon #@rcon_challenge #{password}"
+
       begin
         response_part = reply.response
         response << response_part

diff --git a/lib/steam-condenser/version.rb b/lib/steam-condenser/version.rb
@@ -1,11 +1,11 @@
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
-# Copyright (c) 2010-2014, Sebastian Staudt
+# Copyright (c) 2010-2015, Sebastian Staudt
 
 module SteamCondenser
 
   # The current version of Steam Condenser
-  VERSION = '1.3.9'
+  VERSION = '1.3.10'
 
 end