kag-gather 1.4.3 → 1.4.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTAyZDFkOGQyODNlYzlkZWEwNDE3NWUwMGE0ZjZkNTBjNGUyZTAxMw==
+  data.tar.gz: !binary |-
+    Mjk0M2ZmY2Y1YTEyYjMzNDNkMTYwMjYwYzA4NjMyOTAyYWU5NzZjMA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YzA4N2U5OTY5ZGQ1YzdiNDZmNDk4YmJmNmQzOWJlZDBhYTc4MWExNjU5MmQ2
+    ZTU3ZTg1ZjlmYzFhNDU3MDQyOWYwMzljZTlkYTAzMjJlYTA5NGEwMjY3ZmU5
+    YWRjMjE1NWRjYmVkZGE1MjNjNjE2Yzg2NGY1OTU2Y2YyOTdjMWY=
+  data.tar.gz: !binary |-
+    YWYwYTY0ZDIxZTEwZDVhNGQ4MTYxMjc2N2RmZDllZjZlNDlmMzU0NDg5MDZi
+    YTg3ODdiMTNiZjlhNDQzNDFmZjgxOWJmNjZmMzkxMWFiMjE1ZmY3NGE5NTQ1
+    YzFiYmMzNmU3M2I3MTQ3YjFlZThjODNhZDNjMjgyNjZlODY0NDU=

data/lib/kag/bans/report.rb

@@ -149,7 +149,7 @@ module KAG
           return true
         end
 
-        if user.authname and user.authname != ""
+        if user.authed?
           begin
             KAG::Config.data[:ignored].key?(user.authname.to_sym)
           rescue Exception => e
@@ -157,7 +157,7 @@ module KAG
             puts e.backtrace
           end
         else
-          user.send "You must first AUTH on the IRC server before you can use this bot."
+          user.send "You must first AUTH on the IRC server via Q before you can use this bot."
           KAG::Config.data.add_action(user)
         end
       end

data/lib/kag/gather/match.rb

@@ -17,38 +17,44 @@ module KAG
       end
 
       def setup_teams
-        self[:players].shuffle!
+        self.players.shuffle!
         match_size = KAG::Config.instance[:match_size].to_i
         match_size = 2 if match_size < 2
 
-        lb = (match_size / 2).ceil.to_i
-        lb = 1 if lb < 1
+        team_list = [{
+          :color => "\x0312",
+          :name => "Blue"
+        },{
+           :color => "\x0304",
+           :name => "Red"
+        }]
+        players_per_team = (match_size / 2).floor.to_i
 
         debug "MATCH SIZE #{match_size.to_s}"
-        debug "LOWER BOUND: #{lb.to_s}"
-        debug "PLAYERS: #{self[:players].join(",")}"
+        debug "Players Per Team: #{players_per_team.to_s}"
+        debug "PLAYERS: #{self.players.keys.join(",")}"
 
-        self[:players].each do |player|
-          u = User(player.to_s)
-          if u
-            KAG::User::User.add_stat(u,:matches)
-          end
+        self.players.each do |authname,user|
+          KAG::User::User.add_stat(user,:matches)
         end
 
-        self[:teams] = []
-        self[:teams] << KAG::Gather::Team.new({
-          :players => self[:players].slice(0,lb),
-          :match => self,
-          :color => "\x0312",
-          :name => "Blue"
-        }).setup
-        self[:teams] << KAG::Gather::Team.new({
-          :players => self[:players].slice(lb,match_size),
-          :match => self,
-          :color => "\x0304",
-          :name => "Red"
-        }).setup
-        self[:teams]
+        self.teams = []
+        lb = 0
+        team_list.each do |ts|
+          eb = lb+players_per_team-1
+          eb = self.players.length if eb > self.players.length-1
+          debug "Spread: #{lb}..#{(eb)}"
+          ps = Hash[self.players.sort_by{|k,v| v.to_s }[lb..(eb)]]
+          lb = players_per_team
+
+          self.teams << KAG::Gather::Team.new({
+            :players => ps,
+            :match => self,
+            :color => ts[:color],
+            :name => ts[:name]
+          }).setup
+        end
+        self.teams
       end
 
       def start
