kag-gather 1.5.7 → 1.5.8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGVhMjVmNTgzZGI3ZTM5NmYyNzI5MTUwZmRjNmMxOTVkZTllMTU5Yg==
+  data.tar.gz: !binary |-
+    YjU4MGJhMmMzMDAyOGY5YzQzZWE2ZDY0ZTE0NGUyMzg4YWE4YjdiYw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MTBlZDE3YWQ4NTFkYmEzMWNjMDhkNzQyN2IxNjA2NWRjZGM5NzBhNjZmYzE3
+    OTUyMzU4ZTFmZTdlMWZmYzM4NzRlYjVkNDA3MDk5OTEzN2U5YzEwNzBiZmU4
+    MmRjYzIzMjExMWY4YmE1YzNlOTIwYTllMGM0YTc2YmJhOGFjYzI=
+  data.tar.gz: !binary |-
+    NjkyZDAxZjA0MzcxMjg3MTcwZmIxNDY3MzJkZGU0NWJiODRmNDkyNzUxZjIx
+    MzMyZTgwODdhOGY2OWMyYWMxMTI0YzQ1MDAwYmM3ODU0NjkzZTE5MWI2MzYy
+    NjY1NWVkMDdiNjA3ZGJkYTc3OTFkNWUzODBmN2JkYTlkMjdlZWQ=

data/lib/kag/gather/match.rb

@@ -48,7 +48,15 @@ module KAG
         team_list.each do |ts|
           eb = lb+players_per_team-1
           eb = self.players.length if eb > self.players.length-1
