qwtf_discord_bot 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 450ebc5efc6d206adea7b7a83ab80289d97f8203354d4b111e4f6a14d7733f0f
-  data.tar.gz: f9e87f001470d11febd7659b94fcd7495cbbeb65a732a601d3e64e67e82eec71
+  metadata.gz: 1ebda1cd0b14e12fbf359e452f7f7874c97be6c8014d68a43d482ca4b347767b
+  data.tar.gz: f1e04bcd5653703d38d455f5d919902e70334d07c04542c2377ea9d06fe542ce
 SHA512:
-  metadata.gz: '049cb1d8ede2cfb8c5f4c1a60fd6c1c92ed3030ba7d19b3db3f2111245f3ac46f3eee44d81812d102001be7d160c6478f2671c3eb5190b3157ccd827f7c3c3c4'
-  data.tar.gz: a7b57a2843ade62a37be4cf9da723a99a5b08a72e141f8b6984348d49ae062bf1c5fcbb2fdc125ab0a8c8a0fec4408dc75353b27dc89fc1a37300bd31ca15795
+  metadata.gz: 95b5c0f1cbe59d2c8f5827d35c16271a8c2ab6f0ea545e7b580d8654df59a05ccea0c23a049b394015044ec93a24d375d3ff60ba0d2a776ccd721db122f354ac
+  data.tar.gz: c058065bb6e627164fdb7ddd3885e3d9a9301978d7ce578e9fe9084eb6732e424a85d4d8e6c7150518e1d554517f3171a8a43b900bc78bc3f9ecda761ba3b9ee

data/.gitignore

@@ -13,3 +13,4 @@ assets/
 .env*
 qstat
 *.gem
+*.swp

data/Gemfile

@@ -12,4 +12,5 @@ end
 
 group :test do
   gem 'rspec'
+  gem 'factory_bot'
 end

data/Gemfile.lock