@@ -60,7 +66,7 @@ module KAG
 
       def text_for_match_start
         msg = "MATCH: #{KAG::Gather::Match.type_as_string} - "
-        self[:teams].each do |team|
+        self.teams.each do |team|
           msg = msg+" "+team.text_for_match_start
         end
         msg+" \x0301(!end when done)"
@@ -68,11 +74,8 @@ module KAG
 
       def notify_teams_of_match_start
         messages = {}
-        self[:teams].each do |t|
-          ms = t.notify_of_match_start
-          ms.each do |nick,msg|
-            messages[nick] = msg
-          end
+        self.teams.each do |t|
+          messages.merge!(t.notify_of_match_start)
         end
         messages
       end
@@ -95,7 +98,7 @@ module KAG
 
       def has_player?(user)
         playing = false
-        self[:teams].each do |team|
+        self.teams.each do |team|
           playing = true if team.has_player?(user)
         end
         playing
@@ -104,7 +107,7 @@ module KAG
       def cease
         if self.server
           if self.server.has_rcon?
-            self[:teams].each do |team|
+            self.teams.each do |team|
               team.kick_all
             end
           else
@@ -148,19 +151,11 @@ module KAG
         placement = false
         if needs_sub?
           placement = self[:subs_needed].shift
-          KAG::User::User.add_stat(m.user,:substitutions)
+          KAG::User::User.add_stat(user,:substitutions)
         end
         placement
       end
 
-      def rename_player(user)
-        self[:teams].each do |team|
-          if team.has_player?(user)
-            team.rename_player(user)
-          end
-        end
-      end
-
       def debug(msg)
         if KAG::Config.instance[:debug]
           puts msg

data/lib/kag/gather/plugin.rb

@@ -4,6 +4,7 @@ require 'commands/help'
 require 'kag/bot/bot'
 require 'kag/bans/report'
 require 'kag/server'
+require 'kag/gather/queue'
 require 'kag/gather/match'
 
 module KAG
@@ -17,7 +18,7 @@ module KAG
 
       def initialize(*args)
         super
-        @queue = {}
+        @queue = KAG::Gather::Queue.new
         @matches = {}
         _load_servers
       end
@@ -45,8 +46,8 @@ module KAG
               if sub
                 m.channel.msg sub[:msg]
               end
-            elsif @queue.key?(nick)
-              remove_user_from_queue(nick)
+            elsif @queue.has_player?(user)
+              remove_user_from_queue(user)
             end
           else
             reply m,"User #{nick} not found"
@@ -56,16 +57,6 @@ module KAG
 
       listen_to :nick, :method => :on_nick
       def on_nick(m)
-
-        #unless is_banned?(m.user)
-        #  match = get_match_in(m.user)
-        #  if match
-        #    match.rename_player(m.user)
-        #  elsif @queue.key?(m.user.last_nick)
-        #    @queue[m.user.nick] = @queue[m.user.last_nick]
-        #    @queue.delete(m.user.last_nick)
-        #  end
-        #end
       end
 
       command :sub,{},
@@ -90,7 +81,7 @@ module KAG
       def add(m)
         unless is_banned?(m.user)
           KAG::User::User.add_stat(m.user,:adds)
-          add_user_to_queue(m,m.user.nick)
+          add_user_to_queue(m,m.user)
         end
       end
 
@@ -101,11 +92,11 @@ module KAG
           match = get_match_in(m.user)
           if match
             match.remove_player(m.user)
-            send_channels_msg "#{m.user.nick} has left the match at #{match.server[:key]}! You can sub in by typing !sub"
-          elsif @queue.key?(m.user.nick)
+            send_channels_msg "#{m.user.authname} has left the match at #{match.server[:key]}! You can sub in by typing !sub"
+          elsif @queue.has_player?(m.user)
             KAG::User::User.add_stat(m.user,:rems)
