qwtf_discord_bot 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62157a5a72751b294e2ee10e08455e2ae86b617f4f04ab4654c4e85a0bc57391
-  data.tar.gz: 815994275f732832081c1d9ed36f75ca1063eda17d16875d6823756f306aecca
+  metadata.gz: c4e173913a0bd952c25925e850c3d6e812edde02814a683cb6babf197fa6bece
+  data.tar.gz: c1611d47c886f95106bc46bd08e22ca7ee891c4821276731d2053e98d3bac459
 SHA512:
-  metadata.gz: 933a0d807334cceafa97c3f9f48e00554483c04057c042c4fd74b7e2a676778340e8349ff2959a0a3a5641adf9329ccea0aa382e22737b31a119a71ce2a9c55c
-  data.tar.gz: 9f6a616d96d8e5173e2f896ec0de689315ac468e08a8c82a5fc85b202ed619325aa267b3b5212a6bde48b1a357004014e2ad0a798c8e407ef5eac92da15f9039
+  metadata.gz: c9429a92ac668b36035086e2fd6692a9777a1b4c14b458400ba2ddb32becb06714202f7e656516235267e529071bd7bb686f609ed8cb3e1b7038466a4df1e50d
+  data.tar.gz: 719c94d1fefa5a56e4d31b00a2b5ee41964844dd81cde1255e25b9d2bb445172a73b34b43478448806679c313c4548f0b2f8c68cf68b6ccd762d7e9c40575847

data/.gitignore

@@ -10,6 +10,6 @@
 # rspec failure tracking
 .rspec_status
 assets/
-.env
+.env*
 qstat
 *.gem

data/Gemfile

@@ -5,3 +5,5 @@ gemspec
 gem 'bundler'
 gem 'discordrb'
 gem 'thor'
+gem 'rspec'
+gem 'pry'

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (0.4.0)
+    qwtf_discord_bot (0.4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.2)
+    diff-lcs (1.3)
     discordrb (3.2.1)
       discordrb-webhooks (~> 3.2.0.1)
       opus-ruby
@@ -20,18 +22,35 @@ GEM
     ffi (1.9.25)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
+    method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     netrc (0.11.0)
     opus-ruby (1.0.1)
       ffi
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rbnacl (3.4.0)
       ffi
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     thor (0.20.0)
     unf (0.1.4)
       unf_ext
@@ -47,7 +66,9 @@ PLATFORMS
 DEPENDENCIES
   bundler
   discordrb
+  pry
   qwtf_discord_bot!
+  rspec
   thor
 
 BUNDLED WITH

data/lib/player.rb

@@ -19,12 +19,16 @@ class Player
     @data['name']
   end
 
+  def score
+    @data['score']
+  end
+
   def to_row
     "#{emoji}#{name}"
   end
 
   def team
-    @team ||= Team.new(@data['team'].to_sym)
+    @data['team']
   end
 
   def player_class

data/lib/qstat_request.rb

