kag-gather 1.0.7 → 1.0.8

data/lib/kag/config.rb

@@ -18,5 +18,10 @@ module KAG
         raise 'Error loading config file from config/config.json'
       end
     end
+
+    def reload
+      puts "Reloading configuration file..."
+      self.merge!(self._get_config)
+    end
   end
 end

data/lib/kag/gather.rb

@@ -115,8 +115,12 @@ module KAG
 
     def end_match(match)
       if match[:server].has_rcon?
-        match[:server].kick_all
-        match[:server].disconnect
+        begin
+          match[:server].kick_all
+        rescue Exception => e
+          debug e.message
+          debug e.backtrace.join("\n")
+        end
       else
         debug "NO RCON, so could not kick!"
       end
@@ -137,7 +141,9 @@ module KAG
 
     def get_match_in(nick)
       m = false
+      puts "looking for #{nick} in a match"
       @matches.each do |k,match|
+        puts match.inspect
         if match[:team1] and match[:team1].include?(nick)
           m = match
         elsif match[:team2] and match[:team2].include?(nick)
@@ -190,21 +196,31 @@ module KAG
         classes_t2 = get_team_classes(2)
 
         team1.each do |p|
-          msg = msg+classes_t1.shift if KAG::Config.instance[:pick_classes]
-          sleep(0.5)
-          User(p).send(msg+" \x0312Blue Team with: #{team1.join(", ")}") unless p.include?("player")
+          player_msg = msg.clone
+          player_msg = player_msg+classes_t1.shift if KAG::Config.instance[:pick_classes]
+          player_msg = player_msg+" \x0312Blue Team with: #{team1.join(", ")}"
+          User(p).send(player_msg) unless p.include?("player")
+          debug "Sent to #{p.to_s}: "+player_msg
+          sleep(1)
         end
         team2.each do |p|
-          msg = msg+classes_t2.shift if KAG::Config.instance[:pick_classes]
-          sleep(0.5)
-          User(p).send(msg+" \x0304Red Team with: #{team2.join(", ")}") unless p.include?("player")
+          player_msg = msg.clone
+          player_msg = player_msg+classes_t2.shift if KAG::Config.instance[:pick_classes]
+          player_msg = player_msg+" \x0304Red Team with: #{team2.join(", ")}"
+          User(p).send(player_msg) unless p.include?("player")
+          debug "Sent to #{p.to_s}: "+player_msg
+          sleep(1)
         end
 
-        if server.has_rcon?
-          server.connect
-          server.restart_map
-        else
-          debug "Cannot restart map, no RCON!"
+        begin
+          if server.has_rcon?
+            server.restart_map
+          else
+            debug "Cannot restart map, no RCON!"
+          end
+        rescue Exception => e
+          debug e.message
+          debug e.backtrace.join("\n")
         end
 
         @matches[server[:key]] = {
@@ -318,6 +334,14 @@ module KAG
         exit
       end
     end
+
+    match "reload_config", method: :evt_reload_config
+    def evt_reload_config(m)
+      if is_admin(m.user)
+        KAG::Config.instance.reload
+        m.reply "Configuration reloaded."
+      end
+    end
     
     def get_team_classes(team)
       classes = KAG::Config.instance[:classes]

data/lib/kag/server.rb

@@ -23,18 +23,27 @@ module KAG
     end
 
     def connect
-      return false unless self.socket
+      return true if self.connected?
+      unless self.socket
+        puts "Could not establish TCP socket to connect"
+        return false
+      end
       self.socket.puts self[:rcon_password]
       z = self.socket.gets
       z.include?("now authenticated")
       self[:_connected] = true
+      true
     end
 
     def disconnect
       if self[:_socket]
+        puts "[RCON] Closing socket..."
+        self.socket.puts "/quit"
         self[:_socket].close
         self[:_connected] = false
+        self.delete(:_socket)
       end
+      true
     end
 
     def connected?
@@ -53,6 +62,7 @@ module KAG
     end
 
     def players
+      return false unless self.connect
       _command "/players"
 
       players = []
@@ -89,16 +99,18 @@ module KAG
 
         players << player
       end
+      _cycle
       players
     end
 
     def kick(nick)
-      return false unless self.connected?
+      return false unless self.connect
       self.socket.puts "/kick #{nick}"
       _cycle
     end
 
     def kick_all
+      return false unless self.connect
       ps = self.players
       if ps
         ps.each do |player|
@@ -111,11 +123,13 @@ module KAG
     end
 
     def restart_map
+      return false unless self.connect
       _command "/restartmap"
       _cycle
     end
 
     def next_map
+      return false unless self.connect
       _command "/nextmap"
       _cycle
     end

data/lib/kag/version.rb

@@ -1,5 +1,5 @@
 module KAG
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
   def self.version
     VERSION
   end

metadata

@@ -2,7 +2,7 @@
 name: kag-gather
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Shaun McCormick