-            unless remove_user_from_queue(m.user.nick)
-              debug "#{m.user.nick} is not in the queue."
+            unless remove_user_from_queue(m.user)
+              debug "#{m.user.authname} is not in the queue."
             end
           end
         end
@@ -115,11 +106,7 @@ module KAG
         summary: "List the users signed up for the next match"
       def list(m)
         unless is_banned?(m.user)
-          users = []
-          @queue.each do |n,u|
-            users << n
-          end
-          m.user.send "Queue (#{KAG::Gather::Match.type_as_string}) [#{@queue.length}] #{users.join(", ")}"
+          m.user.send "Queue (#{KAG::Gather::Match.type_as_string}) [#{@queue.length}] #{@queue.list}"
         end
       end
 
@@ -152,27 +139,22 @@ module KAG
         end
       end
 
-      def add_user_to_queue(m,nick,send_msg = true)
-        if @queue.key?(nick)
-          reply m,"#{nick} is already in the queue!"
-        elsif get_match_in(nick)
-          reply m,"#{nick} is already in a match!"
+      def add_user_to_queue(m,user,send_msg = true)
+        if @queue.has_player?(user)
+          reply m,"#{user.authname} is already in the queue!"
+        elsif get_match_in(user)
+          reply m,"#{user.authname} is already in a match!"
         else
-          @queue[nick] = SymbolTable.new({
-              :user => User(nick),
-              :irc => m.channel,
-              :message => m.message,
-              :joined_at => Time.now
-          })
-          send_channels_msg "Added #{nick} to queue (#{KAG::Gather::Match.type_as_string}) [#{@queue.length}]" if send_msg
+          @queue.add(user)
+          send_channels_msg "Added #{user.authname} to queue (#{KAG::Gather::Match.type_as_string}) [#{@queue.length}]" if send_msg
           check_for_new_match
         end
       end
 
-      def remove_user_from_queue(nick,send_msg = true)
-        if @queue.key?(nick)
-          @queue.delete(nick)
-          send_channels_msg "Removed #{nick} from queue (#{KAG::Gather::Match.type_as_string}) [#{@queue.length}]" if send_msg
+      def remove_user_from_queue(user,send_msg = true)
+        if @queue.has_player?(user)
+          @queue.remove(user)
+          send_channels_msg "Removed #{user.authname} from queue (#{KAG::Gather::Match.type_as_string}) [#{@queue.length}]" if send_msg
           true
         else
           false
@@ -191,11 +173,6 @@ module KAG
 
       def check_for_new_match
         if @queue.length >= KAG::Config.instance[:match_size]
-          players = []
-          @queue.each do |n,i|
-            players << n
-          end
-
           server = get_unused_server
           unless server
             send_channels_msg "Could not find any available servers!"
@@ -203,8 +180,10 @@ module KAG
             return false
           end
 
+          players = @queue.players
+
           # reset queue first to prevent 11-player load