@@ -1,38 +1,84 @@
-class QstatRequest
-  def initialize(endpoint)
-    @result = JSON.parse(%x[qstat -json -P -qws #{endpoint}]).first
-  end
-
-  def output
-    <<~HEREDOC
-      **#{address} | #{map} | #{numplayers}/#{maxplayers}**
-      #{player_table}
-    HEREDOC
-  end
-
-  def address
-    @result["address"]
-  end
-
-  def map
-    @result["map"]
-  end
-
-  def numplayers
-    @result["numplayers"]
-  end
-
-  def maxplayers
-    @result["maxplayers"]
-  end
-
-  def player_table
-    players && players.sort_by { |player| player.team.number }.map(&:to_row).join("\n")
-  end
-
-  def players
-    @result["players"] && @result["players"].map do |player_data|
-      Player.new(player_data)
-    end
-  end
-end
+class QstatRequest
+  def initialize(endpoint)
+    @endpoint = endpoint
+    @data = fetch_data
+  end
+
+  def teams
+    @teams ||= begin
+                 roster = {}
+                 teams = players.map(&:team).uniq
+                 teams.each { |team| roster[team] = [] }
+
+                 players.each do |player|
+                   roster[player.team] << player
+                 end
+                 roster
+               end
+  end
+
+  def output
+    return server_summary unless has_players?
+    [server_summary, player_table].join("\n")
+  end
+
+  def to_embed
+    embed = Discordrb::Webhooks::Embed.new
+    teams.each do |team, players|
+      player_list = players.map(&:to_row).join('\n')
+      score = players.first.score
+      field_name = "#{team} #{score}"
+      embed.add_field(Discordrb::Webhooks::EmbedField.new(inline: true, name: field_name, value: player_list))
+    end
+
+    embed
+  end
+
+  def server_summary
+    "#{@endpoint} | #{game_map} | #{numplayers}/#{maxplayers}"
+  end
+
+  def has_players?
+    @data["players"] || false
+  end
+
+  def player_names
+    players.map(&:name)
+  end
+
+  private
+
+    def fetch_data
+      JSON.parse(%x[qstat -json -P -qws #{@endpoint}]).first
+    end
+
+    def player_table
+      players.sort_by { |player| player.team.number }.map(&:to_row).join("\n")
+    end
+
+    def address
+      @data["address"]
+    end
+
+    def game_map
+      @data["map"]
+    end
+
+    def numplayers
+      @data["numplayers"]
+    end
+
+    def maxplayers
+      @data["maxplayers"]
+    end
+
+    def players
+      @data["players"].map do |player_data|
+        Player.new(player_data)
+      end
+    end
+
+    def players_from_team(team)
+      players.select { |player| player.team_name == team }.map(&:player_name)
+    end
+end

data/lib/qwtf_discord_bot.rb

@@ -1,4 +1,8 @@
+require 'pry'
+
 require 'qwtf_discord_bot/version'
+require 'qwtf_discord_bot/qwtf_discord_bot_server'
+require 'qwtf_discord_bot/qwtf_discord_bot_watcher'
 require 'discordrb'
 
 require 'qstat_request'
@@ -17,78 +21,9 @@ class QwtfDiscordBot
   end
 
   def endpoint
-    return @hostname if @port == 27500
-    [@hostname, @port].join(':')
-  end
-end
-
-class QwtfDiscordBotServer < QwtfDiscordBot
-  def run
-    bot = Discordrb::Commands::CommandBot.new(
-      token: TOKEN,
-      client_id: CLIENT_ID,
-      prefix: '!'
-    )
-
-    bot.command :server do |_event|
-      QstatRequest.new(endpoint).output
-    end
-
-    bot.run
-  end
-end
-
-class QwtfDiscordBotWatcher < QwtfDiscordBot
-  THIRTY_SECONDS = 30
-  TEN_MINUTES = 10 * 60
-
-  def run
-    every(THIRTY_SECONDS) do
-      request = QstatRequest.new(endpoint)
-      numplayers = request.numplayers
-      maxplayers = request.maxplayers
-      map = request.map
-
-      if request.players
-        player_names = request.players.map(&:name)
-
-        player_names.each do |name|
-          unless seen_recently?(name)
-            report_joined(name: name,
-                          map: map,
-                          numplayers: numplayers,
-                          maxplayers: maxplayers)
-          end
-
-          history[name] = Time.now
-        end
-      end
-    end
-  end
-
-  def every(n_seconds)
-    loop do
-      before = Time.now
-      yield
-      interval = n_seconds - (Time.now - before)
-      sleep(interval) if interval > 0
-    end
-  end
-
-  def seen_recently?(name)
-    last_seen = history[name]
-    last_seen && (Time.now - last_seen < TEN_MINUTES)
-  end
-
-  def report_joined(name:, map:, numplayers:, maxplayers:)
-    Discordrb::API::Channel.create_message(
-      "Bot #{TOKEN}",
-      CHANNEL_ID,
-      "**#{name}** has joined **#{endpoint} | #{map} | #{numplayers}/#{maxplayers}**"
-    )
-  end
-
-  def history
-    @history ||= {}
+    @endpoint ||= begin
+                    return @hostname if @port == 27500
+                    [@hostname, @port].join(':')
+                  end
   end
 end

data/lib/qwtf_discord_bot/qwtf_discord_bot_server.rb

@@ -0,0 +1,19 @@
+class QwtfDiscordBotServer < QwtfDiscordBot
+  def run
+    bot = Discordrb::Commands::CommandBot.new(
+      token: TOKEN,
+      client_id: CLIENT_ID,
+      prefix: '!'
+    )
+
+    bot.command :server do |event|
+      qstat_request = QstatRequest.new(endpoint)
+      message = qstat_request.server_summary
+      embed = qstat_request.to_embed
+
+      event.channel.send_embed(message, embed)
+    end
+
+    bot.run
+  end
+end

data/lib/qwtf_discord_bot/qwtf_discord_bot_watcher.rb

@@ -0,0 +1,46 @@
+class QwtfDiscordBotWatcher < QwtfDiscordBot
+  THIRTY_SECONDS = 30
+  TEN_MINUTES = 10 * 60
+
+  def run
+    every(THIRTY_SECONDS) do
+      request = QstatRequest.new(endpoint)
+
+      if request.player_names
+        request.player_names.each do |name|
+          unless seen_recently?(name)
+            report_joined(name: name, server_summary: request.server_summary)
+          end
+
+          history[name] = Time.now
+        end
+      end
+    end
+  end
+
+  def every(n_seconds)
+    loop do
+      before = Time.now
+      yield
+      interval = n_seconds - (Time.now - before)
+      sleep(interval) if interval > 0
+    end
+  end
+
+  def seen_recently?(name)
+    last_seen = history[name]
+    last_seen && (Time.now - last_seen < TEN_MINUTES)
+  end
+
+  def report_joined(name:, server_summary:)
+    Discordrb::API::Channel.create_message(
+      "Bot #{TOKEN}",
+      CHANNEL_ID,
+      "#{name} has joined #{server_summary}"
+    )
+  end
+
+  def history
+    @history ||= {}
+  end
+end

data/lib/qwtf_discord_bot/version.rb

@@ -1,3 +1,3 @@
 class QwtfDiscordBot
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-11 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies: []
 description: A Discord bot for reporting on QuakeWorld Team Fortress game servers
 email:
@@ -52,6 +52,8 @@ files:
 - lib/player.rb
 - lib/qstat_request.rb
 - lib/qwtf_discord_bot.rb
+- lib/qwtf_discord_bot/qwtf_discord_bot_server.rb
+- lib/qwtf_discord_bot/qwtf_discord_bot_watcher.rb
 - lib/qwtf_discord_bot/version.rb
 - lib/team.rb
 - qwtf_discord_bot.gemspec