kag-gather 1.0.9 → 1.1.0

data/config/config.sample.json

@@ -13,6 +13,7 @@
   ,"debug": true
   ,"end_vote_threshold": 3
   ,"restart_method": "nohup sh gather.sh &"
+  ,"ignore_list": ["JTG","ColbyCheez"]
   ,"servers":{
     "server1": {
       "ip":"5.39.93.105"

data/lib/kag/gather.rb

@@ -116,7 +116,12 @@ module KAG
     def end_match(match)
       if match[:server].has_rcon?
         begin
-          match[:server].kick_all
+          match[:team1].each do |p|
+            match[:server].kick(p)
+          end
+          match[:team2].each do |p|
+            match[:server].kick(p)
+          end
         rescue Exception => e
           debug e.message
           debug e.backtrace.join("\n")
@@ -124,14 +129,15 @@ module KAG
       else
         debug "NO RCON, so could not kick!"
       end
+      match[:server].disconnect
       @matches.delete(match[:server][:key])
       send_channels_msg("Match at #{match[:server][:key]} finished!")
     end
 
-    def remove_user_from_match(nick)
+    def remove_user_from_match(nick,send_msg = true)
       match = get_match_in(nick)
-      if match
-        send_channels_msg "#{user} has left the match at #{match[:key]}! Find a sub!"
+      if match and send_msg
+        send_channels_msg "#{nick} has left the match at #{match[:server][:key]}! Find a sub!"
       end
     end
 
@@ -197,7 +203,10 @@ module KAG
 
         team1.each do |p|
           player_msg = msg.clone
-          player_msg = player_msg+classes_t1.shift if KAG::Config.instance[:pick_classes]
+          if KAG::Config.instance[:pick_classes]
+            cls = classes_t1.shift
+            player_msg = player_msg+cls if cls and !cls.empty?
+          end
           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
@@ -205,7 +214,10 @@ module KAG
         end
         team2.each do |p|
           player_msg = msg.clone
-          player_msg = player_msg+classes_t2.shift if KAG::Config.instance[:pick_classes]
+          if KAG::Config.instance[:pick_classes]
+            cls = classes_t2.shift
+            player_msg = player_msg+cls if cls and !cls.empty?
+          end
           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
@@ -291,17 +303,23 @@ module KAG
     match /rem (.+)/, method: :evt_rem_admin
     def evt_rem_admin(m, arg)
       if is_admin(m.user)
-        remove_user_from_queue(arg)
+        arg = arg.split(" ")
+        arg.each do |nick|
+          remove_user_from_queue(nick)
+        end
       end
     end
 
     match /add (.+)/, method: :evt_add_admin
     def evt_add_admin(m, arg)
       if is_admin(m.user)
-        if m.channel.has_user?(arg)
-          add_user_to_queue(m,arg)
-        else
-          reply m,"User is not in this channel!"
+        arg = arg.split(" ")
+        arg.each do |nick|
+          if m.channel.has_user?(nick)
+            add_user_to_queue(m,nick)
+          else
+            reply m,"User #{nick} is not in this channel!"
+          end
         end
       end
     end
@@ -335,6 +353,71 @@ module KAG
       end
     end
 
+    match "restart_map", method: :evt_restart_map
+    def evt_restart_map(m)
+      if is_admin(m.user)
+        match = get_match_in(m.user.nick)
+        if match
+          match[:server].restart_map
+        end
+      end
+    end
+
+    match /restart_map (.+)/, method: :evt_restart_map_specify
+    def evt_restart_map_specify(m,arg)
+      if is_admin(m.user)
+        server = get_server(arg)
+        if server
+          server.next_map
+        else
+          m.reply "No server found with key #{arg}"
+        end
+      end
+    end
+
+    match "next_map", method: :evt_next_map
+    def evt_next_map(m)
+      if is_admin(m.user)
+        match = get_match_in(m.user.nick)
+        if match
+          match[:server].restart_map
+        end
+      end
+    end
+
+    match /next_map (.+)/, method: :evt_next_map_specify
+    def evt_next_map_specify(m,arg)
+      if is_admin(m.user)
+        server = get_server(arg)
+        if server
+          server.next_map
+        else
+          m.reply "No server found with key #{arg}"
+        end
+      end
+    end
+
+    match /kick_from_match (.+)/, method: :evt_kick_from_match
+    def evt_kick_from_match(m,nick)
+      if is_admin(m.user)
+        match = get_match_in(nick)
+        if match[:server]
+          match[:server].kick(nick)
+          remove_user_from_match(nick,false)
+          m.reply "#{nick} has been kicked from the match"
+        else
+          m.reply "#{nick} is not in a match!"
+        end
+      end
+    end
+
+    def get_server(key)
+      @matches.each do |k,m|
+        return m[:server] if k.to_s == key
+      end
+      false
+    end
+
     match "reload_config", method: :evt_reload_config
     def evt_reload_config(m)
       if is_admin(m.user)
@@ -346,7 +429,7 @@ module KAG
     def get_team_classes(team)
       classes = KAG::Config.instance[:classes]
       classes.shuffle!
-      classes
+      classes.clone
     end
   end
 end

data/lib/kag/server.rb

@@ -19,17 +19,20 @@ module KAG
       unless self[:_socket]
         self[:_socket] = TCPSocket.new(self[:ip],self[:port])
       end
+      puts self[:_]
       self[:_socket]
     end
 
     def connect
       return true if self.connected?
+      puts "[RCON] Attempting to get socket"
       unless self.socket
-        puts "Could not establish TCP socket to connect"
+        puts "[RCON] Could not establish TCP socket to connect"
         return false
       end
       self.socket.puts self[:rcon_password]
       z = self.socket.gets
+      puts "[RCON] "+z.to_s
       z.include?("now authenticated")
       self[:_connected] = true
       true
@@ -38,7 +41,7 @@ module KAG
     def disconnect
       if self[:_socket]
         puts "[RCON] Closing socket..."
-        self.socket.puts "/quit"
+        #self.socket.puts "/quit"
         self[:_socket].close
         self[:_connected] = false
         self.delete(:_socket)
@@ -51,27 +54,47 @@ module KAG
     end
 
     def _is_newline?(line)
-      line[10..line.length].rstrip.empty?
+      line.empty?
+    end
+
+    def _parse_line(line)
+      line.gsub!(/\r/,"")
+      line.gsub!(/\n/,"")
+      line = line.strip
+      ep = line.index(']')
+      if ep
+        line = line[(ep+1)..line.length].strip
+      else
+        line = line[10..line.length].strip
+      end
+      line.gsub!(/\r/,"")
+      line.gsub!(/\n/,"")
+      line
     end
 
     def _cycle
       while (line = self.socket.gets)
-        puts line
-        break if _is_newline?(line)
+        line = _parse_line(line)
+        puts "[RCON] "+line
+        break if (_is_newline?(line) or line.empty?)
       end
     end
 
+    ##
+    # broken
+    #
     def players
       return false unless self.connect
-      _command "/players"
+      _command "/rcon /players"
 
       players = []
       while (line = self.socket.gets)
-        puts line
-        break if _is_newline?(line)
+        puts "[RCONPRIOR] '"+line+"'"
+        line = _parse_line(line)
+        puts "[RCON] '"+line+"'"
+        break if (line.empty? or line == '' or line == "\n")
 
         player = SymbolTable.new
-        line = line[10..line.length].strip
 
         # get nick
         sp = line.index("[")
@@ -99,7 +122,6 @@ module KAG
 
         players << player
       end
-      _cycle
       players
     end
 

data/lib/kag/version.rb

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

metadata

@@ -1,128 +1,128 @@
 --- !ruby/object:Gem::Specification
 name: kag-gather
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 1.0.9
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Shaun McCormick
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.4
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: symboltable
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.2
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: kagerator
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.3
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  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
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  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
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  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
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-  type: :development
 description: ''
 email:
 - splittingred@gmail.com
@@ -141,28 +141,26 @@ files:
 homepage: https://github.com/splittingred/kag-gather
 licenses:
 - GPLv2
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.25
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.24
+signing_key: 
 specification_version: 3
 summary: KAG Gather IRC Bot
 test_files: []
-has_rdoc:
-...