-          @queue = {}
+          @queue.reset
 
           match = KAG::Gather::Match.new(SymbolTable.new({
             :server => server,
@@ -214,8 +193,8 @@ module KAG
           match.start # prepare match data
           messages = match.notify_teams_of_match_start # gather texts for private messages
           send_channels_msg(match.text_for_match_start,false) # send channel-wide first
-          messages.each do |nick,msg|
-            User(nick.to_s).send(msg) unless nick.to_s.include?("player")
+          messages.each do |user,msg|
+            user.send(msg)
             sleep(2) # prevent excess flood stuff
           end
           @matches[server[:key]] = match
@@ -239,56 +218,69 @@ module KAG
       def clear(m)
         if is_admin(m.user)
           send_channels_msg "Match queue cleared."
-          @queue = {}
+          @queue.reset
         end
       end
 
-      command :rem,{nick: :string},
+      command :rem,{nicks: :string},
         summary: "Remove a specific user from the queue",
         method: :rem_admin,
         admin: true
-      def rem_admin(m, arg)
+      def rem_admin(m, nicks)
         if is_admin(m.user)
-          arg = arg.split(" ")
-          arg.each do |nick|
-            remove_user_from_queue(nick)
+          nicks = nicks.split(",")
+          nicks.each do |nick|
+            u = User(nick)
+            if u and !u.unknown
+              remove_user_from_queue(u)
+            end
           end
         end
       end
 
-      command :rem_silent,{nick: :string},
+      command :rem_silent,{nicks: :string},
         summary: "Remove a specific user from the queue without pinging the user in the channel",
         admin: true
-      def rem_silent(m, arg)
+      def rem_silent(m, nicks)
         if is_admin(m.user)
-          arg = arg.split(" ")
-          arg.each do |nick|
-            remove_user_from_queue(nick,false)
+          nicks = nicks.split(",")
+          nicks.each do |nick|
+            u = User(nick)
+            if u and !u.unknown
+              remove_user_from_queue(u,false)
+            end
           end
         end
       end
 
-      command :add,{nick: :string},
+      command :add,{nicks: :string},
         summary: "Add a specific user to the queue",
         method: :add_admin,
         admin: true
-      def add_admin(m, arg)
+      def add_admin(m, nicks)
         if is_admin(m.user)
-          arg = arg.split(" ")
-          arg.each do |nick|
-            add_user_to_queue(m,nick)
+          nicks = nicks.split(",")
+          nicks.each do |nick|
+            u = User(nick)
+            if u and !u.unknown
+              add_user_to_queue(m,u)
+            end
           end
         end
       end
 
-      command :add_silent,{nick: :string},
+      command :add_silent,{nicks: :string},
         summary: "Add a specific user to the queue without pinging the user in the channel",
         admin: true
-      def add_silent(m, arg)
+      def add_silent(m, nicks)
         if is_admin(m.user)
-          arg = arg.split(" ")
-          arg.each do |nick|
-            add_user_to_queue(m,nick,false)
+          nicks = nicks.split(",")
+          puts nicks.inspect
+          nicks.each do |nick|
+            u = User(nick)
+            if u and !u.unknown
+              add_user_to_queue(m,u,false)
+            end
           end
         end
       end
@@ -335,12 +327,12 @@ module KAG
         summary: "Next map a given server",
         method: :next_map_specify,
         admin: true
-      def next_map_specify(m,arg)
+      def next_map_specify(m,server)
         if is_admin(m.user)
-          if @servers[key]
-            @servers[key].next_map
+          if @servers[server]
+            @servers[server].next_map
           else
-            m.reply "No server found with key #{arg}"
+            m.reply "No server found with key #{server}"
           end
         end
       end

data/lib/kag/gather/queue.rb

@@ -0,0 +1,42 @@
+module KAG
+  module Gather
+    class Queue
+
+      attr_accessor :players
+
+      def initialize
+        self.players = {}
+      end
+
+      def add(user)
+        self.players[user.authname.to_sym] = user
+      end
+
+      def remove(user)
+        if has_player?(user)
+          self.players.delete(user.authname.to_sym)
+        end
+      end
+
+      def list
+        m = []
+        self.players.each do |authname,user|
+          m << user.authname
+        end
+        m.join(", ")
+      end
+
+      def has_player?(user)
+        self.players.has_key?(user.authname.to_sym)
+      end
+
+      def length
+        self.players.length
+      end
+
+      def reset
+        self.players = {}
+      end
+    end
+  end
+end

data/lib/kag/gather/team.rb

@@ -16,10 +16,10 @@ module KAG
       def setup_classes
         classes = KAG::Config.instance[:classes].clone
         classes.shuffle!
-        players = self[:players].clone
-        self[:players] = {}
-        players.each do |p|
-          self[:players][p.to_sym] = classes.shift
+
+        self.teammates = {}
+        self.players.each do |authname,user|
+          self.teammates[authname.to_sym] = classes.shift
         end
         self
       end
@@ -30,43 +30,37 @@ module KAG
         msg = msg + " \x0303Class: " if KAG::Config.instance[:pick_classes]
 
         messages = {}
-        self[:players].each do |nick,cls|
+        self.players.each do |authname,user|
           player_msg = msg.clone
           player_msg = player_msg+cls if KAG::Config.instance[:pick_classes] and cls and !cls.empty?
-          player_msg = player_msg+" #{self[:color]}#{self[:name]} with: #{self[:players].keys.join(", ")}"
-          messages[nick] = player_msg
+          player_msg = player_msg+" #{self[:color]}#{self[:name]} with: #{self.teammates.keys.join(", ")}"
+          messages[user] = player_msg
         end
+        puts messages.inspect
         messages
       end
 
       def text_for_match_start
-        "#{self[:color]}#{self[:players].keys.join(", ")} (#{self[:name]})"
+        "#{self[:color]}#{self.players.keys.join(", ")} (#{self[:name]})"
       end
 
       def has_player?(user)
-        self[:players].keys.include?(user.nick.to_sym)
-      end
-
-      def rename_player(user)
-        if self[:players].keys.include?(user.last_nick.to_sym)
-          cls = self[:players][user.last_nick.to_sym]
-          self[:players].delete(user.last_nick.to_sym)
-          self[:players][user.nick.to_sym] = cls
-        end
+        self.players.keys.include?(user.authname.to_sym)
       end
 
       def remove_player(user)
         if has_player?(user)
           sub = {}
-          sub[:cls] = self[:players][user.nick]
+          sub[:cls] = self.teammates[user.authname.to_sym]
           sub[:team] = self.clone
           sub[:msg] = "Sub needed at #{self.match.server[:ip]} for #{sub[:team][:name]}, #{sub[:cls]} Class! Type !sub to claim it!"
-          sub[:channel_msg] = "#{user.nick} is now subbing in for #{self[:name]} at #{self.match.server[:key]}. Subs still needed: #{self.match[:subs_needed].length}"
+          sub[:channel_msg] = "#{user.authname} is now subbing in for #{self[:name]} at #{self.match.server[:key]}. Subs still needed: #{self.match[:subs_needed].length}"
           sub[:private_msg] = "Please #{self.match.server.text_join} | #{sub[:cls]} on the #{self[:name]} Team"
-          self[:players].delete(user.nick)
+          self.players.delete(user.authname.to_sym)
+          self.teammates.delete(user.authname.to_sym)
 
           KAG::User::User.subtract_stat(user,:matches)
-          KAG::User::User.add_stat(m.user,:desertions)
+          KAG::User::User.add_stat(user,:desertions)
 
           if self.match and self.match.server
             self.match.server.kick(user.nick)
@@ -79,8 +73,8 @@ module KAG
       end
 
       def kick_all
-        self[:players].each do |nick,cls|
-          self.match.server.kick(nick.to_s)
+        self.players.each do |authname,user|
+          self.match.server.kick(user.nick.to_s)
         end
       end
     end

data/lib/kag/version.rb

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

data/lib/patches.rb

@@ -1,3 +1,5 @@
+require 'cinch'
+
 class Hash
   @keys_not_used = nil
   def random_key
@@ -13,4 +15,16 @@ class Hash
   def shuffle!
     self.replace(self.shuffle)
   end
+end
+
+module Cinch
+  class User < Target
+    def to_s
+      self.data[:authname]
+    end
+
+    def to_i
+      self.to_s.to_i
+    end
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kag-gather
 version: !ruby/object:Gem::Version
-  version: 1.4.3
-  prerelease: 
+  version: 1.4.5
 platform: ruby
 authors:
 - Shaun McCormick
@@ -14,7 +13,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: symboltable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: kagerator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -144,6 +129,7 @@ files:
 - lib/kag/data.rb
 - lib/kag/gather/match.rb
 - lib/kag/gather/plugin.rb
+- lib/kag/gather/queue.rb
 - lib/kag/gather/team.rb
 - lib/kag/irc/plugin.rb
 - lib/kag/server.rb
@@ -155,26 +141,25 @@ files:
 homepage: https://github.com/splittingred/kag-gather
 licenses:
 - GPLv2
+metadata: {}
 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
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: KAG Gather IRC Bot
 test_files: []