@@ -1,12 +1,18 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (1.0.3)
+    qwtf_discord_bot (1.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     coderay (1.1.2)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     discordrb (3.2.1)
       discordrb-webhooks (~> 3.2.0.1)
@@ -19,13 +25,18 @@ GEM
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     event_emitter (0.2.6)
+    factory_bot (4.11.0)
+      activesupport (>= 3.0.0)
     ffi (1.9.25)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
+    i18n (1.1.0)
+      concurrent-ruby (~> 1.0)
     method_source (0.9.0)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
+    minitest (5.11.3)
     netrc (0.11.0)
     opus-ruby (1.0.1)
       ffi
@@ -52,6 +63,9 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
@@ -66,6 +80,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   discordrb
+  factory_bot
   pry
   qwtf_discord_bot!
   rspec

data/bin/bundle

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+    module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1 || ">= 0.a"
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../../Gemfile", __FILE__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_version
+    @bundler_version ||= begin
+      env_var_version || cli_arg_version ||
+        lockfile_version || "#{Gem::Requirement.default}.a"
+    end
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    # must dup string for RG < 1.8 compatibility
+    activate_bundler(bundler_version.dup)
+  end
+
+  def activate_bundler(bundler_version)
+    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
+      bundler_version = "< 2"
+    end
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_version
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end

data/bin/coderay

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'coderay' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("coderay", "coderay")

data/bin/htmldiff

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("diff-lcs", "htmldiff")

data/bin/ldiff

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("diff-lcs", "ldiff")

data/bin/pry

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'pry' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("pry", "pry")

data/bin/qwtf_discord_bot

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'qwtf_discord_bot' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("qwtf_discord_bot", "qwtf_discord_bot")

data/bin/restclient

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'restclient' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rest-client", "restclient")

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/bin/thor

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("thor", "thor")

data/lib/qstat_request.rb

@@ -1,16 +1,12 @@
 class QstatRequest
+  attr_accessor :result
+
   def initialize(endpoint)
     @endpoint = endpoint
-    @data = fetch_data
   end
 
-  def teams
-    @teams ||= build_roster
-  end
-
-  def to_message
-    return server_summary if is_empty?
-    [server_summary, player_table].join("\n")
+  def result
+    @result ||= execute
   end
 
   def to_embed
@@ -18,13 +14,18 @@ class QstatRequest
 
     embed = Discordrb::Webhooks::Embed.new
 
-    teams.each do |_name, team|
+    teams.each do |team|
       embed.add_field(team.to_embed_field)
     end
 
     embed
   end
 
+  def to_message
+    return server_summary if is_empty?
+    [server_summary, player_table].join("\n")
+  end
+
   def server_summary
     return "#{@endpoint} isn't responding" unless game_map
     return "#{@endpoint} | #{game_map} | #{numplayers}/#{maxplayers}" unless has_spectators?
@@ -35,22 +36,30 @@ class QstatRequest
     !has_players? && !has_spectators?
   end
 
-  def has_spectators?
-    numspectators && numspectators > 0
-  end
-
-  def has_players?
-    numplayers && numplayers > 0
-  end
-
   def player_names
     players.map(&:name)
   end
 
   private
 
-    def fetch_data
-      JSON.parse(%x[qstat -json -P -qws #{@endpoint}]).first
+    def has_spectators?
+      numspectators && numspectators > 0
+    end
+
+    def has_players?
+      numplayers && numplayers > 0
+    end
+
+    def teams
+      @teams ||= build_roster
+    end
+
+    def data
+      @data ||= JSON.parse(result).first
+    end
+
+    def execute
+      %x[qstat -json -P -qws #{@endpoint}]
     end
 
     def player_table
@@ -58,51 +67,45 @@ class QstatRequest
     end
 
     def address
-      @data["address"]
+      data["address"]
     end
 
     def game_map
-      @data["map"]
+      data["map"]
     end
 
     def numplayers
-      @data["numplayers"]
+      data["numplayers"]
     end
 
     def maxplayers
-      @data["maxplayers"]
+      data["maxplayers"]
     end
 
     def numspectators
-      @data["numspectators"]
+      data["numspectators"]
     end
 
     def maxspectators
-      @data["maxspectators"]
+      data["maxspectators"]
     end
 
     def build_roster
       return nil if is_empty?
 
-      roster = {}
+      roster = Roster.new
 
-      @data["players"].map do |player_data|
+      data["players"].map do |player_data|
         player = Player.new(player_data)
-        team_name = player.team
-        roster[team_name] ||= Team.new(team_name)
-        roster[team_name].enlist(player)
+        roster.enroll(player)
       end
 
-      roster
+      roster.teams.sort_by { |team| team.number }
     end
 
     def players
-      @data["players"].map do |player_data|
+      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/qwtf_discord_bot_watcher.rb

@@ -6,7 +6,7 @@ class QwtfDiscordBotWatcher < QwtfDiscordBot
     every(THIRTY_SECONDS) do
       request = QstatRequest.new(endpoint)
 
-      if request.has_players?
+      unless request.is_empty?
         request.player_names.each do |name|
           unless seen_recently?(name)
             report_joined(name: name, server_summary: request.server_summary)

data/lib/qwtf_discord_bot/version.rb

@@ -1,3 +1,3 @@
 class QwtfDiscordBot
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.0.4'.freeze
 end

data/lib/qwtf_discord_bot.rb

@@ -7,6 +7,7 @@ require 'qstat_request'
 require 'player'
 require 'team'
 require 'emoji'
+require 'roster'
 
 class QwtfDiscordBot
   TOKEN = ENV['QWTF_DISCORD_BOT_TOKEN'].strip

data/lib/roster.rb

@@ -0,0 +1,19 @@
+class Roster
+  attr_reader :teams
+
+  def initialize
+    @teams = []
+  end
+
+  def enroll(player)
+    team_name = player.team
+    team = @teams.find { |team| team.name == team_name }
+
+    unless team
+      team = Team.new(team_name)
+      @teams << team
+    end
+
+    team.enlist(player)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-08-26 00:00:00.000000000 Z
 dependencies: []
 description: A Discord bot for reporting on QuakeWorld Team Fortress game servers
 email:
@@ -27,8 +27,17 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/bundle
+- bin/coderay
 - bin/console
+- bin/htmldiff
+- bin/ldiff
+- bin/pry
+- bin/qwtf_discord_bot
+- bin/restclient
+- bin/rspec
 - bin/setup
+- bin/thor
 - emoji/blue_demoman.png
 - emoji/blue_engineer.png
 - emoji/blue_hwguy.png
@@ -55,6 +64,7 @@ files:
 - 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/roster.rb
 - lib/team.rb
 - qwtf_discord_bot.gemspec
 - server_screenshot.png