-          ps = Hash[self.players.sort_by{|k,v| v ? v.to_s : ''}[lb..(eb)]]
+          x = 0
+          ps = {}
+          self.players.each do |authname,user|
+            if x >= lb and x <= eb
+              ps[authname.to_sym] = user
+            end
+            x = x + 1
+          end
+          #ps = Hash[self.players.sort_by{|k,v| v ? v.to_s : ''}[lb..(eb)]]
           lb = players_per_team
 
           self.teams << KAG::Gather::Team.new({
@@ -174,10 +182,12 @@ module KAG
         match = self.dup
         match[:server] = self.server[:key]
         ts = []
-        match.teams.each do |team|
-          ts << {:players => team.teammates,:color => team[:color],:name => team[:name]}
+        if match.teams
+          match.teams.each do |team|
+            ts << {:players => team.teammates,:color => team[:color],:name => team[:name]}
+          end
+          match[:teams] = ts
         end
-        match[:teams] = ts
         match.delete(:players)
         match.delete(:bot) if match.key?(:bot)
 

data/lib/kag/gather/plugin.rb

@@ -3,7 +3,7 @@ require 'kag/common'
 require 'commands/help'
 require 'kag/bot/bot'
 require 'kag/bans/report'
-require 'kag/server'
+require 'kag/server/instance'
 require 'kag/gather/queue'
 require 'kag/gather/match'
 
@@ -24,11 +24,7 @@ module KAG
       end
 
       def _load_servers
-        @servers = {}
-        KAG::Config.instance[:servers].each do |k,s|
-          s[:key] = k
-          @servers[k] = KAG::Server.new(s)
-        end
+        @servers = KAG::Server::Instance.fetch_all
       end
 
       #listen_to :channel, method: :channel_listen
@@ -364,6 +360,7 @@ module KAG
       def kick_from_match(m,nick)
         if is_admin(m.user)
           user = User(nick.to_s)
+          user.refresh
           if user
             match = get_match_in(user)
             if match

data/lib/kag/gather/queue.rb

@@ -48,12 +48,18 @@ module KAG
       def check_for_afk(gather)
         max_idle = (KAG::Config.instance[:idle][:max] or 1800)
         max_idle = max_idle.to_i
-        self.players.each do |authname,user|
-          user.refresh
-          if user.idle > max_idle
-            self.remove(user)
-            gather.send_channels_msg "Removed #{user.authname} from queue (#{KAG::Gather::Match.type_as_string}) for being idle too long [#{self.length}]"
+        begin
+          self.players.each do |authname,user|
+            user.refresh
+            if user.idle > max_idle
+              self.remove(user)
+              gather.send_channels_msg "Removed #{user.authname} from queue (#{KAG::Gather::Match.type_as_string}) for being idle too long [#{self.length}]"
+            end
           end
+        rescue Exception => e
+          puts e.message
+          puts e.backtrace.join("\n")
+          false
         end
       end
     end

data/lib/kag/gather/team.rb

@@ -45,7 +45,11 @@ module KAG
       end
 
       def has_player?(user)
-        self.players.keys.include?(user.authname.to_sym)
+        if user.authname
+          self.players.keys.include?(user.authname.to_sym)
+        else
+          false
+        end
       end
 
       def remove_player(user)

data/lib/kag/server/instance.rb

@@ -0,0 +1,198 @@
+require 'cinch'
+require 'symboltable'
+require 'json'
+require 'kagerator'
+require 'kag/config'
+require 'socket'
+
+module KAG
+  module Server
+    class Instance < SymbolTable
+      def self.fetch_all
+        servers = {}
+        KAG::Config.instance[:servers].each do |k,s|
+          s[:key] = k
+          servers[k] = KAG::Server::Instance.new(s)
+        end
+        servers
+      end
+
+      def info
+        Kagerator.server(self[:ip],self[:port])
+      end
+
+      def in_use?
+        self.key?(:match)
+      end
+
+      def has_rcon?
+        self[:rcon_password] and !self[:rcon_password].empty?
+      end
+
+      def socket
+        unless self[:_socket]
+          begin
+            self[:_socket] = TCPSocket.new(self[:ip],self[:port])
+          rescue Exception => e
+            puts e.message
+            puts e.backtrace.join("\n")
+          end
+        end
+        puts self[:_]
+        self[:_socket]
+      end
+
+      def text_join
+        "Join \x0305#{self[:key]} - #{self[:ip]}:#{self[:port]} \x0306password #{self[:password]}\x0301 | Visit kag://#{self[:ip]}/#{self[:password]}"
+      end
+
+      def connect
+        return true if self.connected?
+        puts "[RCON] Attempting to get socket"
+        unless self.socket
+          puts "[RCON] Could not establish TCP socket to connect"
+          return false
+        end
+        success = false
+        begin
+          self.socket.puts self[:rcon_password]
+          z = self.socket.gets
+          puts "[RCON] "+z.to_s
+          z.include?("now authenticated")
+          self[:_connected] = true
+          success = true
+        rescue Exception => e
+          puts e.message
+          puts e.backtrace.join("\n")
+        end
+        success
+      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?
+        self[:_connected]
+      end
+
+      def _is_newline?(line)
+        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)
+          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 "/rcon /players"
+
+        players = []
+        while (line = self.socket.gets)
+          puts "[RCONPRIOR] '"+line+"'"
+          line = _parse_line(line)
+          puts "[RCON] '"+line+"'"
+          break if (line.empty? or line == '' or line == "\n")
+
+          player = SymbolTable.new
+
+          # get nick
+          sp = line.index("[")
+          next if sp == nil
+          ep = line.index("]",sp)
+          player[:nick] = line[(sp+1)..(ep-1)]
+          line = line[ep..line.length].strip
+
+          # get id
+          sp = line.index("(")
+          ep = line.index(")",sp)
+          player[:id] = line[(sp+4)..(ep-1)]
+          line = line[ep..line.length]
+
+          # get ip
+          sp = line.index("(")
+          ep = line.index(")",sp)
+          player[:ip] = line[(sp+4)..(ep-1)]
+          line = line[ep..line.length]
+
+          # get hwid
+          sp = line.index("(")
+          ep = line.index(")",sp)
+          player[:hwid] = line[(sp+6)..(ep-1)]
+
+          players << player
+        end
+        players
+      end
+
+      def kick(nick)
+        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|
+            _command "/kick #{player[:nick]}"
+          end
+        else
+          puts "No Players found on Server #{self[:ip]}!"
+        end
+        _cycle
+      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
+
+      protected
+
+      def _command(cmd)
+        return false unless self.connected?
+        puts "[RCON] #{cmd.to_s}"
+        self.socket.puts cmd
+      end
+    end
+  end
+end

data/lib/kag/version.rb

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

metadata

@@ -1,144 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: kag-gather
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Shaun McCormick
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.4
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.4
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: cinch-identify
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.1
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.1
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: json
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !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
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.2
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !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
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.3
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !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
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    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
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: rspec
   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
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A bot for starting and managing KAG Gather matches
 email:
 - splittingred@gmail.com
@@ -147,20 +130,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - readme.md
-- lib/gather.rb
-- lib/patches.rb
 - lib/commands/command.rb
 - lib/commands/commands.rb
 - lib/commands/help.rb
-- lib/kag/common.rb
-- lib/kag/config.rb
-- lib/kag/data.rb
-- lib/kag/server.rb
-- lib/kag/version.rb
+- lib/gather.rb
 - lib/kag/bans/plugin.rb
 - lib/kag/bans/report.rb
 - lib/kag/bot/bot.rb
 - lib/kag/bot/plugin.rb
+- lib/kag/common.rb
+- lib/kag/config.rb
+- lib/kag/data.rb
 - lib/kag/gather/match.rb
 - lib/kag/gather/plugin.rb
 - lib/kag/gather/queue.rb
@@ -168,15 +148,19 @@ files:
 - lib/kag/help/book.rb
 - lib/kag/help/plugin.rb
 - lib/kag/irc/plugin.rb
+- lib/kag/server/instance.rb
 - lib/kag/stats/main.rb
 - lib/kag/stats/plugin.rb
 - lib/kag/user/plugin.rb
 - lib/kag/user/user.rb
+- lib/kag/version.rb
+- lib/patches.rb
 - config/config.sample.json
 homepage: https://github.com/splittingred/kag-gather
 licenses:
 - GPLv2
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -185,19 +169,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.25
-signing_key:
-specification_version: 3
+rubyforge_project: 
+rubygems_version: 2.0.3
+signing_key: 
+specification_version: 4
 summary: KAG Gather IRC Bot
 test_files: []
-has_rdoc:
-...

data/lib/kag/server.rb

@@ -1,187 +0,0 @@
-require 'cinch'
-require 'symboltable'
-require 'json'
-require 'kagerator'
-require 'kag/config'
-require 'socket'
-
-module KAG
-  class Server < SymbolTable
-    def info
-      Kagerator.server(self[:ip],self[:port])
-    end
-
-    def in_use?
-      self.key?(:match)
-    end
-
-    def has_rcon?
-      self[:rcon_password] and !self[:rcon_password].empty?
-    end
-
-    def socket
-      unless self[:_socket]
-        begin
-          self[:_socket] = TCPSocket.new(self[:ip],self[:port])
-        rescue Exception => e
-          puts e.message
-          puts e.backtrace.join("\n")
-        end
-      end
-      puts self[:_]
-      self[:_socket]
-    end
-
-    def text_join
-      "Join \x0305#{self[:key]} - #{self[:ip]}:#{self[:port]} \x0306password #{self[:password]}\x0301 | Visit kag://#{self[:ip]}/#{self[:password]}"
-    end
-
-    def connect
-      return true if self.connected?
-      puts "[RCON] Attempting to get socket"
-      unless self.socket
-        puts "[RCON] Could not establish TCP socket to connect"
-        return false
-      end
-      success = false
-      begin
-        self.socket.puts self[:rcon_password]
-        z = self.socket.gets
-        puts "[RCON] "+z.to_s
-        z.include?("now authenticated")
-        self[:_connected] = true
-        success = true
-      rescue Exception => e
-        puts e.message
-        puts e.backtrace.join("\n")
-      end
-      success
-    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?
-      self[:_connected]
-    end
-
-    def _is_newline?(line)
-      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)
-        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 "/rcon /players"
-
-      players = []
-      while (line = self.socket.gets)
-        puts "[RCONPRIOR] '"+line+"'"
-        line = _parse_line(line)
-        puts "[RCON] '"+line+"'"
-        break if (line.empty? or line == '' or line == "\n")
-
-        player = SymbolTable.new
-
-        # get nick
-        sp = line.index("[")
-        next if sp == nil
-        ep = line.index("]",sp)
-        player[:nick] = line[(sp+1)..(ep-1)]
-        line = line[ep..line.length].strip
-
-        # get id
-        sp = line.index("(")
-        ep = line.index(")",sp)
-        player[:id] = line[(sp+4)..(ep-1)]
-        line = line[ep..line.length]
-
-        # get ip
-        sp = line.index("(")
-        ep = line.index(")",sp)
-        player[:ip] = line[(sp+4)..(ep-1)]
-        line = line[ep..line.length]
-
-        # get hwid
-        sp = line.index("(")
-        ep = line.index(")",sp)
-        player[:hwid] = line[(sp+6)..(ep-1)]
-
-        players << player
-      end
-      players
-    end
-
-    def kick(nick)
-      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|
-          _command "/kick #{player[:nick]}"
-        end
-      else
-        puts "No Players found on Server #{self[:ip]}!"
-      end
-      _cycle
-    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
-
-    protected
-
-    def _command(cmd)
-      return false unless self.connected?
-      puts "[RCON] #{cmd.to_s}"
-      self.socket.puts cmd
-    end
-  end
-end