From 6e14348d16cf2d7cd3a981f2483006eddf605d1a Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Sun, 26 Apr 2015 11:34:37 +0100
Subject: [PATCH 01/76] Ignore gemsets and directory env variables

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index d4d3e2e..e76151e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /tmp/*
 /spec/tmp/*
 .ruby-version
+.ruby-gemset
 .env
 .tmp*
 .rspec
@@ -40,3 +41,6 @@
 /index/*
 rerun.txt
 pickle-email-*.html
+
+# Direnv
+.envrc
\ No newline at end of file

From 4b30970dde58dae3a1e489c95cf0398baadb9bfe Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Sun, 26 Apr 2015 11:35:02 +0100
Subject: [PATCH 02/76] Update poltergeist (current version uses out of date
 phantomjs)

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index f22590d..b161b85 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,7 @@ group :test do
   gem 'database_cleaner', '~> 1.2.0'
   gem 'rspec-rails', '~> 2.14.1'
   gem 'capybara', '~> 2.2.1'
-  gem 'poltergeist', '~> 1.5.0'
+  gem 'poltergeist', '~> 1.6.0'
   gem 'selenium-webdriver', '~> 2.41.0'
   gem 'factory_girl_rails', '~> 4.4.1'
   gem 'timecop', '~> 0.7.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 70af6dc..a090d97 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -149,7 +149,7 @@ GEM
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     oj (2.5.5)
-    poltergeist (1.5.0)
+    poltergeist (1.6.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -249,7 +249,9 @@ GEM
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     websocket (1.0.7)
-    websocket-driver (0.3.3)
+    websocket-driver (0.5.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     will_paginate (3.0.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -290,7 +292,7 @@ DEPENDENCIES
   newrelic_rpm (~> 3.7.2.195)
   nokogiri (~> 1.6.1)
   oj (~> 2.5.5)
-  poltergeist (~> 1.5.0)
+  poltergeist (~> 1.6.0)
   pry-byebug (~> 1.3.2)
   puma (~> 2.11.1)
   quiet_assets (~> 1.0.2)

From 699b5c612f3c4a7c524ba9d3b5e5677f5233ce68 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Sun, 26 Apr 2015 11:36:18 +0100
Subject: [PATCH 03/76] Cleanup

---
 app/assets/javascripts/local.js | 71 ---------------------------------
 1 file changed, 71 deletions(-)

diff --git a/app/assets/javascripts/local.js b/app/assets/javascripts/local.js
index 40ba551..d15009a 100644
--- a/app/assets/javascripts/local.js
+++ b/app/assets/javascripts/local.js
@@ -1,75 +1,4 @@
 $(document).ready(function(){
-  //
-  //function showNews(source, cat, content){
-  //    new Ajax.Updater(content, '/categories/' + cat, {
-  //        method: 'get'
-  //    });
-  //    var thisChild = source.parentNode.firstChild;
-  //    while (thisChild != source.parentNode.lastChild) {
-  //        if (thisChild.nodeType == 1 && thisChild.getAttribute("class") != "unread") {
-  //            thisChild.setAttribute("class", "");
-  //        }
-  //        thisChild = thisChild.nextSibling;
-  //    }
-  //    source.setAttribute("class", "active");
-  //}
-
-  //function goToTheEnd(){
-  //    var ed = tinyMCE.activeEditor;
-  //    // This gets the root node of the editor window
-  //    var root = ed.dom.getRoot();
-  //    // And this gets the last node inside of it, so the last <p>...</p> tag
-  //    var lastnode = root.childNodes[root.childNodes.length - 1];
-  //
-  //    if (tinymce.isGecko) {
-  //        // But firefox places the selection outside of that tag, so we need to go one level deeper:
-  //        lastnode = lastnode.childNodes[lastnode.childNodes.length - 1];
-  //    }
-  //    // Now, we select the node
-  //    ed.selection.select(lastnode);
-  //    // And collapse the selection to the end to put the caret there:
-  //    ed.selection.collapse(false);
-  //}
-  //
-  //var myrules = {
-  //    '.remove': function(e){
-  //        el = Event.findElement(e);
-  //        target = el.href.replace(/.*#/, '.')
-  //        el.up(target).hide();
-  //        if (hidden_input = el.previous("input[type=hidden]")) {
-  //            hidden_input.value = '1'
-  //        }
-  //    }
-  //};
-  //
-  //Event.observe(window, 'load', function(){
-  //    $('container').delegate('click', myrules);
-  //});
-  //
-  //function changeCssClass(id, newclass){
-  //    var obj = document.getElementById(id)
-  //    obj.setAttribute("class", newclass);
-  //    obj.setAttribute("className", newclass);
-  //    obj.className = newclass;
-  //};
-  //
-  //function changeTab(container, tab){
-  //    $(tab).style.visibility = 'hidden';
-  //};
-  //
-  //function Trash(source){
-  //	var input = document.createElement("input");
-  //  input.name = "deleted[reason]";
-  //  input.type = "hidden";
-  //  input.value = prompt('Enter reason', 'Violation of rule #');
-  //	if (input.value == null) {
-  //  	return
-  //  }
-  //  source.appendChild(input);
-  //	source.submit();
-  //}
-
-
   // User popup
   var userInfoTimeout;
 

From f87fc9ae58ba0df12e66d47a94c52eaa6fac7264 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Mon, 27 Apr 2015 23:32:27 +0100
Subject: [PATCH 04/76] Added some simple integration tests for shout messages

---
 spec/features/shoutbox/shoutbox_spec.rb | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 spec/features/shoutbox/shoutbox_spec.rb

diff --git a/spec/features/shoutbox/shoutbox_spec.rb b/spec/features/shoutbox/shoutbox_spec.rb
new file mode 100644
index 0000000..30d75ac
--- /dev/null
+++ b/spec/features/shoutbox/shoutbox_spec.rb
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+feature 'Shoutbox' do
+	background do
+		@user = create :user
+		sign_in_as @user
+		visit root_path
+	end
+
+	feature 'user creates a shout', js: true do
+		scenario 'shouting with valid content' do
+			shout = rand(100000).to_s
+			fill_in 'shoutbox_text', with: shout
+			click_button 'Shout!'
+			expect(page).to have_content(shout)
+		end
+
+		scenario 'unable to while banned' do
+			@user.bans.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days
+			shout = rand(100000).to_s
+			fill_in 'shoutbox_text', with: shout
+			click_button 'Shout!'
+			expect(page).to_not have_content(shout)
+		end
+	end	
+end
\ No newline at end of file

From d268eedc608f9b8db9fa5d7d1720def1396e647b Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Mon, 27 Apr 2015 23:36:27 +0100
Subject: [PATCH 05/76] Move shoutmsg polling invocation to instances where
 shoutbox is available

---
 app/assets/javascripts/local.js      |  8 --------
 app/views/widgets/_shoutbox.html.erb | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/local.js b/app/assets/javascripts/local.js
index d15009a..d21797c 100644
--- a/app/assets/javascripts/local.js
+++ b/app/assets/javascripts/local.js
@@ -24,14 +24,6 @@ $(document).ready(function(){
   function HideUserPopupRunner(){
     document.getElementById("userPopup").style.visibility = "Hidden";
   }
-
-  // Shoutbox
-  $.PeriodicalUpdater("/shoutmsgs/index.js", {
-    method: "GET",
-    type: "script",
-    minTimeout: 10000,
-    multiplier: 2
-  });
 });
 
 $(function() {
diff --git a/app/views/widgets/_shoutbox.html.erb b/app/views/widgets/_shoutbox.html.erb
index 606b88e..0bf5238 100644
--- a/app/views/widgets/_shoutbox.html.erb
+++ b/app/views/widgets/_shoutbox.html.erb
@@ -8,4 +8,15 @@
   <%= render partial: "shoutmsgs/new", locals: { shoutmsg: Shoutmsg.new } %>
   <%= link_to "Shoutbox Recent History", controller: :shoutmsgs, action: "index" %><br/>
   <%= link_to "Shoutbox Rules", article_path(Article::SB_RULES) %>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+	$(document).ready(function () {
+		$.PeriodicalUpdater("/shoutmsgs/index.js", {
+		  method: "GET",
+		  type: "script",
+		  minTimeout: 10000,
+		  multiplier: 2
+		});
+	});
+</script>
\ No newline at end of file

From da6024f162ff2240d6038303b710f74c1cac885a Mon Sep 17 00:00:00 2001
From: simplefl <phoenixfl@gmx.de>
Date: Mon, 27 Apr 2015 20:34:39 +0200
Subject: [PATCH 06/76] Display channel password on gather page.

---
 app/views/gathers/show.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb
index 8fad528..1d5d62e 100644
--- a/app/views/gathers/show.html.erb
+++ b/app/views/gathers/show.html.erb
@@ -150,6 +150,7 @@
         <ul>
           <li><%= link_to "Teamspeak 3", "http://www.teamspeak.com/?page=downloads" %></li>
           <li><strong>Server:</strong> <a href="ts3server://ensl.org">ensl.org</a></li>
+          <li><strong>Channel password:</strong> ns2gather </li>
         </ul>
       </div>
 

From b6d932310fb82e39496b0f572a7ece226a471ee7 Mon Sep 17 00:00:00 2001
From: simplefl <phoenixfl@gmx.de>
Date: Tue, 28 Apr 2015 17:51:22 +0200
Subject: [PATCH 07/76] Pump rmagick to 2.13.4.

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index b161b85..ae4dda3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem 'will_paginate', '~> 3.0.5'
 gem 'dynamic_form', '~> 1.1.4'
 gem 'country_code_select', '~> 1.0.1'
 gem 'active_link_to', '~> 1.0.2'
-gem 'rmagick', '~> 2.13.2', require: false
+gem 'rmagick', '~> 2.13.4', require: false
 gem 'steam-condenser', github: 'koraktor/steam-condenser-ruby'
 
 # Please install nodejs locally.

From 932652a7268d7296ceaaec414d092479b7cef2b7 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Sat, 2 May 2015 18:07:10 +0100
Subject: [PATCH 08/76] Fix error page for when the 404 is user not found

---
 app/views/layouts/errors.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/errors.html.erb b/app/views/layouts/errors.html.erb
index b647100..d20070d 100644
--- a/app/views/layouts/errors.html.erb
+++ b/app/views/layouts/errors.html.erb
@@ -6,13 +6,13 @@
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <%= favicon_link_tag 'shared/favicon.ico' %>
-    <%= stylesheet_link_tag "themes/#{active_theme}/errors" %>
+    <%= stylesheet_link_tag "themes/default/errors" %>
   </head>
   <body>
     <div id="error">
       <div class="message">
         <div id="logo">
-          <%= link_to image_tag("themes/#{active_theme}/logo.png"), root_path %>
+          <%= link_to image_tag("themes/default/logo.png"), root_path %>
         </div>
         <div id="code">
           <h1><%= params[:code] %></h1>

From dc88b78739241612ce77d3367bb5f81ebdb5ca0e Mon Sep 17 00:00:00 2001
From: Luke Barratt <luke@barratt.me>
Date: Sat, 2 May 2015 23:46:16 +0100
Subject: [PATCH 09/76] Addec colour and documentaton style formatting to RSpec
 output to improve readability

---
 spec/spec_helper.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e31306e..f2956e2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -31,6 +31,8 @@ RSpec.configure do |config|
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
   config.order = 'random'
   config.use_transactional_fixtures = false
+  config.color = true
+  config.formatter = :documentation
 
   config.before(:each) do
     events_list_json = JSON.parse(File.read(Rails.root.join('spec/fixtures/google_calendar.json')))

From 0485cbaf8af267769d782d351bbc3acd201ebc4a Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Tue, 5 May 2015 20:35:54 +0100
Subject: [PATCH 10/76] render_shoutmsgs never invoked

---
 app/controllers/shoutmsgs_controller.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/controllers/shoutmsgs_controller.rb b/app/controllers/shoutmsgs_controller.rb
index 06a1e93..041116c 100644
--- a/app/controllers/shoutmsgs_controller.rb
+++ b/app/controllers/shoutmsgs_controller.rb
@@ -29,11 +29,4 @@ class ShoutmsgsController < ApplicationController
     @shoutmsg.destroy
     redirect_to_back
   end
-
-
-  private
-
-  def render_shoutmsgs shoutable_type = nil, shoutable_id = nil
-
-  end
 end

From b9ecfb229220b13e200f31e4049f4a0b5194af56 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Tue, 5 May 2015 22:43:54 +0100
Subject: [PATCH 11/76] Added test to find out how banning works

---
 spec/models/user_spec.rb | 44 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 spec/models/user_spec.rb

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
new file mode 100644
index 0000000..24ba3a2
--- /dev/null
+++ b/spec/models/user_spec.rb
@@ -0,0 +1,44 @@
+# == Schema Information
+#
+# Table name: users
+#
+#  id           :integer          not null, primary key
+#  username     :string(255)
+#  password     :string(255)
+#  firstname    :string(255)
+#  lastname     :string(255)
+#  email        :string(255)
+#  steamid      :string(255)
+#  team_id      :integer
+#  lastvisit    :datetime
+#  created_at   :datetime
+#  updated_at   :datetime
+#  lastip       :string(255)
+#  country      :string(255)
+#  birthdate    :date
+#  time_zone    :string(255)
+#  version      :integer
+#  public_email :boolean          default(FALSE), not null
+#
+
+require 'spec_helper'
+
+describe User do
+	let!(:user) { create :user }
+	
+	describe "#banned?" do
+		it "returns false if user is not banned" do
+			expect(user.banned?).to be_false
+		end
+
+		it "returns true if user is banned" do
+			ban = Ban.create! ban_type: Ban::TYPE_SITE, expiry: Time.now + 10.days, user_name: user.username
+			expect(user.banned?).to be_true
+		end
+
+		it "returns true for specific bans" do
+			ban = Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username
+			expect(user.banned? Ban::TYPE_MUTE).to be_true
+		end
+	end
+end
\ No newline at end of file

From 79933f6251389cb839fb54bd6aeb2dcd14e948c6 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Tue, 5 May 2015 22:51:10 +0100
Subject: [PATCH 12/76] Bundle installed

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a090d97..0701597 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -193,7 +193,7 @@ GEM
     rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    rmagick (2.13.2)
+    rmagick (2.13.4)
     rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
@@ -298,7 +298,7 @@ DEPENDENCIES
   quiet_assets (~> 1.0.2)
   rails (~> 3.2.19)
   rails_autolink (~> 1.1.5)
-  rmagick (~> 2.13.2)
+  rmagick (~> 2.13.4)
   rspec-rails (~> 2.14.1)
   sanitize (~> 2.1.0)
   sass (~> 3.3.4)

From e69c4c9b61ff56b36c680bcaa3302355427844e3 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Tue, 5 May 2015 22:51:26 +0100
Subject: [PATCH 13/76] Updated test for expected ban behaviour

---
 spec/features/shoutbox/shoutbox_spec.rb | 35 +++++++++++--------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/spec/features/shoutbox/shoutbox_spec.rb b/spec/features/shoutbox/shoutbox_spec.rb
index 30d75ac..dec6542 100644
--- a/spec/features/shoutbox/shoutbox_spec.rb
+++ b/spec/features/shoutbox/shoutbox_spec.rb
@@ -1,26 +1,23 @@
 require 'spec_helper'
 
-feature 'Shoutbox' do
+feature 'Shoutbox', js: true do
+	let!(:user) { create :user }
+
 	background do
-		@user = create :user
-		sign_in_as @user
-		visit root_path
+		sign_in_as user
 	end
 
-	feature 'user creates a shout', js: true do
-		scenario 'shouting with valid content' do
-			shout = rand(100000).to_s
-			fill_in 'shoutbox_text', with: shout
-			click_button 'Shout!'
-			expect(page).to have_content(shout)
-		end
+	scenario 'creating a valid shout' do
+		visit root_path
+		shout = rand(100000).to_s
+		fill_in 'shoutbox_text', with: shout
+		click_button 'Shout!'
+		expect(page).to have_content(shout)
+	end
 
-		scenario 'unable to while banned' do
-			@user.bans.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days
-			shout = rand(100000).to_s
-			fill_in 'shoutbox_text', with: shout
-			click_button 'Shout!'
-			expect(page).to_not have_content(shout)
-		end
-	end	
+	scenario 'creating shout while banned' do
+		Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username
+		visit root_path
+		expect(find("#sidebar")).to have_content "You have been muted."
+	end
 end
\ No newline at end of file

From 44109675ae64cbe56d1cef5f6d1f1ba645f2830d Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 6 May 2015 00:04:41 +0100
Subject: [PATCH 14/76] Cleanup: move out js, require_self shouldnt be
 necessary

---
 app/assets/javascripts/application.js.coffee | 42 +-------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index cc5b14b..8cb6a1b 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -6,43 +6,5 @@
 //= require tinymce-jquery
 //= require yetii
 //= require local
-//= require_self
-
-$ ->
-  $('#logout').click ->
-    $(this).closest('form').submit()
-
-  $('select').each (i, el) ->
-    $select = $(el)
-
-    $select.wrap '<div class="select-wrapper" />'
-    $select.on 'DOMSubtreeModified', (event) ->
-      $el = $(this)
-      $wrapper = $el.parent()
-
-      if $el.is("[disabled]")
-        $wrapper.addClass 'disabled'
-      else
-        $wrapper.removeClass 'disabled'
-
-    $select.trigger 'DOMSubtreeModified'
-
-  $('a[href=#form_submit]').click ->
-    $(this).closest('form').submit()
-    return false
-
-  $('select.autosubmit').change ->
-    $(this).closest('form').submit()
-
-  $('#notification').delay(3000).fadeOut()
-
-  $('#steam-search a').click (event) ->
-    event.preventDefault()
-
-    $search = $('#steam-search')
-    id = $search.data 'user-id'
-
-    $search.html "<p>Searching...</p>"
-
-    $.get "/api/v1/users/#{id}", (data) ->
-      $search.html "<a href='#{data.steam.url}'>Steam Profile: #{data.steam.nickname}</a>"
+//= require shoutbox
+//= require misc
\ No newline at end of file

From 5f06775a26343f212b519a0f85e8760ef9b4563e Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 6 May 2015 00:05:03 +0100
Subject: [PATCH 15/76] Cleanup: move out js, require_self shouldnt be
 necessary

---
 app/assets/javascripts/misc.js.coffee | 38 +++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 app/assets/javascripts/misc.js.coffee

diff --git a/app/assets/javascripts/misc.js.coffee b/app/assets/javascripts/misc.js.coffee
new file mode 100644
index 0000000..3a861c0
--- /dev/null
+++ b/app/assets/javascripts/misc.js.coffee
@@ -0,0 +1,38 @@
+$ ->
+  $('#logout').click ->
+    $(this).closest('form').submit()
+
+  $('select').each (i, el) ->
+    $select = $(el)
+
+    $select.wrap '<div class="select-wrapper" />'
+    $select.on 'DOMSubtreeModified', (event) ->
+      $el = $(this)
+      $wrapper = $el.parent()
+
+      if $el.is("[disabled]")
+        $wrapper.addClass 'disabled'
+      else
+        $wrapper.removeClass 'disabled'
+
+    $select.trigger 'DOMSubtreeModified'
+
+  $('a[href=#form_submit]').click ->
+    $(this).closest('form').submit()
+    return false
+
+  $('select.autosubmit').change ->
+    $(this).closest('form').submit()
+
+  $('#notification').delay(3000).fadeOut()
+
+  $('#steam-search a').click (event) ->
+    event.preventDefault()
+
+    $search = $('#steam-search')
+    id = $search.data 'user-id'
+
+    $search.html "<p>Searching...</p>"
+
+    $.get "/api/v1/users/#{id}", (data) ->
+      $search.html "<a href='#{data.steam.url}'>Steam Profile: #{data.steam.nickname}</a>"
\ No newline at end of file

From 7bbb6441a9298c9e3e556e0eb43c398188dfc808 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Sat, 9 May 2015 16:20:51 +0100
Subject: [PATCH 16/76] Added shoutbox controller to perform client side
 validation

---
 app/assets/javascripts/shoutbox.js | 76 ++++++++++++++++++++++++++++++
 app/views/shoutmsgs/_new.html.erb  | 10 ++++
 2 files changed, 86 insertions(+)
 create mode 100644 app/assets/javascripts/shoutbox.js

diff --git a/app/assets/javascripts/shoutbox.js b/app/assets/javascripts/shoutbox.js
new file mode 100644
index 0000000..4d511d8
--- /dev/null
+++ b/app/assets/javascripts/shoutbox.js
@@ -0,0 +1,76 @@
+// Shoutbox Controller manages input validation on shoutmsg form
+
+function ShoutboxController (options) {
+	if (!(this instanceof ShoutboxController)) {
+    return new ShoutboxController(options);
+  }
+  this.options = options;
+	this.$context = options.context;
+	if (this.$context.length) {
+		this.init(options);
+	} else {
+		console.log("Unable to initialize shoutbox controller. No context provided");
+	}
+	return this;
+}
+
+// Initialise shoutbox state
+ShoutboxController.prototype.init = function (options) {
+	var self = this;
+	self.$input = self.$context.find(".shout_input");
+	self.$button = self.$context.find('input[type="submit"]');
+	self.$messageBox = null;
+	self.$input.change(function () {
+		if (self.$input.val().length > 100) {
+			self.disableShoutbox();
+		} else {
+			self.enableShoutbox();
+		}
+	});
+	return self;
+};
+
+// Displays a message if `message` present, otherwise removes message elemt
+ShoutboxController.prototype.writeMessage = function (message) {
+	if (message === undefined) return this.removeMessageBox();
+	this.createMessageBox().html(message);
+	return this;
+};
+
+// Adds message box to DOM and cache
+ShoutboxController.prototype.createMessageBox = function () {
+	if (this.$messageBox) return this.$messageBox;
+	this.$messageBox = $("<p/>", {class: "shout-warning"}).appendTo(this.$context.find(".fields"));
+	return this.$messageBox;
+};
+
+// Removes message box from DOM and cache
+ShoutboxController.prototype.removeMessageBox = function () {
+	if (this.$messageBox) {
+		this.$messageBox.remove();
+		this.$messageBox = null;
+	}
+	return this;
+};
+
+// Returns true if button is disabled
+ShoutboxController.prototype.isDisabled = function () {
+	return this.$button.prop("disabled") === true;
+};
+
+// Disables Input Button
+ShoutboxController.prototype.disableShoutbox = function () {
+	var chars = this.$input.val().length;
+	this.writeMessage(["Shout message length exceeded (",chars,"/100)"].join(""));
+	this.$button.prop("disabled", true);
+};
+
+// Removes any warnings and enableds shoutbox submit
+ShoutboxController.prototype.enableShoutbox = function () {
+	if (!this.$button.prop("disabled")) {
+		return this;
+	}
+	// Remove any warnings
+	this.writeMessage();
+	this.$button.prop("disabled", false);
+};
\ No newline at end of file
diff --git a/app/views/shoutmsgs/_new.html.erb b/app/views/shoutmsgs/_new.html.erb
index 25907da..523b076 100644
--- a/app/views/shoutmsgs/_new.html.erb
+++ b/app/views/shoutmsgs/_new.html.erb
@@ -17,3 +17,13 @@
     <% end %>
   <% end %>
 <% end %>
+
+<script type="text/javascript">
+console.log("Loaded!")
+var shout;
+$(function () {
+  shout = ShoutboxController({
+    context: $('<%= "#new_#{shoutmsg.domain}" %>')
+  });
+});
+</script>
\ No newline at end of file

From 4af732562079826ca9c58b5f9ec80d23f3215df3 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Sat, 9 May 2015 16:21:18 +0100
Subject: [PATCH 17/76] Added necessary factory methods to test shoutbox

---
 spec/factories/category.rb |  8 ++++++++
 spec/factories/gather.rb   | 13 +++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 spec/factories/gather.rb

diff --git a/spec/factories/category.rb b/spec/factories/category.rb
index 5578a38..14dd5ef 100644
--- a/spec/factories/category.rb
+++ b/spec/factories/category.rb
@@ -3,4 +3,12 @@ FactoryGirl.define do
     sequence(:name) { |n| "Category #{n}" }
     sequence(:sort) { |n| n }
   end
+
+  trait :news do
+  	domain Category::DOMAIN_NEWS
+  end
+
+  trait :game do
+  	domain Category::DOMAIN_GAMES
+  end
 end
\ No newline at end of file
diff --git a/spec/factories/gather.rb b/spec/factories/gather.rb
new file mode 100644
index 0000000..a7b1d0a
--- /dev/null
+++ b/spec/factories/gather.rb
@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :gather do
+    association :category, factory: [:category, :game]
+  end
+
+  trait :running do
+  	status Gather::STATE_RUNNING
+  end
+
+  trait :picking do
+  	status Gather::STATE_PICKING
+  end
+end

From 5cdae9ea64842d9cc02fe9569ffaef35f9696e7e Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Sat, 9 May 2015 16:21:48 +0100
Subject: [PATCH 18/76] Added test for client side shoutbox validation

---
 spec/features/gathers/gathers_spec.rb   | 37 +++++++++++++++++++++++++
 spec/features/shoutbox/shoutbox_spec.rb | 11 ++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 spec/features/gathers/gathers_spec.rb

diff --git a/spec/features/gathers/gathers_spec.rb b/spec/features/gathers/gathers_spec.rb
new file mode 100644
index 0000000..71026b3
--- /dev/null
+++ b/spec/features/gathers/gathers_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+feature 'Gathers', js: true do
+	let!(:user) { create :user }
+	let!(:gather) { create :gather, :running }
+
+	feature 'Shoutbox' do
+		background do
+			sign_in_as user
+		end
+
+		scenario 'create shout' do
+			visit gather_path(gather)
+			shout = rand(100000).to_s
+			fill_in "shout_Gather_#{gather.id}_text", with: shout
+			click_button 'Shout!'
+			expect(page).to have_content(shout)
+		end
+
+		scenario 'enter more than 100 characters' do
+			valid_shout = 100.times.map { "a" }.join
+			invalid_shout = 101.times.map { "a" }.join
+			visit gather_path(gather)
+			expect(page).to_not have_content("Shout message length exceeded")
+			fill_in "shout_Gather_#{gather.id}_text", with: invalid_shout
+			expect(page).to have_content("Shout message length exceeded")
+			fill_in "shout_Gather_#{gather.id}_text", with: valid_shout
+			expect(page).to_not have_content("Shout message length exceeded")
+		end
+
+		scenario 'creating shout while banned' do
+			Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username
+			visit root_path
+			expect(find("#sidebar")).to have_content "You have been muted."
+		end
+	end
+end
\ No newline at end of file
diff --git a/spec/features/shoutbox/shoutbox_spec.rb b/spec/features/shoutbox/shoutbox_spec.rb
index dec6542..a138a97 100644
--- a/spec/features/shoutbox/shoutbox_spec.rb
+++ b/spec/features/shoutbox/shoutbox_spec.rb
@@ -15,6 +15,17 @@ feature 'Shoutbox', js: true do
 		expect(page).to have_content(shout)
 	end
 
+	scenario 'enter more than 100 characters' do
+		valid_shout = 100.times.map { "a" }.join
+		invalid_shout = 101.times.map { "a" }.join
+		visit root_path
+		expect(page).to_not have_content("Shout message length exceeded")
+		fill_in 'shoutbox_text', with: invalid_shout
+		expect(page).to have_content("Shout message length exceeded")
+		fill_in 'shoutbox_text', with: valid_shout
+		expect(page).to_not have_content("Shout message length exceeded")
+	end
+
 	scenario 'creating shout while banned' do
 		Ban.create! ban_type: Ban::TYPE_MUTE, expiry: Time.now + 10.days, user_name: user.username
 		visit root_path

From a97e310528d9ffa91286063c07f4f0fec0a283e7 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Sat, 9 May 2015 16:36:50 +0100
Subject: [PATCH 19/76] Listen on both keyup and change events

---
 app/assets/javascripts/shoutbox.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/shoutbox.js b/app/assets/javascripts/shoutbox.js
index 4d511d8..447f966 100644
--- a/app/assets/javascripts/shoutbox.js
+++ b/app/assets/javascripts/shoutbox.js
@@ -20,7 +20,7 @@ ShoutboxController.prototype.init = function (options) {
 	self.$input = self.$context.find(".shout_input");
 	self.$button = self.$context.find('input[type="submit"]');
 	self.$messageBox = null;
-	self.$input.change(function () {
+	self.$input.bind("keyup change", function () {
 		if (self.$input.val().length > 100) {
 			self.disableShoutbox();
 		} else {
@@ -61,7 +61,7 @@ ShoutboxController.prototype.isDisabled = function () {
 // Disables Input Button
 ShoutboxController.prototype.disableShoutbox = function () {
 	var chars = this.$input.val().length;
-	this.writeMessage(["Shout message length exceeded (",chars,"/100)"].join(""));
+	this.writeMessage(["Maximum shout length exceeded (",chars,"/100)"].join(""));
 	this.$button.prop("disabled", true);
 };
 

From 28269995205f7b44a488c4a07f70e91e149a8bfa Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Sat, 9 May 2015 16:37:00 +0100
Subject: [PATCH 20/76] Changed wording on warning message

---
 spec/features/gathers/gathers_spec.rb   | 6 +++---
 spec/features/shoutbox/shoutbox_spec.rb | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/features/gathers/gathers_spec.rb b/spec/features/gathers/gathers_spec.rb
index 71026b3..cdb8f8a 100644
--- a/spec/features/gathers/gathers_spec.rb
+++ b/spec/features/gathers/gathers_spec.rb
@@ -21,11 +21,11 @@ feature 'Gathers', js: true do
 			valid_shout = 100.times.map { "a" }.join
 			invalid_shout = 101.times.map { "a" }.join
 			visit gather_path(gather)
-			expect(page).to_not have_content("Shout message length exceeded")
+			expect(page).to_not have_content("Maximum shout length exceeded")
 			fill_in "shout_Gather_#{gather.id}_text", with: invalid_shout
-			expect(page).to have_content("Shout message length exceeded")
+			expect(page).to have_content("Maximum shout length exceeded")
 			fill_in "shout_Gather_#{gather.id}_text", with: valid_shout
-			expect(page).to_not have_content("Shout message length exceeded")
+			expect(page).to_not have_content("Maximum shout length exceeded")
 		end
 
 		scenario 'creating shout while banned' do
diff --git a/spec/features/shoutbox/shoutbox_spec.rb b/spec/features/shoutbox/shoutbox_spec.rb
index a138a97..5a40b6e 100644
--- a/spec/features/shoutbox/shoutbox_spec.rb
+++ b/spec/features/shoutbox/shoutbox_spec.rb
@@ -19,11 +19,11 @@ feature 'Shoutbox', js: true do
 		valid_shout = 100.times.map { "a" }.join
 		invalid_shout = 101.times.map { "a" }.join
 		visit root_path
-		expect(page).to_not have_content("Shout message length exceeded")
+		expect(page).to_not have_content("Maximum shout length exceeded")
 		fill_in 'shoutbox_text', with: invalid_shout
-		expect(page).to have_content("Shout message length exceeded")
+		expect(page).to have_content("Maximum shout length exceeded")
 		fill_in 'shoutbox_text', with: valid_shout
-		expect(page).to_not have_content("Shout message length exceeded")
+		expect(page).to_not have_content("Maximum shout length exceeded")
 	end
 
 	scenario 'creating shout while banned' do

From 52ba336572c147ae982f2ab28f01997f2ad8a6ab Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Sat, 9 May 2015 16:43:02 +0100
Subject: [PATCH 21/76] Cleanup

---
 app/views/shoutmsgs/_new.html.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/shoutmsgs/_new.html.erb b/app/views/shoutmsgs/_new.html.erb
index 523b076..a424897 100644
--- a/app/views/shoutmsgs/_new.html.erb
+++ b/app/views/shoutmsgs/_new.html.erb
@@ -19,10 +19,8 @@
 <% end %>
 
 <script type="text/javascript">
-console.log("Loaded!")
-var shout;
 $(function () {
-  shout = ShoutboxController({
+  ShoutboxController({
     context: $('<%= "#new_#{shoutmsg.domain}" %>')
   });
 });

From 5a7c9f60d09e2856dd30e515898c8b4eabbb8ea2 Mon Sep 17 00:00:00 2001
From: simplefl <phoenixfl@gmx.de>
Date: Fri, 1 May 2015 00:48:51 +0200
Subject: [PATCH 22/76] Add steam group link to gather page.

---
 app/views/gathers/show.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb
index 1d5d62e..bce9335 100644
--- a/app/views/gathers/show.html.erb
+++ b/app/views/gathers/show.html.erb
@@ -142,6 +142,7 @@
         <ul>
           <li><%= link_to "Gather Spreadsheet", "https://docs.google.com/spreadsheets/d/1MNhP60WcTGA0xgpnmFCfRhlZWU106X6MgxLGgPt0N5A" %></li>
           <li><%= link_to "Fill out Spreadsheet", "https://docs.google.com/forms/d/1PHkGwcM9Z6Qut4voBkR71cSSi9vB7xx-cOF6JtW7lmk/viewform" %></li>
+          <li><%= link_to "Steam group", "http://steamcommunity.com/groups/nslgathers" %></li>
         </ul>
       </div>
 

From 6560fe18f9b10c64f2e007922d83ea782e002ea7 Mon Sep 17 00:00:00 2001
From: simplefl <phoenixfl@gmx.de>
Date: Wed, 13 May 2015 23:17:58 +0200
Subject: [PATCH 23/76] Mute button for gather.

---
 app/views/gathers/_status.html.erb | 10 ++++++----
 app/views/gathers/show.html.erb    | 28 +++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/views/gathers/_status.html.erb b/app/views/gathers/_status.html.erb
index 50a508d..c74e92d 100644
--- a/app/views/gathers/_status.html.erb
+++ b/app/views/gathers/_status.html.erb
@@ -12,7 +12,7 @@
 
         <p>Gather running, <%= Gather::FULL - @gather.gatherers.length %> more needed.</p>
         <p>
-          You can download custom maps via the 
+          You can download custom maps via the
           <%= link_to "Steam Workshop", "http://steamcommunity.com/workshop/browse?searchtext=&childpublishedfileid=0&section=items&appid=4920&browsesort=trend&requiredtags%5B%5D=level" %>.
         </p>
 
@@ -49,13 +49,13 @@
 
   <% elsif @gather.status == Gather::STATE_FINISHED and @gather.server %>
     <p>Gather finished, join the Server and TeamSpeak 3.</p>
-    
+
     <p>
       <strong>Maps</strong>: <%= namelink @gather.map1.map if @gather.map1 %>, <%= (namelink @gather.map2.map) if @gather.map2 %> <br>
-      <strong>Server</strong>: 
+      <strong>Server</strong>:
       <% if @gather.server %>
         <%= @gather.server %>
-        (<%= @gather.server.ip %>:<%= @gather.server.port %> ; 
+        (<%= @gather.server.ip %>:<%= @gather.server.port %> ;
         password = <%= if @gather.server.password then @gather.server.password else "<Password not specified>" end %>)
       <% end %>
     </p>
@@ -67,6 +67,8 @@
     <% end %>
   <% end %>
 
+
+  <%= link_to "Mute", '#', id: "mute", class: 'button tiny' %>
   <% if cuser and cuser.admin? %>
     <%= link_to "Admin Page", edit_gather_url, class: 'admin button' %>
   <% end %>
diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb
index bce9335..930cf74 100644
--- a/app/views/gathers/show.html.erb
+++ b/app/views/gathers/show.html.erb
@@ -1,11 +1,14 @@
 <div id="jplayer"></div>
 <script type="text/javascript">
   var played = false;
+  var muted = false;
   var leave_confirm = true;
   <% if @gatherer and @gatherer.can_destroy? cuser %>
   var gatherer_id = <%= @gatherer.id %>;
+  var muted = false;
   <% else %>
   var gatherer_id = 0;
+  var muted = true;
   <% end %>
 
   function updateGathererStatus(status) {
@@ -22,6 +25,7 @@
   }
 
   $(document).ready(function() {
+    init_mute();
     $.PeriodicalUpdater("/gathers/" + <%= @gather.id %> + ".js", {
       method: "GET",
       type: "script",
@@ -35,7 +39,7 @@
                 $(this).jPlayer("setMedia", {
                   mp3: "http://www.ensl.org/sounds/gather-1.mp3"
                 }).jPlayer("play");
-                
+
                 var click = document.ontouchstart === undefined ? 'click' : 'touchstart';
                 var kickoff = function () {
                   $("#jplayer").jPlayer("play");
@@ -55,9 +59,31 @@
         else if (response.length > 10) {
           $("#jplayer").jPlayer("stop");
         }
+        init_mute();
       }
     });
 
+      function init_mute() {
+          if(!muted){
+              $("#mute").text("Mute");
+              $("#jplayer").jPlayer("unmute");
+          } else {
+              $("#mute").text("Unmute");
+              $("#jplayer").jPlayer("mute");
+          }
+          $("#mute").off("click");
+          $("#mute").on("click", function() {
+              if(muted){
+                  $(this).text("Mute");
+                  $("#jplayer").jPlayer("unmute");
+              } else {
+                  $(this).text("Unmute");
+                  $("#jplayer").jPlayer("mute");
+              }
+              muted = !muted;
+              return false;
+          });
+      }
     $(window).bind('unload', function() {
       if (gatherer_id > 0 && leave_confirm) {
         updateGathererStatus('leaving');

From bb507623fd3bb5d3b7bfa3ca5b9ed66a44865f35 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 13 May 2015 12:19:44 +0100
Subject: [PATCH 24/76] Remove methods not defined on routes

---
 app/controllers/servers_controller.rb | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb
index 72825c2..2df8ae4 100644
--- a/app/controllers/servers_controller.rb
+++ b/app/controllers/servers_controller.rb
@@ -1,11 +1,6 @@
 class ServersController < ApplicationController
   before_filter :get_server, except: [:index, :refresh, :new, :create]
 
-  def refresh
-    Server.refresh
-    render :text => t(:servers_updated)
-  end
-
   def index
     @servers = Server.hlds.active.ordered.all :include => :user
     @ns2 = Server.ns2.active.ordered.all :include => :user
@@ -25,15 +20,6 @@ class ServersController < ApplicationController
     raise AccessError unless @server.can_update? cuser
   end
 
-  def admin
-    @result = @server.execute params[:query] if params[:query]
-    raise AccessError unless @server.can_update? cuser
-
-    if request.xhr?
-      render partial: 'response', layout: false
-    end
-  end
-
   def create
     @server = Server.new params[:server]
     @server.user = cuser

From befb0c50bebc3b7186e8c2b69908cbf631c53996 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 13 May 2015 12:19:58 +0100
Subject: [PATCH 25/76] No more graphing

---
 Gemfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index ae4dda3..9bb95ef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,6 @@ gem 'puma', '~> 2.11.1'
 gem 'exceptional', '~> 2.0.33'
 gem 'oj', '~> 2.5.5'
 gem 'faraday', '~> 0.9.0'
-gem 'gruff', '~> 0.3.6'
 gem 'nokogiri', '~> 1.6.1'
 gem 'bbcoder', '~> 1.0.1'
 gem 'sanitize', '~> 2.1.0'

From 94a24731338170852625eaf5838477dce95a10ef Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 13 May 2015 12:20:23 +0100
Subject: [PATCH 26/76] Remove methods which are never invoked

---
 app/models/server.rb | 394 ++++++++++++-------------------------------
 1 file changed, 106 insertions(+), 288 deletions(-)

diff --git a/app/models/server.rb b/app/models/server.rb
index 5154198..6962480 100644
--- a/app/models/server.rb
+++ b/app/models/server.rb
@@ -31,7 +31,6 @@
 #  category_id     :integer
 #
 
-require "rcon"
 require "yaml"
 
 class Server < ActiveRecord::Base
@@ -40,12 +39,8 @@ class Server < ActiveRecord::Base
   DOMAIN_HLDS = 0
   DOMAIN_HLTV = 1
   DOMAIN_NS2 = 2
-  HLTV_IDLE = 1200
-  DEMOS = "/var/www/virtual/ensl.org/hlds_l/ns/demos"
-  QSTAT = "/usr/bin/quakestat"
-  TMPFILE = "tmp/server.txt"
 
-  attr_accessor :rcon_handle, :pwd
+  attr_accessor :pwd
   attr_protected :id, :user_id, :updated_at, :created_at, :map, :players, :maxplayers, :ping, :version
 
   validates_length_of [:name, :dns,], :in => 1..30
@@ -71,301 +66,124 @@ class Server < ActiveRecord::Base
   AND match_time > '#{(time.ago(Match::MATCH_LENGTH).utc).strftime("%Y-%m-%d %H:%M:%S")}'
   AND match_time < '#{(time.ago(-Match::MATCH_LENGTH).utc).strftime("%Y-%m-%d %H:%M:%S")}'",
     :conditions => "matches.hltv_id IS NULL"} }
-  scope :of_addr,
-    lambda { |addr| {
-    :conditions => {
-      :ip => addr.match(/([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})/)[0],
-      :port => addr.match(/:([0-9]{1,5})/)[1] } } }
-      scope :of_category,
-        lambda { |category| {
-        :conditions => {:category_id => category.id} }}
 
-      has_many :logs
-      has_many :matches
-      has_many :challenges
-      belongs_to :user
-      belongs_to :recordable, :polymorphic => true
+  has_many :logs
+  has_many :matches
+  has_many :challenges
+  belongs_to :user
+  belongs_to :recordable, :polymorphic => true
 
-      before_create :set_category
+  before_create :set_category
 
-      acts_as_versioned
-      non_versioned_columns << 'name'
-      non_versioned_columns << 'description'
-      non_versioned_columns << 'dns'
-      non_versioned_columns << 'ip'
-      non_versioned_columns << 'port'
-      non_versioned_columns << 'rcon'
-      non_versioned_columns << 'password'
-      non_versioned_columns << 'irc'
-      non_versioned_columns << 'user_id'
-      non_versioned_columns << 'official'
-      non_versioned_columns << 'domain'
-      non_versioned_columns << 'reservation'
-      non_versioned_columns << 'recording'
-      non_versioned_columns << 'idle'
-      non_versioned_columns << 'default_id'
-      non_versioned_columns << 'active'
-      non_versioned_columns << 'recordable_type'
-      non_versioned_columns << 'recordable_id'
+  acts_as_versioned
+  non_versioned_columns << 'name'
+  non_versioned_columns << 'description'
+  non_versioned_columns << 'dns'
+  non_versioned_columns << 'ip'
+  non_versioned_columns << 'port'
+  non_versioned_columns << 'rcon'
+  non_versioned_columns << 'password'
+  non_versioned_columns << 'irc'
+  non_versioned_columns << 'user_id'
+  non_versioned_columns << 'official'
+  non_versioned_columns << 'domain'
+  non_versioned_columns << 'reservation'
+  non_versioned_columns << 'recording'
+  non_versioned_columns << 'idle'
+  non_versioned_columns << 'default_id'
+  non_versioned_columns << 'active'
+  non_versioned_columns << 'recordable_type'
+  non_versioned_columns << 'recordable_id'
 
-      def domains
-        {DOMAIN_HLTV => "HLTV", DOMAIN_HLDS => "NS Server", DOMAIN_NS2 => "NS2 Server"}
-      end
-
-      def to_s
-        name
-      end
-
-      def addr
-        ip + ":" + port.to_s
-      end
-
-      def players_s
-        if players.nil? or max_players.nil?
-          "N/A"
-        else
-          players.to_s + " / " + max_players.to_s
-        end
-      end
-
-      def recording_s
-        return nil if self.domain != DOMAIN_HLTV
-        # recording.to_i > 0 ? Match.find(recording).to_s : recording
-        recording
-      end
-
-      def reservation_s
-        return nil if domain != DOMAIN_HLTV
-        reservation
-      end
-
-      def graphfile
-        File.join("public", "images", "servers", id.to_s + ".png")
-      end
-
-      def set_category
-        self.category_id = (domain == DOMAIN_NS2 ? 45 : 44 )
-      end
-
-      def after_validation_on_update
-        if reservation_changed?
-          rcon_connect
-          if reservation == nil
-            rcon_exec "stop"
-            self.recording = nil
-            self.recordable = nil
-            self.idle = nil
-            save_demos if self.recording
-            hltv_stop
-          else
-            if changes['reservation'][0].nil?
-              hltv_start
-              rcon_exec "stop"
-              self.recording = recordable.demo_name if recordable and recordable_type == "Match" or recordable_type == "Gather"
-              rcon_exec "record demos/" + self.recording if self.recording
-            end
-            rcon_exec "serverpassword " + pwd
-            rcon_exec "connect " + reservation
-            self.idle = DateTime.now
-          end
-          rcon_disconnect
-        end
-      end
-
-      def execute command
-        rcon_connect
-        response = rcon_exec command
-        rcon_disconnect
-        response
-      end
-
-      def rcon_connect
-        self.rcon_handle = RCon::Query::Original.new(ip, port, rcon)
-      end
-
-      def rcon_exec command
-        response = rcon_handle.command(command)
-
-        Log.transaction do
-          Log.add(self, Log::DOMAIN_RCON_COMMAND, command)
-          if response.to_s.length > 0
-            Log.add(self, Log::DOMAIN_RCON_RESPONSE, response)
-          end
-        end
-
-        response
-      end
-
-      def rcon_disconnect
-        rcon_handle.disconnect
-      end
-
-      def hltv_start
-        if nr = hltv_nr
-          `screen -d -m -S "Hltv-#{nr[1]}" -c $HOME/.screenrc-hltv $HOME/hlds_l/hltv -ip 78.46.36.107 -port 28#{nr[1]}00 +exec ns/hltv#{nr[1]}.cfg`
-            sleep 1
-        end
-      end
-
-      def hltv_nr
-        self.name.match(/Tv \#([0-9])/)
-      end
-
-      def hltv_stop
-        if nr = hltv_nr
-          sleep 5
-          rcon_exec "exit"
-          #`screen -S "Hltv-#{nr[1]}" -X 'quit'`
-        end
-      end
-
-      def save_demos
-        dir = case recordable_type
-              when "Match" then
-                recordable.contest.demos
-              when "Gather" then
-                Directory.find(Directory::DEMOS_GATHERS)
-              end
-
-        dir ||= Directory.find(Directory::DEMOS_DEFAULT)
-        zip_path = File.join(dir.path, recording + ".zip")
-
-        Zip::ZipOutputStream::open(zip_path) do |zos|
-          if recordable_type == "Match"
-            zos.put_next_entry "readme.txt"
-            zos.write "Team1: " + recordable.contester1.to_s + "\r\n"
-            zos.write "Team2: " + recordable.contester2.to_s + "\r\n"
-            zos.write "Date: " + recordable.match_time.to_s + "\r\n"
-            zos.write "Contest: " + recordable.contest.to_s + "\r\n"
-            zos.write "Server: " + recordable.server.addr + "\r\n" if recordable.server
-            zos.write "HLTV: " + addr + "\r\n"
-            zos.write YAML::dump(recordable.attributes).to_s
-          end
-          Dir.glob("#{DEMOS}/*").each do |file|
-            if File.file?(file) and file.match(/#{recording}.*\.dem/)
-              zos.put_next_entry File.basename(file)
-              zos.write(IO.read(file))
-            end
-          end
-        end
-
-        DataFile.transaction do
-          unless dbfile = DataFile.find_by_path(zip_path)
-            dbfile = DataFile.new
-            dbfile.path = zip_path
-            dbfile.directory = dir
-            dbfile.save!
-            DataFile.update_all({:name => File.basename(zip_path)}, {:id => dbfile.id})
-          end
-          if recordable_type == "Match"
-            recordable.demo = dbfile
-            recordable.save
-          end
-        end
-      end
-
-      def make_stats
-        graph = Gruff::Line.new
-        graph.title = name
-        pings = []
-        players = []
-        labels = {}
-        n = 0
-
-        for version in versions.all(:order => "updated_at DESC", :limit => 30).reverse
-          pings << version.ping.to_i
-          players << version.players.to_i
-          labels[n] = version.updated_at.strftime("%H:%M") if n % 3 == 0
-          n = n + 1
-        end
-
-        graph.theme_37signals
-        graph.data("Ping", pings, '#057fc0')
-        graph.data("Players", players, '#ff0000')
-        graph.labels = labels
-        graph.write(graphfile)
-      end
-
-      def default_record
-        #		if self.default
-        #			rcon_exec "record demos/auto-" + Verification.uncrap(default.name)
-        #			rcon_exec "serverpassword " + default.password
-        #			rcon_exec "connect " + default.addr
-        #		end
-end
-
-def is_free time
-  challenges.around(time).pending.count == 0 and matches.around(time).count == 0
-end
-
-def can_create? cuser
-  cuser
-end
-
-def can_update? cuser
-  cuser and cuser.admin? or user == cuser
-end
-
-def can_destroy? cuser
-  cuser and cuser.admin?
-end
-
-def self.refresh
-  servers = ""
-  Server.hlds.active.all.each do |server|
-    servers << " -a2s " + server.ip + ":" + server.port.to_s
+  def domains
+    {DOMAIN_HLTV => "HLTV", DOMAIN_HLDS => "NS Server", DOMAIN_NS2 => "NS2 Server"}
   end
 
-  file = File.join(Rails.root, TMPFILE)
-  system "#{QSTAT} -xml #{servers} | grep -v '<name>' > #{file}"
+  def to_s
+    name
+  end
 
-  doc = REXML::Document.new(File.new(file).read)
-  doc.elements.each('qstat/server') do |server|
-    hostname = server.elements['hostname'].text.split(':', 2)
-    if s = Server.active.first(:conditions => {:ip => hostname[0], :port => hostname[1]})
-      if server.elements.include? 'map'
-        s.map = server.elements['map'].text
-        s.players = server.elements['numplayers'].text.to_i
-        s.max_players = server.elements['maxplayers'].text.to_i
-        s.ping = server.elements['ping'].text
-        s.map = server.elements['map'].text
-        s.save
-        s.make_stats
+  def addr
+    ip + ":" + port.to_s
+  end
+
+  def set_category
+    self.category_id = (domain == DOMAIN_NS2 ? 45 : 44 )
+  end
+
+  def save_demos
+    dir = case recordable_type
+          when "Match" then
+            recordable.contest.demos
+          when "Gather" then
+            Directory.find(Directory::DEMOS_GATHERS)
+          end
+
+    dir ||= Directory.find(Directory::DEMOS_DEFAULT)
+    zip_path = File.join(dir.path, recording + ".zip")
+
+    Zip::ZipOutputStream::open(zip_path) do |zos|
+      if recordable_type == "Match"
+        zos.put_next_entry "readme.txt"
+        zos.write "Team1: " + recordable.contester1.to_s + "\r\n"
+        zos.write "Team2: " + recordable.contester2.to_s + "\r\n"
+        zos.write "Date: " + recordable.match_time.to_s + "\r\n"
+        zos.write "Contest: " + recordable.contest.to_s + "\r\n"
+        zos.write "Server: " + recordable.server.addr + "\r\n" if recordable.server
+        zos.write "HLTV: " + addr + "\r\n"
+        zos.write YAML::dump(recordable.attributes).to_s
+      end
+      Dir.glob("#{DEMOS}/*").each do |file|
+        if File.file?(file) and file.match(/#{recording}.*\.dem/)
+          zos.put_next_entry File.basename(file)
+          zos.write(IO.read(file))
+        end
+      end
+    end
+
+    DataFile.transaction do
+      unless dbfile = DataFile.find_by_path(zip_path)
+        dbfile = DataFile.new
+        dbfile.path = zip_path
+        dbfile.directory = dir
+        dbfile.save!
+        DataFile.update_all({:name => File.basename(zip_path)}, {:id => dbfile.id})
+      end
+      if recordable_type == "Match"
+        recordable.demo = dbfile
+        recordable.save
       end
     end
   end
 
-  servers = ""
-  Server.hltvs.reserved.each do |server|
-    servers << " -a2s #{server.reservation}"
+  def is_free time
+    challenges.around(time).pending.count == 0 and matches.around(time).count == 0
   end
 
-  doc = REXML::Document.new(`#{QSTAT} -xml #{servers} | grep -v '<name>'`)
-  doc.elements.each('qstat/server') do |server|
-    hostname = server.elements['hostname'].text.split(':', 2)
-    if s = Server.hltvs.reserved.first(:conditions => {:ip => hostname[0], :port => hostname[1]})
-      if server.elements['numplayers'].text.to_i > 0
-        s.update_attribute :idle, DateTime.now
-      elsif (s.idle + HLTV_IDLE).past?
-        s.reservation = nil
-        s.save
-      end
+  def can_create? cuser
+    cuser
+  end
+
+  def can_update? cuser
+    cuser and cuser.admin? or user == cuser
+  end
+
+  def can_destroy? cuser
+    cuser and cuser.admin?
+  end
+
+  def self.move addr, newaddr, newpwd
+    self.hltvs.all(:conditions => {:reservation => addr}).each do |hltv|
+      hltv.reservation = newaddr
+      hltv.pwd = newpwd
+      hltv.save!
+    end
+  end
+
+  def self.stop addr
+    self.hltvs.all(:conditions => {:reservation => addr}).each do |hltv|
+      hltv.reservation = nil
+      hltv.save!
     end
   end
 end
-
-def self.move addr, newaddr, newpwd
-  self.hltvs.all(:conditions => {:reservation => addr}).each do |hltv|
-    hltv.reservation = newaddr
-    hltv.pwd = newpwd
-    hltv.save!
-  end
-end
-
-def self.stop addr
-  self.hltvs.all(:conditions => {:reservation => addr}).each do |hltv|
-    hltv.reservation = nil
-    hltv.save!
-  end
-end
-end

From 30a7ecb1a9034272b91b661de0a1ba1a64e1b6e1 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 13 May 2015 12:20:37 +0100
Subject: [PATCH 27/76] Admin route never used

---
 app/views/servers/admin.html.erb | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 app/views/servers/admin.html.erb

diff --git a/app/views/servers/admin.html.erb b/app/views/servers/admin.html.erb
deleted file mode 100644
index cbd8fb2..0000000
--- a/app/views/servers/admin.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<h1>
-  RCON: <%= h @server %>
-</h1>
-
-<%= image_tag "icons/spinner.gif",
-  :align => "absmiddle",
-  :id => "spinner",
-  :style =>"display: none;" %>
-
-<div class="wide box" id="serverLog">
-  <%= render :partial => "response" %>
-</div>
-
-<% form_tag remote: true, update: 'serverLog',
-  :before => "Element.show('spinner')",
-  :success => "Element.hide('spinner'); $('serverLog').scrollTop = $('serverLog').scrollHeight;" do %>
-  <%= label_tag :query, "Rcon Command:" %>
-  <%= text_field_tag "query", params['query'], :size => 30 %>
-<% end %>

From 1789ae0ff50ed4f6bec6f177fb8904d1fe0a2de0 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 13 May 2015 12:20:41 +0100
Subject: [PATCH 28/76] Remove rcon

---
 vendor/plugins/rcon/bin/rcontool |  296 -------
 vendor/plugins/rcon/lib/rcon.rb  |  499 -----------
 vendor/plugins/rcon/rcon.gemspec |   13 -
 vendor/plugins/rcon/setup.rb     | 1360 ------------------------------
 4 files changed, 2168 deletions(-)
 delete mode 100644 vendor/plugins/rcon/bin/rcontool
 delete mode 100644 vendor/plugins/rcon/lib/rcon.rb
 delete mode 100644 vendor/plugins/rcon/rcon.gemspec
 delete mode 100644 vendor/plugins/rcon/setup.rb

diff --git a/vendor/plugins/rcon/bin/rcontool b/vendor/plugins/rcon/bin/rcontool
deleted file mode 100644
index 8734dba..0000000
--- a/vendor/plugins/rcon/bin/rcontool
+++ /dev/null
@@ -1,296 +0,0 @@
-#!/usr/bin/env ruby
-################################################################
-#
-# rcontool - shell interface to rcon commands
-#
-# (C) 2006 Erik Hollensbe, License details below
-#
-# Use 'rcontool -h' for usage instructions.
-#
-# The compilation of software known as rcontool is distributed under the
-# following terms:
-# Copyright (C) 2005-2006 Erik Hollensbe. All rights reserved.
-#
-# Redistribution and use in source form, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#
-################################################################
-
-#
-# rubygems hack
-#
-
-begin
-  require 'rubygems'
-rescue LoadError => e
-end
-begin
-  require 'rcon'
-  require 'ip'
-rescue LoadError => e
-  $stderr.puts "rcontool requires the rcon and ip libraries be installed."
-  $stderr.puts "You can find them both via rubygems or at http://rubyforge.org."
-  exit -1
-end
-
-RCONTOOL_VERSION = '0.1.0'
-
-require 'optparse'
-require 'ostruct'
-
-#
-# Manages our options
-#
-
-def get_options
-  options = OpenStruct.new
-  # ip address (IP::Address object)
-  options.ip_address = nil
-  # port (integer)
-  options.port = nil
-  # password
-  options.password = nil
-  # protocol type (one of :hlds, :source, :oldquake, :newquake)
-  options.protocol_type = nil
-  # verbose, spit out extra information
-  options.verbose = false
-  # command to execute on the server
-  options.command = nil
-
-  optparse = OptionParser.new do |opts|
-    opts.banner = "Usage: #{File.basename $0} <ip_address:port> <command> [options]"
-    opts.separator ""
-    opts.separator "Options:"
-
-    opts.on("--ip-address [ADDRESS]",
-            "Provide an IP address to connect to. Does not take a port.") do |ip_address|
-      if ! options.ip_address.nil?
-        $stderr.puts "Error: you have already provided an IP Address."
-        $stderr.puts opts
-        exit -1
-      end
-
-      options.ip_address = IP::Address.new(ip_address)
-    end
-
-    opts.on("-r", "--port [PORT]",
-            "Port to connect to.") do |port|
-      if ! options.port.nil?
-        $stderr.puts "Error: you have already provided a port."
-        $stderr.puts opts
-        exit -1
-      end
-
-      options.port = port.to_i
-    end
-
-    opts.on("-c", "--command [COMMAND]",
-            "Command to run on the server.") do |command|
-      if ! options.command.nil?
-        $stderr.puts "Error: you have already provided a command."
-        $stderr.puts opts
-        exit -1
-      end
-      
-      options.command = command
-    end
-
-    opts.on("-p", "--password [PASSWORD]",
-            "Provide a password on the command line.") do |password|
-      options.password = password
-    end
-
-    opts.on("-f", "--password-from [FILENAME]",
-            "Get the password from a file (use '/dev/fd/0' or '/dev/stdin' to read from Standard Input).") do |filename|
-      if !filename.nil?
-        f = File.open(filename)
-        options.password = f.gets.chomp
-        f.close
-      else
-        $stderr.puts "Error: filename (from -f) is not valid."
-        $stderr.puts opts
-        exit -1
-      end
-    end
-
-    opts.on("-t", "--protocol-type [TYPE]", [:hlds, :source, :oldquake, :newquake],
-            "Type of rcon connection to make: (hlds, source, oldquake, newquake).",
-            "   Note: oldquake is quake1/quakeworld, newquake is quake2/3.") do |protocol_type|
-      options.protocol_type = protocol_type
-    end
-
-    opts.on("-v", "--[no-]verbose", 
-            "Run verbosely, print information about each packet recieved and turnaround times.") do |verbose|
-      options.verbose = verbose
-    end
-
-    opts.on("-h", "--help",
-                 "This help message.") do
-      $stderr.puts opts
-      exit -1
-    end
-
-    opts.on("--version", "Print the version information.") do
-      $stderr.puts "This is rcontool version #{RCONTOOL_VERSION},"
-      $stderr.puts "it is located at #{File.expand_path $0}."
-      exit -1
-    end
-
-    opts.separator ""
-    opts.separator "Note: IP, port, protocol type, password and command are required to function."
-    opts.separator ""
-    opts.separator "Examples (all are equivalent):"
-    opts.separator "\t#{File.basename($0)} 10.0.0.11 status -t hlds -r 27015 -p foobar"
-    opts.separator "\techo 'foobar' | #{File.basename($0)} 10.0.0.11:27015 status -t hlds -f /dev/stdin"
-    opts.separator "\t#{File.basename($0)} --ip-address 10.0.0.11 --port 27015 -c status -t hlds -f file_with_password"
-    opts.separator ""
-
-  end
-
-  ################################################################
-  #
-  # This hackery is to help facilitate the bareword options if
-  # they exist, while still allowing for the option parser
-  # to work properly.
-  #
-  ################################################################
-
-  s1 = ARGV.shift
-  s2 = ARGV.shift
-
-  begin
-    options.ip_address = IP::Address::IPv4.new(s1)
-    options.command = s2
-  rescue IP::AddressException => e
-    # attempt to split it first... not sure how to best handle this situation
-    begin
-      ip,port = s1.split(/:/, 2)
-      options.ip_address = IP::Address::IPv4.new(ip)
-      options.port = port.to_i
-      options.command = s2
-    rescue Exception => e
-    end
-
-    if [options.ip_address, options.port].include? nil
-      ARGV.unshift(s2)
-      ARGV.unshift(s1)
-    end
-  end
-  
-  optparse.parse!
-
-  if [options.ip_address, options.protocol_type, options.port, options.password, options.command].include? nil
-    $stderr.puts optparse
-    exit -1
-  end
-
-  return options
-end
-
-def verbose(string)
-  $stderr.puts string if $options.verbose
-end
-
-def dump_source_packet(packet)
-  if $options.verbose
-    verbose "Request ID: #{packet.request_id}"
-    verbose "Packet Size: #{packet.packet_size}"
-    verbose "Response Type: #{packet.command_type}"
-  end
-end
-
-################################################################
-#
-# start main block
-#
-################################################################
-
-$options = get_options
-
-################################################################
-#
-# Source query
-#
-################################################################
-
-if $options.protocol_type == :source
-  verbose "Protocol type 'SOURCE' selected."
-
-  rcon = RCon::Query::Source.new($options.ip_address.ip_address, $options.port)
-
-  # if we have a verbose request, give all the information we can about
-  # the query, including the packet information.
-  rcon.return_packets = $options.verbose
-
-  verbose "Attempting authentication to #{$options.ip_address.ip_address}:#{$options.port} with password '#{$options.password}'"
-
-  value = rcon.auth $options.password
-
-  dump_source_packet value
-
-  if ($options.verbose && value.command_type == RCon::Packet::Source::RESPONSE_AUTH) || value
-    verbose "Authentication succeeded. Sending command: '#{$options.command}'"
-
-    value = rcon.command $options.command
-
-    dump_source_packet value
-    verbose ""
-
-    if $options.verbose
-      puts value.string1
-    else
-      puts value
-    end
-    
-    exit 0
-  else
-    $stderr.puts "Authentication failed."
-    exit 1
-  end
-
-################################################################
-#
-# Original Query
-#
-################################################################
-
-else
-  rcon = nil
-  case $options.protocol_type
-  when :hlds
-    verbose "Protocol type 'HLDS' selected"
-    rcon = RCon::Query::Original.new($options.ip_address.ip_address, $options.port, $options.password,
-                                     RCon::Query::Original::HLDS)
-  when :oldquake
-    verbose "Protocol type 'OLDQUAKE' selected"
-    rcon = RCon::Query::Original.new($options.ip_address.ip_address, $options.port, $options.password,
-                                     RCon::Query::Original::QUAKEWORLD)
-  when :newquake
-    verbose "Protocol type 'NEWQUAKE' selected"
-    rcon = RCon::Query::Original.new($options.ip_address.ip_address, $options.port, $options.password,
-                                     RCon::Query::Original::NEWQUAKE)
-  end
-  verbose "Attempting transmission to #{$options.ip_address.ip_address}:#{$options.port}"
-  verbose "Using password: '#{$options.password}' and sending command: '#{$options.command}'"
-  verbose ""
-  string = rcon.command($options.command)
-
-  puts string
-  exit 0
-end
-
diff --git a/vendor/plugins/rcon/lib/rcon.rb b/vendor/plugins/rcon/lib/rcon.rb
deleted file mode 100644
index 9977135..0000000
--- a/vendor/plugins/rcon/lib/rcon.rb
+++ /dev/null
@@ -1,499 +0,0 @@
-# encoding: US-ASCII
-
-require 'socket'
-
-#
-# RCon is a module to work with Quake 1/2/3, Half-Life, and Half-Life
-# 2 (Source Engine) RCon (Remote Console) protocols.
-#
-# Version:: 0.2.0
-# Author:: Erik Hollensbe <erik@hollensbe.org>
-# License:: BSD
-# Contact:: erik@hollensbe.org
-# Copyright:: Copyright (c) 2005-2006 Erik Hollensbe
-#
-# The relevant modules to query RCon are in the RCon::Query namespace,
-# under RCon::Query::Original (for Quake 1/2/3 and Half-Life), and
-# RCon::Query::Source (for HL2 and CS: Source, and other Source Engine
-# games). The RCon::Packet namespace is used to manage complex packet
-# structures if required. The Original protocol does not require
-# this, but Source does.
-#
-# Usage is fairly simple:
-#
-# # Note: Other classes have different constructors
-#
-# rcon = RCon::Query::Source.new("10.0.0.1", 27015)
-#
-# rcon.auth("foobar") # source only
-#
-# rcon.command("mp_friendlyfire") => "mp_friendlyfire = 1"
-#
-# rcon.cvar("mp_friendlyfire") => 1
-#
-#--
-#
-# The compilation of software known as rcon.rb is distributed under the
-# following terms:
-# Copyright (C) 2005-2006 Erik Hollensbe. All rights reserved.
-#
-# Redistribution and use in source form, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#++
-
-
-class RCon
-  class Packet
-    # placeholder so ruby doesn't bitch
-  end
-  class Query
-
-    #
-    # Convenience method to scrape input from cvar output and return that data.
-    # Returns integers as a numeric type if possible.
-    #
-    # ex: rcon.cvar("mp_friendlyfire") => 1
-    #
-
-    def cvar(cvar_name)
-      response = command(cvar_name)
-      match = /^.+?\s(?:is|=)\s"([^"]+)".*$/.match response
-      match = match[1]
-      if /\D/.match match
-        return match
-      else
-        return match.to_i
-      end
-    end
-  end
-end
-
-#
-# RCon::Packet::Source generates a packet structure useful for
-# RCon::Query::Source protocol queries.
-#
-# This class is primarily used internally, but is available if you
-# want to do something more advanced with the Source RCon
-# protocol.
-#
-# Use at your own risk.
-#
-
-class RCon::Packet::Source
-  # execution command
-  COMMAND_EXEC = 2
-  # auth command
-  COMMAND_AUTH = 3
-  # auth response
-  RESPONSE_AUTH = 2
-  # normal response
-  RESPONSE_NORM = 0
-  # packet trailer
-  TRAILER = "\x00\x00"
-  
-  # size of the packet (10 bytes for header + string1 length)
-  attr_accessor :packet_size
-  # Request Identifier, used in managing multiple requests at once
-  attr_accessor :request_id
-  # Type of command, normally COMMAND_AUTH or COMMAND_EXEC. In response packets, RESPONSE_AUTH or RESPONSE_NORM
-  attr_accessor :command_type
-  # First string, the only used one in the protocol, contains
-  # commands and responses. Null terminated.
-  attr_accessor :string1
-  # Second string, unused by the protocol. Null terminated.
-  attr_accessor :string2
-  
-  #
-  # Generate a command packet to be sent to an already
-  # authenticated RCon connection. Takes the command as an
-  # argument.
-  # 
-  def command(string)
-    @request_id = rand(1000)
-    @string1 = string
-    @string2 = TRAILER
-    @command_type = COMMAND_EXEC
-
-    @packet_size = build_packet.length
-
-    return self
-  end
-  
-  #
-  # Generate an authentication packet to be sent to a newly
-  # started RCon connection. Takes the RCon password as an
-  # argument.
-  #
-  def auth(string)
-    @request_id = rand(1000)
-    @string1 = string
-    @string2 = TRAILER
-    @command_type = COMMAND_AUTH
-    
-    @packet_size = build_packet.length
-    
-    return self
-  end
-  
-  #
-  # Builds a packet ready to deliver, without the size prepended.
-  # Used to calculate the packet size, use #to_s to get the packet
-  # that srcds actually needs.
-  #
-  def build_packet
-    return [@request_id, @command_type, @string1, @string2].pack("VVa#{@string1.length}a2")
-  end
-
-  # Returns a string representation of the packet, useful for
-  # sending and debugging. This include the packet size.
-  def to_s
-    packet = build_packet
-    @packet_size = packet.length
-    return [@packet_size].pack("V") + packet
-  end
-
-end
-
-#
-# RCon::Query::Original queries Quake 1/2/3 and Half-Life servers
-# with the rcon protocol. This protocol travels over UDP to the
-# game server port, and requires an initial authentication step,
-# the information of which is provided at construction time.
-#
-# Some of the work here (namely the RCon packet structure) was taken
-# from the KKRcon code, which is written in perl.
-#
-# One query per authentication is allowed.
-#
-
-class RCon::Query::Original < RCon::Query
-  # HLDS-Based Servers
-  HLDS         = "l"
-  # QuakeWorld/Quake 1 Servers
-  QUAKEWORLD   = "n"
-  # Quake 2/3 Servers
-  NEWQUAKE     = ""
-  
-  # Request to be sent to server
-  attr_reader :request
-  # Response from server
-  attr_reader :response
-  # Challenge ID (served by server-side of connection)
-  attr_reader :challenge_id
-  # UDPSocket object
-  attr_reader :socket
-  # Host of connection
-  attr_reader :host
-  # Port of connection
-  attr_reader :port
-  # RCon password
-  attr_reader :password
-  # type of server
-  attr_reader :server_type
-  
-  #
-  # Creates a RCon::Query::Original object for use.
-  #
-  # The type (the default of which is HLDS), has multiple possible
-  # values:
-  # 
-  # HLDS - Half Life 1 (will not work with older versions of HLDS)
-  #
-  # QUAKEWORLD - QuakeWorld/Quake 1
-  #
-  # NEWQUAKE - Quake 2/3 (and many derivatives)
-  #
-
-  def initialize(host, port, password, type=HLDS)
-    @host = host
-    @port = port
-    @password = password
-    @server_type = type
-  end
-  
-  #
-  # Sends a request given as the argument, and returns the
-  # response as a string.
-  #
-  def command(request)
-    @request = request
-    @challenge_id = nil
-
-    establish_connection
-
-    @socket.print "\xFF" * 4 + "challenge rcon\n\x00"
-    
-    tmp = retrieve_socket_data
-    challenge_id = /challenge rcon (\d+)/.match tmp
-    if challenge_id
-      @challenge_id = challenge_id[1]
-    end
-
-    if @challenge_id.nil?
-      raise RCon::NetworkException.new("RCon challenge ID never returned: wrong rcon password?")
-    end
-
-    @socket.print "\xFF" * 4 + "rcon #{@challenge_id} \"#{@password}\" #{@request}\n\x00"
-    @response = retrieve_socket_data
-
-    @response.sub!(/^\xFF\xFF\xFF\xFF#{@server_type}/, "")
-    @response.sub!(/\x00+$/, "")
-    
-    return @response
-  end
-  
-  #
-  # Disconnects the RCon connection.
-  #
-  def disconnect
-    if @socket
-      @socket.close
-      @socket = nil
-    end
-  end
-  
-  protected
-  
-  #
-  # Establishes the connection.
-  #
-  def establish_connection
-    if @socket.nil?
-      @socket = UDPSocket.new
-      @socket.connect(@host, @port)
-    end
-  end
-  
-  #
-  # Generic method to pull data from the socket.
-  #
-
-  def retrieve_socket_data
-    return "" if @socket.nil?
-
-    retval = ""
-    loop do 
-      break unless IO.select([@socket], nil, nil, 10)
-      packet = @socket.recv(8192)
-      retval << packet
-      break if packet.length < 8192
-    end
-    
-    return retval
-  end
-
-end
-
-#
-# RCon::Query::Source sends queries to a "Source" Engine server,
-# such as Half-Life 2: Deathmatch, Counter-Strike: Source, or Day
-# of Defeat: Source.
-#
-# Note that one authentication packet needs to be sent to send
-# multiple commands. Sending multiple authentication packets may
-# damage the current connection and require it to be reset.
-#
-# Note: If the attribute 'return_packets' is set to true, the full
-# RCon::Packet::Source object is returned, instead of just a string
-# with the headers stripped. Useful for debugging.
-#
-
-class RCon::Query::Source < RCon::Query
-  # RCon::Packet::Source object that was sent as a result of the last query
-  attr_reader :packet
-  # TCPSocket object
-  attr_reader :socket
-  # Host of connection
-  attr_reader :host
-  # Port of connection
-  attr_reader :port
-  # Authentication Status
-  attr_reader :authed
-  # return full packet, or just data?
-  attr_accessor :return_packets
-  
-  #
-  # Given a host and a port (dotted-quad or hostname OK), creates
-  # a RCon::Query::Source object. Note that this will still
-  # require an authentication packet (see the auth() method)
-  # before commands can be sent.
-  #
-
-  def initialize(host, port)
-    @host = host
-    @port = port
-    @socket = nil
-    @packet = nil
-    @authed = false
-    @return_packets = false
-  end
-  
-  #
-  # See RCon::Query#cvar.
-  # 
-  
-  def cvar(cvar_name)
-    return_packets = @return_packets
-    @return_packets = false
-    response = super
-    @return_packets = return_packets
-    return response
-  end
-
-  #
-  # Sends a RCon command to the server. May be used multiple times
-  # after an authentication is successful. 
-  #
-  # See the class-level documentation on the 'return_packet' attribute
-  # for return values. The default is to return a string containing
-  # the response.
-  #
-  
-  def command(command)
-    
-    if ! @authed
-      raise RCon::NetworkException.new("You must authenticate the connection successfully before sending commands.")
-    end
-
-    @packet = RCon::Packet::Source.new
-    @packet.command(command)
-
-    @socket.print @packet.to_s
-    rpacket = build_response_packet
-
-    if rpacket.command_type != RCon::Packet::Source::RESPONSE_NORM
-      raise RCon::NetworkException.new("error sending command: #{rpacket.command_type}")
-    end
-
-    if @return_packets
-      return rpacket
-    else
-      return rpacket.string1
-    end
-  end
-  
-  #
-  # Requests authentication from the RCon server, given a
-  # password. Is only expected to be used once.
-  #
-  # See the class-level documentation on the 'return_packet' attribute
-  # for return values. The default is to return a true value if auth
-  # succeeded.
-  #
-  
-  def auth(password)
-    establish_connection
-
-    @packet = RCon::Packet::Source.new
-    @packet.auth(password)
-
-    @socket.print @packet.to_s
-    # on auth, one junk packet is sent
-    rpacket = nil
-    2.times { rpacket = build_response_packet }
-
-    if rpacket.command_type != RCon::Packet::Source::RESPONSE_AUTH
-      raise RCon::NetworkException.new("error authenticating: #{rpacket.command_type}")
-    end
-
-    @authed = true
-    if @return_packets
-      return rpacket
-    else
-      return true
-    end
-  end
-
-  alias_method :authenticate, :auth
-  
-  #
-  # Disconnects from the Source server.
-  #
-  
-  def disconnect
-    if @socket
-      @socket.close
-      @socket = nil
-      @authed = false
-    end
-  end
-  
-  protected
-  
-  #
-  # Builds a RCon::Packet::Source packet based on the response
-  # given by the server. 
-  #
-  def build_response_packet
-    rpacket = RCon::Packet::Source.new
-    total_size = 0
-    request_id = 0
-    type = 0
-    response = ""
-    message = ""
-    
-
-    loop do
-      break unless IO.select([@socket], nil, nil, 10)
-
-      #
-      # TODO: clean this up - read everything and then unpack.
-      #
-
-      tmp = @socket.recv(14)
-      if tmp.nil?
-        return nil
-      end
-      size, request_id, type, message = tmp.unpack("VVVa*")
-      total_size += size
-      
-      # special case for authentication
-      break if message.sub!(/\x00\x00$/, "")
-
-      response << message
-
-      # the 'size - 10' here accounts for the fact that we've snarfed 14 bytes,
-      # the size (which is 4 bytes) is not counted, yet represents the rest
-      # of the packet (which we have already taken 10 bytes from)
-
-      tmp = @socket.recv(size - 10)
-      response << tmp
-      response.sub!(/\x00\x00$/, "")
-    end
-    
-    rpacket.packet_size = total_size
-    rpacket.request_id = request_id
-    rpacket.command_type = type
-    
-    # strip nulls (this is actually the end of string1 and string2)
-    rpacket.string1 = response.sub(/\x00\x00$/, "")
-    return rpacket
-  end
-  
-  # establishes a connection to the server.
-  def establish_connection
-    if @socket.nil?
-      @socket = TCPSocket.new(@host, @port)
-    end
-  end
-  
-end
-
-# Exception class for network errors
-class RCon::NetworkException < Exception
-end
diff --git a/vendor/plugins/rcon/rcon.gemspec b/vendor/plugins/rcon/rcon.gemspec
deleted file mode 100644
index 03527ca..0000000
--- a/vendor/plugins/rcon/rcon.gemspec
+++ /dev/null
@@ -1,13 +0,0 @@
-spec = Gem::Specification.new
-spec.name = "rcon"
-spec.version = "0.2.1"
-spec.author = "Erik Hollensbe"
-spec.email = "erik@hollensbe.org"
-spec.summary = "Ruby class to work with Quake 1/2/3, Half-Life and Source Engine rcon (remote console)"
-spec.has_rdoc = true
-spec.autorequire = "rcon"
-spec.bindir = 'bin'
-spec.executables << 'rcontool'
-spec.add_dependency('ip', '>= 0.2.1')
-spec.files = Dir['lib/rcon.rb'] + Dir['bin/rcontool']
-spec.rubyforge_project = 'rcon'
diff --git a/vendor/plugins/rcon/setup.rb b/vendor/plugins/rcon/setup.rb
deleted file mode 100644
index 0807023..0000000
--- a/vendor/plugins/rcon/setup.rb
+++ /dev/null
@@ -1,1360 +0,0 @@
-#
-# setup.rb
-#
-# Copyright (c) 2000-2004 Minero Aoki
-#
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU LGPL, Lesser General Public License version 2.1.
-#
-
-unless Enumerable.method_defined?(:map)   # Ruby 1.4.6
-  module Enumerable
-    alias map collect
-  end
-end
-
-unless File.respond_to?(:read)   # Ruby 1.6
-  def File.read(fname)
-    open(fname) {|f|
-      return f.read
-    }
-  end
-end
-
-def File.binread(fname)
-  open(fname, 'rb') {|f|
-    return f.read
-  }
-end
-
-# for corrupted windows stat(2)
-def File.dir?(path)
-  File.directory?((path[-1,1] == '/') ? path : path + '/')
-end
-
-
-class SetupError < StandardError; end
-
-def setup_rb_error(msg)
-  raise SetupError, msg
-end
-
-#
-# Config
-#
-
-if arg = ARGV.detect {|arg| /\A--rbconfig=/ =~ arg }
-  ARGV.delete(arg)
-  require arg.split(/=/, 2)[1]
-  $".push 'rbconfig.rb'
-else
-  require 'rbconfig'
-end
-
-def multipackage_install?
-  FileTest.directory?(File.dirname($0) + '/packages')
-end
-
-
-class ConfigItem
-  def initialize(name, template, default, desc)
-    @name = name.freeze
-    @template = template
-    @value = default
-    @default = default.dup.freeze
-    @description = desc
-  end
-
-  attr_reader :name
-  attr_reader :description
-
-  attr_accessor :default
-  alias help_default default
-
-  def help_opt
-    "--#{@name}=#{@template}"
-  end
-
-  def value
-    @value
-  end
-
-  def eval(table)
-    @value.gsub(%r<\$([^/]+)>) { table[$1] }
-  end
-
-  def set(val)
-    @value = check(val)
-  end
-
-  private
-
-  def check(val)
-    setup_rb_error "config: --#{name} requires argument" unless val
-    val
-  end
-end
-
-class BoolItem < ConfigItem
-  def config_type
-    'bool'
-  end
-
-  def help_opt
-    "--#{@name}"
-  end
-
-  private
-
-  def check(val)
-    return 'yes' unless val
-    unless /\A(y(es)?|n(o)?|t(rue)?|f(alse))\z/i =~ val
-      setup_rb_error "config: --#{@name} accepts only yes/no for argument"
-    end
-    (/\Ay(es)?|\At(rue)/i =~ value) ? 'yes' : 'no'
-  end
-end
-
-class PathItem < ConfigItem
-  def config_type
-    'path'
-  end
-
-  private
-
-  def check(path)
-    setup_rb_error "config: --#{@name} requires argument"  unless path
-    path[0,1] == '$' ? path : File.expand_path(path)
-  end
-end
-
-class ProgramItem < ConfigItem
-  def config_type
-    'program'
-  end
-end
-
-class SelectItem < ConfigItem
-  def initialize(name, template, default, desc)
-    super
-    @ok = template.split('/')
-  end
-
-  def config_type
-    'select'
-  end
-
-  private
-
-  def check(val)
-    unless @ok.include?(val.strip)
-      setup_rb_error "config: use --#{@name}=#{@template} (#{val})"
-    end
-    val.strip
-  end
-end
-
-class PackageSelectionItem < ConfigItem
-  def initialize(name, template, default, help_default, desc)
-    super name, template, default, desc
-    @help_default = help_default
-  end
-
-  attr_reader :help_default
-
-  def config_type
-    'package'
-  end
-
-  private
-
-  def check(val)
-    unless File.dir?("packages/#{val}")
-      setup_rb_error "config: no such package: #{val}"
-    end
-    val
-  end
-end
-
-class ConfigTable_class
-
-  def initialize(items)
-    @items = items
-    @table = {}
-    items.each do |i|
-      @table[i.name] = i
-    end
-    ALIASES.each do |ali, name|
-      @table[ali] = @table[name]
-    end
-  end
-
-  include Enumerable
-
-  def each(&block)
-    @items.each(&block)
-  end
-
-  def key?(name)
-    @table.key?(name)
-  end
-
-  def lookup(name)
-    @table[name] or raise ArgumentError, "no such config item: #{name}"
-  end
-
-  def add(item)
-    @items.push item
-    @table[item.name] = item
-  end
-
-  def remove(name)
-    item = lookup(name)
-    @items.delete_if {|i| i.name == name }
-    @table.delete_if {|name, i| i.name == name }
-    item
-  end
-
-  def new
-    dup()
-  end
-
-  def savefile
-    '.config'
-  end
-
-  def load
-    begin
-      t = dup()
-      File.foreach(savefile()) do |line|
-        k, v = *line.split(/=/, 2)
-        t[k] = v.strip
-      end
-      t
-    rescue Errno::ENOENT
-      setup_rb_error $!.message + "#{File.basename($0)} config first"
-    end
-  end
-
-  def save
-    @items.each {|i| i.value }
-    File.open(savefile(), 'w') {|f|
-      @items.each do |i|
-        f.printf "%s=%s\n", i.name, i.value if i.value
-      end
-    }
-  end
-
-  def [](key)
-    lookup(key).eval(self)
-  end
-
-  def []=(key, val)
-    lookup(key).set val
-  end
-
-end
-
-c = ::Config::CONFIG
-
-rubypath = c['bindir'] + '/' + c['ruby_install_name']
-
-major = c['MAJOR'].to_i
-minor = c['MINOR'].to_i
-teeny = c['TEENY'].to_i
-version = "#{major}.#{minor}"
-
-# ruby ver. >= 1.4.4?
-newpath_p = ((major >= 2) or
-             ((major == 1) and
-              ((minor >= 5) or
-               ((minor == 4) and (teeny >= 4)))))
-
-if c['rubylibdir']
-  # V < 1.6.3
-  _stdruby         = c['rubylibdir']
-  _siteruby        = c['sitedir']
-  _siterubyver     = c['sitelibdir']
-  _siterubyverarch = c['sitearchdir']
-elsif newpath_p
-  # 1.4.4 <= V <= 1.6.3
-  _stdruby         = "$prefix/lib/ruby/#{version}"
-  _siteruby        = c['sitedir']
-  _siterubyver     = "$siteruby/#{version}"
-  _siterubyverarch = "$siterubyver/#{c['arch']}"
-else
-  # V < 1.4.4
-  _stdruby         = "$prefix/lib/ruby/#{version}"
-  _siteruby        = "$prefix/lib/ruby/#{version}/site_ruby"
-  _siterubyver     = _siteruby
-  _siterubyverarch = "$siterubyver/#{c['arch']}"
-end
-libdir = '-* dummy libdir *-'
-stdruby = '-* dummy rubylibdir *-'
-siteruby = '-* dummy site_ruby *-'
-siterubyver = '-* dummy site_ruby version *-'
-parameterize = lambda {|path|
-  path.sub(/\A#{Regexp.quote(c['prefix'])}/, '$prefix')\
-      .sub(/\A#{Regexp.quote(libdir)}/,      '$libdir')\
-      .sub(/\A#{Regexp.quote(stdruby)}/,     '$stdruby')\
-      .sub(/\A#{Regexp.quote(siteruby)}/,    '$siteruby')\
-      .sub(/\A#{Regexp.quote(siterubyver)}/, '$siterubyver')
-}
-libdir          = parameterize.call(c['libdir'])
-stdruby         = parameterize.call(_stdruby)
-siteruby        = parameterize.call(_siteruby)
-siterubyver     = parameterize.call(_siterubyver)
-siterubyverarch = parameterize.call(_siterubyverarch)
-
-if arg = c['configure_args'].split.detect {|arg| /--with-make-prog=/ =~ arg }
-  makeprog = arg.sub(/'/, '').split(/=/, 2)[1]
-else
-  makeprog = 'make'
-end
-
-common_conf = [
-  PathItem.new('prefix', 'path', c['prefix'],
-               'path prefix of target environment'),
-  PathItem.new('bindir', 'path', parameterize.call(c['bindir']),
-               'the directory for commands'),
-  PathItem.new('libdir', 'path', libdir,
-               'the directory for libraries'),
-  PathItem.new('datadir', 'path', parameterize.call(c['datadir']),
-               'the directory for shared data'),
-  PathItem.new('mandir', 'path', parameterize.call(c['mandir']),
-               'the directory for man pages'),
-  PathItem.new('sysconfdir', 'path', parameterize.call(c['sysconfdir']),
-               'the directory for man pages'),
-  PathItem.new('stdruby', 'path', stdruby,
-               'the directory for standard ruby libraries'),
-  PathItem.new('siteruby', 'path', siteruby,
-      'the directory for version-independent aux ruby libraries'),
-  PathItem.new('siterubyver', 'path', siterubyver,
-               'the directory for aux ruby libraries'),
-  PathItem.new('siterubyverarch', 'path', siterubyverarch,
-               'the directory for aux ruby binaries'),
-  PathItem.new('rbdir', 'path', '$siterubyver',
-               'the directory for ruby scripts'),
-  PathItem.new('sodir', 'path', '$siterubyverarch',
-               'the directory for ruby extentions'),
-  PathItem.new('rubypath', 'path', rubypath,
-               'the path to set to #! line'),
-  ProgramItem.new('rubyprog', 'name', rubypath,
-                  'the ruby program using for installation'),
-  ProgramItem.new('makeprog', 'name', makeprog,
-                  'the make program to compile ruby extentions'),
-  SelectItem.new('shebang', 'all/ruby/never', 'ruby',
-                 'shebang line (#!) editing mode'),
-  BoolItem.new('without-ext', 'yes/no', 'no',
-               'does not compile/install ruby extentions')
-]
-class ConfigTable_class   # open again
-  ALIASES = {
-    'std-ruby'         => 'stdruby',
-    'site-ruby-common' => 'siteruby',     # For backward compatibility
-    'site-ruby'        => 'siterubyver',  # For backward compatibility
-    'bin-dir'          => 'bindir',
-    'bin-dir'          => 'bindir',
-    'rb-dir'           => 'rbdir',
-    'so-dir'           => 'sodir',
-    'data-dir'         => 'datadir',
-    'ruby-path'        => 'rubypath',
-    'ruby-prog'        => 'rubyprog',
-    'ruby'             => 'rubyprog',
-    'make-prog'        => 'makeprog',
-    'make'             => 'makeprog'
-  }
-end
-multipackage_conf = [
-  PackageSelectionItem.new('with', 'name,name...', '', 'ALL',
-                           'package names that you want to install'),
-  PackageSelectionItem.new('without', 'name,name...', '', 'NONE',
-                           'package names that you do not want to install')
-]
-if multipackage_install?
-  ConfigTable = ConfigTable_class.new(common_conf + multipackage_conf)
-else
-  ConfigTable = ConfigTable_class.new(common_conf)
-end
-
-
-module MetaConfigAPI
-
-  def eval_file_ifexist(fname)
-    instance_eval File.read(fname), fname, 1 if File.file?(fname)
-  end
-
-  def config_names
-    ConfigTable.map {|i| i.name }
-  end
-
-  def config?(name)
-    ConfigTable.key?(name)
-  end
-
-  def bool_config?(name)
-    ConfigTable.lookup(name).config_type == 'bool'
-  end
-
-  def path_config?(name)
-    ConfigTable.lookup(name).config_type == 'path'
-  end
-
-  def value_config?(name)
-    case ConfigTable.lookup(name).config_type
-    when 'bool', 'path'
-      true
-    else
-      false
-    end
-  end
-
-  def add_config(item)
-    ConfigTable.add item
-  end
-
-  def add_bool_config(name, default, desc)
-    ConfigTable.add BoolItem.new(name, 'yes/no', default ? 'yes' : 'no', desc)
-  end
-
-  def add_path_config(name, default, desc)
-    ConfigTable.add PathItem.new(name, 'path', default, desc)
-  end
-
-  def set_config_default(name, default)
-    ConfigTable.lookup(name).default = default
-  end
-
-  def remove_config(name)
-    ConfigTable.remove(name)
-  end
-
-end
-
-
-#
-# File Operations
-#
-
-module FileOperations
-
-  def mkdir_p(dirname, prefix = nil)
-    dirname = prefix + File.expand_path(dirname) if prefix
-    $stderr.puts "mkdir -p #{dirname}" if verbose?
-    return if no_harm?
-
-    # does not check '/'... it's too abnormal case
-    dirs = File.expand_path(dirname).split(%r<(?=/)>)
-    if /\A[a-z]:\z/i =~ dirs[0]
-      disk = dirs.shift
-      dirs[0] = disk + dirs[0]
-    end
-    dirs.each_index do |idx|
-      path = dirs[0..idx].join('')
-      Dir.mkdir path unless File.dir?(path)
-    end
-  end
-
-  def rm_f(fname)
-    $stderr.puts "rm -f #{fname}" if verbose?
-    return if no_harm?
-
-    if File.exist?(fname) or File.symlink?(fname)
-      File.chmod 0777, fname
-      File.unlink fname
-    end
-  end
-
-  def rm_rf(dn)
-    $stderr.puts "rm -rf #{dn}" if verbose?
-    return if no_harm?
-
-    Dir.chdir dn
-    Dir.foreach('.') do |fn|
-      next if fn == '.'
-      next if fn == '..'
-      if File.dir?(fn)
-        verbose_off {
-          rm_rf fn
-        }
-      else
-        verbose_off {
-          rm_f fn
-        }
-      end
-    end
-    Dir.chdir '..'
-    Dir.rmdir dn
-  end
-
-  def move_file(src, dest)
-    File.unlink dest if File.exist?(dest)
-    begin
-      File.rename src, dest
-    rescue
-      File.open(dest, 'wb') {|f| f.write File.binread(src) }
-      File.chmod File.stat(src).mode, dest
-      File.unlink src
-    end
-  end
-
-  def install(from, dest, mode, prefix = nil)
-    $stderr.puts "install #{from} #{dest}" if verbose?
-    return if no_harm?
-
-    realdest = prefix ? prefix + File.expand_path(dest) : dest
-    realdest = File.join(realdest, File.basename(from)) if File.dir?(realdest)
-    str = File.binread(from)
-    if diff?(str, realdest)
-      verbose_off {
-        rm_f realdest if File.exist?(realdest)
-      }
-      File.open(realdest, 'wb') {|f|
-        f.write str
-      }
-      File.chmod mode, realdest
-
-      File.open("#{objdir_root()}/InstalledFiles", 'a') {|f|
-        if prefix
-          f.puts realdest.sub(prefix, '')
-        else
-          f.puts realdest
-        end
-      }
-    end
-  end
-
-  def diff?(new_content, path)
-    return true unless File.exist?(path)
-    new_content != File.binread(path)
-  end
-
-  def command(str)
-    $stderr.puts str if verbose?
-    system str or raise RuntimeError, "'system #{str}' failed"
-  end
-
-  def ruby(str)
-    command config('rubyprog') + ' ' + str
-  end
-  
-  def make(task = '')
-    command config('makeprog') + ' ' + task
-  end
-
-  def extdir?(dir)
-    File.exist?(dir + '/MANIFEST')
-  end
-
-  def all_files_in(dirname)
-    Dir.open(dirname) {|d|
-      return d.select {|ent| File.file?("#{dirname}/#{ent}") }
-    }
-  end
-
-  REJECT_DIRS = %w(
-    CVS SCCS RCS CVS.adm .svn
-  )
-
-  def all_dirs_in(dirname)
-    Dir.open(dirname) {|d|
-      return d.select {|n| File.dir?("#{dirname}/#{n}") } - %w(. ..) - REJECT_DIRS
-    }
-  end
-
-end
-
-
-#
-# Main Installer
-#
-
-module HookUtils
-
-  def run_hook(name)
-    try_run_hook "#{curr_srcdir()}/#{name}" or
-    try_run_hook "#{curr_srcdir()}/#{name}.rb"
-  end
-
-  def try_run_hook(fname)
-    return false unless File.file?(fname)
-    begin
-      instance_eval File.read(fname), fname, 1
-    rescue
-      setup_rb_error "hook #{fname} failed:\n" + $!.message
-    end
-    true
-  end
-
-end
-
-
-module HookScriptAPI
-
-  def get_config(key)
-    @config[key]
-  end
-
-  alias config get_config
-
-  def set_config(key, val)
-    @config[key] = val
-  end
-
-  #
-  # srcdir/objdir (works only in the package directory)
-  #
-
-  #abstract srcdir_root
-  #abstract objdir_root
-  #abstract relpath
-
-  def curr_srcdir
-    "#{srcdir_root()}/#{relpath()}"
-  end
-
-  def curr_objdir
-    "#{objdir_root()}/#{relpath()}"
-  end
-
-  def srcfile(path)
-    "#{curr_srcdir()}/#{path}"
-  end
-
-  def srcexist?(path)
-    File.exist?(srcfile(path))
-  end
-
-  def srcdirectory?(path)
-    File.dir?(srcfile(path))
-  end
-  
-  def srcfile?(path)
-    File.file? srcfile(path)
-  end
-
-  def srcentries(path = '.')
-    Dir.open("#{curr_srcdir()}/#{path}") {|d|
-      return d.to_a - %w(. ..)
-    }
-  end
-
-  def srcfiles(path = '.')
-    srcentries(path).select {|fname|
-      File.file?(File.join(curr_srcdir(), path, fname))
-    }
-  end
-
-  def srcdirectories(path = '.')
-    srcentries(path).select {|fname|
-      File.dir?(File.join(curr_srcdir(), path, fname))
-    }
-  end
-
-end
-
-
-class ToplevelInstaller
-
-  Version   = '3.3.1'
-  Copyright = 'Copyright (c) 2000-2004 Minero Aoki'
-
-  TASKS = [
-    [ 'all',      'do config, setup, then install' ],
-    [ 'config',   'saves your configurations' ],
-    [ 'show',     'shows current configuration' ],
-    [ 'setup',    'compiles ruby extentions and others' ],
-    [ 'install',  'installs files' ],
-    [ 'clean',    "does `make clean' for each extention" ],
-    [ 'distclean',"does `make distclean' for each extention" ]
-  ]
-
-  def ToplevelInstaller.invoke
-    instance().invoke
-  end
-
-  @singleton = nil
-
-  def ToplevelInstaller.instance
-    @singleton ||= new(File.dirname($0))
-    @singleton
-  end
-
-  include MetaConfigAPI
-
-  def initialize(ardir_root)
-    @config = nil
-    @options = { 'verbose' => true }
-    @ardir = File.expand_path(ardir_root)
-  end
-
-  def inspect
-    "#<#{self.class} #{__id__()}>"
-  end
-
-  def invoke
-    run_metaconfigs
-    case task = parsearg_global()
-    when nil, 'all'
-      @config = load_config('config')
-      parsearg_config
-      init_installers
-      exec_config
-      exec_setup
-      exec_install
-    else
-      @config = load_config(task)
-      __send__ "parsearg_#{task}"
-      init_installers
-      __send__ "exec_#{task}"
-    end
-  end
-  
-  def run_metaconfigs
-    eval_file_ifexist "#{@ardir}/metaconfig"
-  end
-
-  def load_config(task)
-    case task
-    when 'config'
-      ConfigTable.new
-    when 'clean', 'distclean'
-      if File.exist?(ConfigTable.savefile)
-      then ConfigTable.load
-      else ConfigTable.new
-      end
-    else
-      ConfigTable.load
-    end
-  end
-
-  def init_installers
-    @installer = Installer.new(@config, @options, @ardir, File.expand_path('.'))
-  end
-
-  #
-  # Hook Script API bases
-  #
-
-  def srcdir_root
-    @ardir
-  end
-
-  def objdir_root
-    '.'
-  end
-
-  def relpath
-    '.'
-  end
-
-  #
-  # Option Parsing
-  #
-
-  def parsearg_global
-    valid_task = /\A(?:#{TASKS.map {|task,desc| task }.join '|'})\z/
-
-    while arg = ARGV.shift
-      case arg
-      when /\A\w+\z/
-        setup_rb_error "invalid task: #{arg}" unless valid_task =~ arg
-        return arg
-
-      when '-q', '--quiet'
-        @options['verbose'] = false
-
-      when       '--verbose'
-        @options['verbose'] = true
-
-      when '-h', '--help'
-        print_usage $stdout
-        exit 0
-
-      when '-v', '--version'
-        puts "#{File.basename($0)} version #{Version}"
-        exit 0
-      
-      when '--copyright'
-        puts Copyright
-        exit 0
-
-      else
-        setup_rb_error "unknown global option '#{arg}'"
-      end
-    end
-
-    nil
-  end
-
-
-  def parsearg_no_options
-    unless ARGV.empty?
-      setup_rb_error "#{task}:  unknown options: #{ARGV.join ' '}"
-    end
-  end
-
-  alias parsearg_show       parsearg_no_options
-  alias parsearg_setup      parsearg_no_options
-  alias parsearg_clean      parsearg_no_options
-  alias parsearg_distclean  parsearg_no_options
-
-  def parsearg_config
-    re = /\A--(#{ConfigTable.map {|i| i.name }.join('|')})(?:=(.*))?\z/
-    @options['config-opt'] = []
-
-    while i = ARGV.shift
-      if /\A--?\z/ =~ i
-        @options['config-opt'] = ARGV.dup
-        break
-      end
-      m = re.match(i)  or setup_rb_error "config: unknown option #{i}"
-      name, value = *m.to_a[1,2]
-      @config[name] = value
-    end
-  end
-
-  def parsearg_install
-    @options['no-harm'] = false
-    @options['install-prefix'] = ''
-    while a = ARGV.shift
-      case a
-      when /\A--no-harm\z/
-        @options['no-harm'] = true
-      when /\A--prefix=(.*)\z/
-        path = $1
-        path = File.expand_path(path) unless path[0,1] == '/'
-        @options['install-prefix'] = path
-      else
-        setup_rb_error "install: unknown option #{a}"
-      end
-    end
-  end
-
-  def print_usage(out)
-    out.puts 'Typical Installation Procedure:'
-    out.puts "  $ ruby #{File.basename $0} config"
-    out.puts "  $ ruby #{File.basename $0} setup"
-    out.puts "  # ruby #{File.basename $0} install (may require root privilege)"
-    out.puts
-    out.puts 'Detailed Usage:'
-    out.puts "  ruby #{File.basename $0} <global option>"
-    out.puts "  ruby #{File.basename $0} [<global options>] <task> [<task options>]"
-
-    fmt = "  %-24s %s\n"
-    out.puts
-    out.puts 'Global options:'
-    out.printf fmt, '-q,--quiet',   'suppress message outputs'
-    out.printf fmt, '   --verbose', 'output messages verbosely'
-    out.printf fmt, '-h,--help',    'print this message'
-    out.printf fmt, '-v,--version', 'print version and quit'
-    out.printf fmt, '   --copyright',  'print copyright and quit'
-    out.puts
-    out.puts 'Tasks:'
-    TASKS.each do |name, desc|
-      out.printf fmt, name, desc
-    end
-
-    fmt = "  %-24s %s [%s]\n"
-    out.puts
-    out.puts 'Options for CONFIG or ALL:'
-    ConfigTable.each do |item|
-      out.printf fmt, item.help_opt, item.description, item.help_default
-    end
-    out.printf fmt, '--rbconfig=path', 'rbconfig.rb to load',"running ruby's"
-    out.puts
-    out.puts 'Options for INSTALL:'
-    out.printf fmt, '--no-harm', 'only display what to do if given', 'off'
-    out.printf fmt, '--prefix=path',  'install path prefix', '$prefix'
-    out.puts
-  end
-
-  #
-  # Task Handlers
-  #
-
-  def exec_config
-    @installer.exec_config
-    @config.save   # must be final
-  end
-
-  def exec_setup
-    @installer.exec_setup
-  end
-
-  def exec_install
-    @installer.exec_install
-  end
-
-  def exec_show
-    ConfigTable.each do |i|
-      printf "%-20s %s\n", i.name, i.value
-    end
-  end
-
-  def exec_clean
-    @installer.exec_clean
-  end
-
-  def exec_distclean
-    @installer.exec_distclean
-  end
-
-end
-
-
-class ToplevelInstallerMulti < ToplevelInstaller
-
-  include HookUtils
-  include HookScriptAPI
-  include FileOperations
-
-  def initialize(ardir)
-    super
-    @packages = all_dirs_in("#{@ardir}/packages")
-    raise 'no package exists' if @packages.empty?
-  end
-
-  def run_metaconfigs
-    eval_file_ifexist "#{@ardir}/metaconfig"
-    @packages.each do |name|
-      eval_file_ifexist "#{@ardir}/packages/#{name}/metaconfig"
-    end
-  end
-
-  def init_installers
-    @installers = {}
-    @packages.each do |pack|
-      @installers[pack] = Installer.new(@config, @options,
-                                       "#{@ardir}/packages/#{pack}",
-                                       "packages/#{pack}")
-    end
-
-    with    = extract_selection(config('with'))
-    without = extract_selection(config('without'))
-    @selected = @installers.keys.select {|name|
-                  (with.empty? or with.include?(name)) \
-                      and not without.include?(name)
-                }
-  end
-
-  def extract_selection(list)
-    a = list.split(/,/)
-    a.each do |name|
-      setup_rb_error "no such package: #{name}"  unless @installers.key?(name)
-    end
-    a
-  end
-
-  def print_usage(f)
-    super
-    f.puts 'Inluded packages:'
-    f.puts '  ' + @packages.sort.join(' ')
-    f.puts
-  end
-
-  #
-  # multi-package metaconfig API
-  #
-
-  attr_reader :packages
-
-  def declare_packages(list)
-    raise 'package list is empty' if list.empty?
-    list.each do |name|
-      raise "directory packages/#{name} does not exist"\
-              unless File.dir?("#{@ardir}/packages/#{name}")
-    end
-    @packages = list
-  end
-
-  #
-  # Task Handlers
-  #
-
-  def exec_config
-    run_hook 'pre-config'
-    each_selected_installers {|inst| inst.exec_config }
-    run_hook 'post-config'
-    @config.save   # must be final
-  end
-
-  def exec_setup
-    run_hook 'pre-setup'
-    each_selected_installers {|inst| inst.exec_setup }
-    run_hook 'post-setup'
-  end
-
-  def exec_install
-    run_hook 'pre-install'
-    each_selected_installers {|inst| inst.exec_install }
-    run_hook 'post-install'
-  end
-
-  def exec_clean
-    rm_f ConfigTable.savefile
-    run_hook 'pre-clean'
-    each_selected_installers {|inst| inst.exec_clean }
-    run_hook 'post-clean'
-  end
-
-  def exec_distclean
-    rm_f ConfigTable.savefile
-    run_hook 'pre-distclean'
-    each_selected_installers {|inst| inst.exec_distclean }
-    run_hook 'post-distclean'
-  end
-
-  #
-  # lib
-  #
-
-  def each_selected_installers
-    Dir.mkdir 'packages' unless File.dir?('packages')
-    @selected.each do |pack|
-      $stderr.puts "Processing the package `#{pack}' ..." if @options['verbose']
-      Dir.mkdir "packages/#{pack}" unless File.dir?("packages/#{pack}")
-      Dir.chdir "packages/#{pack}"
-      yield @installers[pack]
-      Dir.chdir '../..'
-    end
-  end
-
-  def verbose?
-    @options['verbose']
-  end
-
-  def no_harm?
-    @options['no-harm']
-  end
-
-end
-
-
-class Installer
-
-  FILETYPES = %w( bin lib ext data )
-
-  include HookScriptAPI
-  include HookUtils
-  include FileOperations
-
-  def initialize(config, opt, srcroot, objroot)
-    @config = config
-    @options = opt
-    @srcdir = File.expand_path(srcroot)
-    @objdir = File.expand_path(objroot)
-    @currdir = '.'
-  end
-
-  def inspect
-    "#<#{self.class} #{File.basename(@srcdir)}>"
-  end
-
-  #
-  # Hook Script API base methods
-  #
-
-  def srcdir_root
-    @srcdir
-  end
-
-  def objdir_root
-    @objdir
-  end
-
-  def relpath
-    @currdir
-  end
-
-  #
-  # configs/options
-  #
-
-  def no_harm?
-    @options['no-harm']
-  end
-
-  def verbose?
-    @options['verbose']
-  end
-
-  def verbose_off
-    begin
-      save, @options['verbose'] = @options['verbose'], false
-      yield
-    ensure
-      @options['verbose'] = save
-    end
-  end
-
-  #
-  # TASK config
-  #
-
-  def exec_config
-    exec_task_traverse 'config'
-  end
-
-  def config_dir_bin(rel)
-  end
-
-  def config_dir_lib(rel)
-  end
-
-  def config_dir_ext(rel)
-    extconf if extdir?(curr_srcdir())
-  end
-
-  def extconf
-    opt = @options['config-opt'].join(' ')
-    command "#{config('rubyprog')} #{curr_srcdir()}/extconf.rb #{opt}"
-  end
-
-  def config_dir_data(rel)
-  end
-
-  #
-  # TASK setup
-  #
-
-  def exec_setup
-    exec_task_traverse 'setup'
-  end
-
-  def setup_dir_bin(rel)
-    all_files_in(curr_srcdir()).each do |fname|
-      adjust_shebang "#{curr_srcdir()}/#{fname}"
-    end
-  end
-
-  def adjust_shebang(path)
-    return if no_harm?
-    tmpfile = File.basename(path) + '.tmp'
-    begin
-      File.open(path, 'rb') {|r|
-        first = r.gets
-        return unless File.basename(config('rubypath')) == 'ruby'
-        return unless File.basename(first.sub(/\A\#!/, '').split[0]) == 'ruby'
-        $stderr.puts "adjusting shebang: #{File.basename(path)}" if verbose?
-        File.open(tmpfile, 'wb') {|w|
-          w.print first.sub(/\A\#!\s*\S+/, '#! ' + config('rubypath'))
-          w.write r.read
-        }
-        move_file tmpfile, File.basename(path)
-      }
-    ensure
-      File.unlink tmpfile if File.exist?(tmpfile)
-    end
-  end
-
-  def setup_dir_lib(rel)
-  end
-
-  def setup_dir_ext(rel)
-    make if extdir?(curr_srcdir())
-  end
-
-  def setup_dir_data(rel)
-  end
-
-  #
-  # TASK install
-  #
-
-  def exec_install
-    rm_f 'InstalledFiles'
-    exec_task_traverse 'install'
-  end
-
-  def install_dir_bin(rel)
-    install_files collect_filenames_auto(), "#{config('bindir')}/#{rel}", 0755
-  end
-
-  def install_dir_lib(rel)
-    install_files ruby_scripts(), "#{config('rbdir')}/#{rel}", 0644
-  end
-
-  def install_dir_ext(rel)
-    return unless extdir?(curr_srcdir())
-    install_files ruby_extentions('.'),
-                  "#{config('sodir')}/#{File.dirname(rel)}",
-                  0555
-  end
-
-  def install_dir_data(rel)
-    install_files collect_filenames_auto(), "#{config('datadir')}/#{rel}", 0644
-  end
-
-  def install_files(list, dest, mode)
-    mkdir_p dest, @options['install-prefix']
-    list.each do |fname|
-      install fname, dest, mode, @options['install-prefix']
-    end
-  end
-
-  def ruby_scripts
-    collect_filenames_auto().select {|n| /\.rb\z/ =~ n }
-  end
-  
-  # picked up many entries from cvs-1.11.1/src/ignore.c
-  reject_patterns = %w( 
-    core RCSLOG tags TAGS .make.state
-    .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
-    *~ *.old *.bak *.BAK *.orig *.rej _$* *$
-
-    *.org *.in .*
-  )
-  mapping = {
-    '.' => '\.',
-    '$' => '\$',
-    '#' => '\#',
-    '*' => '.*'
-  }
-  REJECT_PATTERNS = Regexp.new('\A(?:' +
-                               reject_patterns.map {|pat|
-                                 pat.gsub(/[\.\$\#\*]/) {|ch| mapping[ch] }
-                               }.join('|') +
-                               ')\z')
-
-  def collect_filenames_auto
-    mapdir((existfiles() - hookfiles()).reject {|fname|
-             REJECT_PATTERNS =~ fname
-           })
-  end
-
-  def existfiles
-    all_files_in(curr_srcdir()) | all_files_in('.')
-  end
-
-  def hookfiles
-    %w( pre-%s post-%s pre-%s.rb post-%s.rb ).map {|fmt|
-      %w( config setup install clean ).map {|t| sprintf(fmt, t) }
-    }.flatten
-  end
-
-  def mapdir(filelist)
-    filelist.map {|fname|
-      if File.exist?(fname)   # objdir
-        fname
-      else                    # srcdir
-        File.join(curr_srcdir(), fname)
-      end
-    }
-  end
-
-  def ruby_extentions(dir)
-    Dir.open(dir) {|d|
-      ents = d.select {|fname| /\.#{::Config::CONFIG['DLEXT']}\z/ =~ fname }
-      if ents.empty?
-        setup_rb_error "no ruby extention exists: 'ruby #{$0} setup' first"
-      end
-      return ents
-    }
-  end
-
-  #
-  # TASK clean
-  #
-
-  def exec_clean
-    exec_task_traverse 'clean'
-    rm_f ConfigTable.savefile
-    rm_f 'InstalledFiles'
-  end
-
-  def clean_dir_bin(rel)
-  end
-
-  def clean_dir_lib(rel)
-  end
-
-  def clean_dir_ext(rel)
-    return unless extdir?(curr_srcdir())
-    make 'clean' if File.file?('Makefile')
-  end
-
-  def clean_dir_data(rel)
-  end
-
-  #
-  # TASK distclean
-  #
-
-  def exec_distclean
-    exec_task_traverse 'distclean'
-    rm_f ConfigTable.savefile
-    rm_f 'InstalledFiles'
-  end
-
-  def distclean_dir_bin(rel)
-  end
-
-  def distclean_dir_lib(rel)
-  end
-
-  def distclean_dir_ext(rel)
-    return unless extdir?(curr_srcdir())
-    make 'distclean' if File.file?('Makefile')
-  end
-
-  #
-  # lib
-  #
-
-  def exec_task_traverse(task)
-    run_hook "pre-#{task}"
-    FILETYPES.each do |type|
-      if config('without-ext') == 'yes' and type == 'ext'
-        $stderr.puts 'skipping ext/* by user option' if verbose?
-        next
-      end
-      traverse task, type, "#{task}_dir_#{type}"
-    end
-    run_hook "post-#{task}"
-  end
-
-  def traverse(task, rel, mid)
-    dive_into(rel) {
-      run_hook "pre-#{task}"
-      __send__ mid, rel.sub(%r[\A.*?(?:/|\z)], '')
-      all_dirs_in(curr_srcdir()).each do |d|
-        traverse task, "#{rel}/#{d}", mid
-      end
-      run_hook "post-#{task}"
-    }
-  end
-
-  def dive_into(rel)
-    return unless File.dir?("#{@srcdir}/#{rel}")
-
-    dir = File.basename(rel)
-    Dir.mkdir dir unless File.dir?(dir)
-    prevdir = Dir.pwd
-    Dir.chdir dir
-    $stderr.puts '---> ' + rel if verbose?
-    @currdir = rel
-    yield
-    Dir.chdir prevdir
-    $stderr.puts '<--- ' + rel if verbose?
-    @currdir = File.dirname(rel)
-  end
-
-end
-
-
-if $0 == __FILE__
-  begin
-    if multipackage_install?
-      ToplevelInstallerMulti.invoke
-    else
-      ToplevelInstaller.invoke
-    end
-  rescue SetupError
-    raise if $DEBUG
-    $stderr.puts $!.message
-    $stderr.puts "Try 'ruby #{$0} --help' for detailed usage."
-    exit 1
-  end
-end

From 3ccca2fda0362c87597de5c2e0ce5c59423e160b Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 13 May 2015 12:21:37 +0100
Subject: [PATCH 29/76] save never invoked

---
 app/models/server.rb | 45 --------------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/app/models/server.rb b/app/models/server.rb
index 6962480..1725dbd 100644
--- a/app/models/server.rb
+++ b/app/models/server.rb
@@ -111,51 +111,6 @@ class Server < ActiveRecord::Base
     self.category_id = (domain == DOMAIN_NS2 ? 45 : 44 )
   end
 
-  def save_demos
-    dir = case recordable_type
-          when "Match" then
-            recordable.contest.demos
-          when "Gather" then
-            Directory.find(Directory::DEMOS_GATHERS)
-          end
-
-    dir ||= Directory.find(Directory::DEMOS_DEFAULT)
-    zip_path = File.join(dir.path, recording + ".zip")
-
-    Zip::ZipOutputStream::open(zip_path) do |zos|
-      if recordable_type == "Match"
-        zos.put_next_entry "readme.txt"
-        zos.write "Team1: " + recordable.contester1.to_s + "\r\n"
-        zos.write "Team2: " + recordable.contester2.to_s + "\r\n"
-        zos.write "Date: " + recordable.match_time.to_s + "\r\n"
-        zos.write "Contest: " + recordable.contest.to_s + "\r\n"
-        zos.write "Server: " + recordable.server.addr + "\r\n" if recordable.server
-        zos.write "HLTV: " + addr + "\r\n"
-        zos.write YAML::dump(recordable.attributes).to_s
-      end
-      Dir.glob("#{DEMOS}/*").each do |file|
-        if File.file?(file) and file.match(/#{recording}.*\.dem/)
-          zos.put_next_entry File.basename(file)
-          zos.write(IO.read(file))
-        end
-      end
-    end
-
-    DataFile.transaction do
-      unless dbfile = DataFile.find_by_path(zip_path)
-        dbfile = DataFile.new
-        dbfile.path = zip_path
-        dbfile.directory = dir
-        dbfile.save!
-        DataFile.update_all({:name => File.basename(zip_path)}, {:id => dbfile.id})
-      end
-      if recordable_type == "Match"
-        recordable.demo = dbfile
-        recordable.save
-      end
-    end
-  end
-
   def is_free time
     challenges.around(time).pending.count == 0 and matches.around(time).count == 0
   end

From eddf133593c5ae9aef28a9c1d981fd55c6338ddb Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 13 May 2015 12:23:52 +0100
Subject: [PATCH 30/76] Update deps

---
 Gemfile.lock | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0701597..b02d36d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -119,7 +119,6 @@ GEM
     ffi (1.9.3)
     font-awesome-sass (4.1.0)
       sass (~> 3.2)
-    gruff (0.3.7)
     haml (4.0.5)
       tilt
     hike (1.2.3)
@@ -284,7 +283,6 @@ DEPENDENCIES
   factory_girl_rails (~> 4.4.1)
   faraday (~> 0.9.0)
   font-awesome-sass (~> 4.1.0.0)
-  gruff (~> 0.3.6)
   haml (~> 4.0.5)
   jquery-rails (~> 2.0.2)
   mysql2 (~> 0.3.15)

From 2d58884fafb622ec04137b3316426e1563a99cec Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 13 May 2015 12:31:29 +0100
Subject: [PATCH 31/76] hltvs not used in index template

---
 app/controllers/servers_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb
index 2df8ae4..e1137aa 100644
--- a/app/controllers/servers_controller.rb
+++ b/app/controllers/servers_controller.rb
@@ -4,7 +4,6 @@ class ServersController < ApplicationController
   def index
     @servers = Server.hlds.active.ordered.all :include => :user
     @ns2 = Server.ns2.active.ordered.all :include => :user
-    @hltvs = Server.hltvs.active.ordered.all :include => :user
     @officials = Server.ns2.active.ordered.where ["name LIKE ?", "%NSL%"]
   end
 

From 57dab5021cce7bc4b8d8a05ed58e39bda0a3a873 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 13 May 2015 12:34:35 +0100
Subject: [PATCH 32/76] Not able to find references to these views

---
 app/views/servers/_response.html.erb | 7 -------
 app/views/servers/_response.xml.erb  | 7 -------
 2 files changed, 14 deletions(-)
 delete mode 100644 app/views/servers/_response.html.erb
 delete mode 100644 app/views/servers/_response.xml.erb

diff --git a/app/views/servers/_response.html.erb b/app/views/servers/_response.html.erb
deleted file mode 100644
index 7aa21fa..0000000
--- a/app/views/servers/_response.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% @server.logs.recent.reverse_each do |log| %>
- <% if log.domain == Log::DOMAIN_RCON_COMMAND %>
- <pre class="command"><%= log.text %></pre>
-        <% elsif log.domain == Log::DOMAIN_RCON_RESPONSE %>
- <pre class="response"><%= log.text %></pre>
-        <% end %>
-      <% end %>
diff --git a/app/views/servers/_response.xml.erb b/app/views/servers/_response.xml.erb
deleted file mode 100644
index 6481654..0000000
--- a/app/views/servers/_response.xml.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<% @server.logs.recent.reverse_each do |log| %>
-	<% if log.domain == Log::DOMAIN_RCON_COMMAND %>
-		<pre class="command"><%= log.text %></pre>
-	<% elsif log.domain == Log::DOMAIN_RCON_RESPONSE %>
-		<pre class="response"><%= log.text %></pre>
-	<% end %>
-<% end %>
\ No newline at end of file

From 195a287fadadb002cb79e9ff3d2ef5b63e10b074 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Wed, 13 May 2015 12:34:55 +0100
Subject: [PATCH 33/76] No corresponding log method on servers controller

---
 app/views/servers/log.html.erb | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 app/views/servers/log.html.erb

diff --git a/app/views/servers/log.html.erb b/app/views/servers/log.html.erb
deleted file mode 100644
index d3a0e9d..0000000
--- a/app/views/servers/log.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<h1>
-  Server Log: <%= h @server %>
-</h1>
-
-<div class="box wide">
-  <table class="data">
-    <tr>
-      <th width="10%">Date</th>
-      <th width="10%">Type</th>
-      <th width="80%">Message</th>
-    </tr>
-
-    <% @server.logs.each do |log| %>
-      <tr class="<%= cycle('even', 'odd') %>">
-        <td><%= shorttime log.created_at %></td>
-        <td><%= log.domains[log.domain] %></td>
-        <td><%= h log.text %></td>
-      </tr>
-    <% end %>
-  </table>
-</div>

From 1d0f4ba2e665c67968bc15eb424d4c9918f198a3 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Thu, 14 May 2015 17:27:12 +0100
Subject: [PATCH 34/76] Added ns server specs

---
 spec/factories/group.rb                       | 12 +++
 spec/factories/grouper.rb                     |  5 +
 spec/factories/server.rb                      |  8 ++
 spec/factories/user.rb                        |  7 ++
 .../features/servers/server_administration.rb | 30 ++++++
 spec/features/servers/user_servers.rb         | 14 +++
 spec/models/server_spec.rb                    | 98 +++++++++++++++++++
 spec/spec_helper.rb                           |  1 +
 spec/support/features/server_helpers.rb       | 49 ++++++++++
 9 files changed, 224 insertions(+)
 create mode 100644 spec/factories/group.rb
 create mode 100644 spec/factories/grouper.rb
 create mode 100644 spec/factories/server.rb
 create mode 100644 spec/features/servers/server_administration.rb
 create mode 100644 spec/features/servers/user_servers.rb
 create mode 100644 spec/models/server_spec.rb
 create mode 100644 spec/support/features/server_helpers.rb

diff --git a/spec/factories/group.rb b/spec/factories/group.rb
new file mode 100644
index 0000000..0a101b3
--- /dev/null
+++ b/spec/factories/group.rb
@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :group do
+  	sequence(:id) { |n| n + 100 } # Preserve first 100
+    sequence(:name) { |n| "Group#{n}" }
+    association :founder, factory: :user
+  end
+
+  trait :admin do
+  	name "Admins"
+  	id Group::ADMINS
+  end
+end
diff --git a/spec/factories/grouper.rb b/spec/factories/grouper.rb
new file mode 100644
index 0000000..54c492b
--- /dev/null
+++ b/spec/factories/grouper.rb
@@ -0,0 +1,5 @@
+FactoryGirl.define do
+	factory :grouper do
+		sequence(:task) { |n| "Task#{n}" }
+	end
+end
\ No newline at end of file
diff --git a/spec/factories/server.rb b/spec/factories/server.rb
new file mode 100644
index 0000000..837c9ad
--- /dev/null
+++ b/spec/factories/server.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+	factory :server do
+		sequence(:name) { |n| "ServerName#{n}" }
+		sequence(:dns) { |n| "DNS#{n}" }
+		sequence(:ip) { |n| "192.168.#{n % 255}.#{n}" }
+		sequence(:port) { |n| "#{1000 + n}" }
+	end
+end
\ No newline at end of file
diff --git a/spec/factories/user.rb b/spec/factories/user.rb
index fc5f7aa..9b15973 100644
--- a/spec/factories/user.rb
+++ b/spec/factories/user.rb
@@ -13,6 +13,13 @@ FactoryGirl.define do
       create(:profile, user: user)
     end
 
+    trait :admin do
+      after(:create) do |user|
+        group = create(:group, :admin)
+        create :grouper, user: user, group: group
+      end
+    end
+
     factory :user_with_team do
       after(:create) do |user|
         create(:team, founder: user)
diff --git a/spec/features/servers/server_administration.rb b/spec/features/servers/server_administration.rb
new file mode 100644
index 0000000..fa6e125
--- /dev/null
+++ b/spec/features/servers/server_administration.rb
@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+feature 'Server Administration' do
+	let!(:admin) { create :user, :admin }  
+
+	background do
+		sign_in_as admin
+	end
+
+	scenario 'creating a server' do
+		visit servers_path
+		expect(page).to have_content('Listing Servers')
+		click_link 'New server'
+		test_server_creation_and_editing
+		visit servers_path
+		expect(page).to have_content Server.last.name
+	end
+
+	feature 'Server deletion' do
+		let!(:server) { create :server }
+		scenario 'deleting a server' do
+			visit servers_path
+			expect(page).to have_content(server.name)
+			visit server_path(server)
+			click_link 'Delete Server'
+			visit servers_path
+			expect(page).to_not have_content(server.name)
+		end
+	end
+end
diff --git a/spec/features/servers/user_servers.rb b/spec/features/servers/user_servers.rb
new file mode 100644
index 0000000..d8b20d1
--- /dev/null
+++ b/spec/features/servers/user_servers.rb
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+feature 'User created servers' do
+  let!(:user) { create :user }
+
+  background do
+    sign_in_as user
+  end
+
+  scenario 'Creating and updating a server' do
+    visit new_server_path
+    test_server_creation_and_editing
+  end
+end
\ No newline at end of file
diff --git a/spec/models/server_spec.rb b/spec/models/server_spec.rb
new file mode 100644
index 0000000..19374e8
--- /dev/null
+++ b/spec/models/server_spec.rb
@@ -0,0 +1,98 @@
+# == Schema Information
+#
+# Table name: servers
+#
+#  id              :integer          not null, primary key
+#  name            :string(255)
+#  description     :string(255)
+#  dns             :string(255)
+#  ip              :string(255)
+#  port            :string(255)
+#  rcon            :string(255)
+#  password        :string(255)
+#  irc             :string(255)
+#  user_id         :integer
+#  official        :boolean
+#  created_at      :datetime
+#  updated_at      :datetime
+#  map             :string(255)
+#  players         :integer
+#  max_players     :integer
+#  ping            :string(255)
+#  version         :integer
+#  domain          :integer          default(0), not null
+#  reservation     :string(255)
+#  recording       :string(255)
+#  idle            :datetime
+#  default_id      :integer
+#  active          :boolean          default(TRUE), not null
+#  recordable_type :string(255)
+#  recordable_id   :integer
+#  category_id     :integer
+#
+
+require 'spec_helper'
+
+describe Server do
+	describe 'create' do
+		it 'sets category to 45 if domain is NS2' do
+			server = create :server, domain: Server::DOMAIN_NS2
+			expect(server.category_id).to eq(45)
+		end
+		it 'sets category to 44 if domain is not NS2' do
+			server = create :server, domain: Server::DOMAIN_HLDS
+			expect(server.category_id).to eq(44)
+		end
+	end
+
+	describe 'addr' do
+		it 'returns properly formatted IP and port number' do
+			ip = '1.1.1.1'
+			port = '8000'
+			server = create :server, ip: ip, port: port
+			expect(server.addr).to eq('1.1.1.1:8000')
+		end
+	end
+
+	describe 'to_s' do
+		it 'returns server name' do
+			server_name = "Foo"
+			server = create :server, name: server_name
+			expect(server.to_s).to eq(server_name)
+		end
+	end
+
+	describe 'Permissions' do
+		let!(:user) { create :user }
+		let!(:admin) { create :user, :admin }
+		let!(:server_user) {create :user }
+		let!(:server) { create :server, user: server_user }
+
+		describe 'can_create?' do
+			it 'returns true for non-admins' do
+				expect(server.can_create? user).to be_true
+			end
+		end
+
+		describe 'can_destroy?' do
+			it 'returns true for admin' do
+				expect(server.can_destroy? admin).to be_true
+			end
+			it 'returns false for non-admins' do
+				expect(server.can_destroy? user).to be_false
+			end
+		end
+
+		describe 'can_update?' do
+			it 'returns true for admin' do
+				expect(server.can_update? admin).to be_true
+			end
+			it 'returns true if server belongs to user' do
+				expect(server.can_update? server_user).to be_true
+			end
+			it 'returns false for non-admins' do
+				expect(server.can_update? user).to be_false
+			end
+		end
+	end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f2956e2..8e8b650 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -26,6 +26,7 @@ RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   config.include Controllers::JsonHelpers, type: :controller
   config.include Features::FormHelpers, type: :feature
+  config.include Features::ServerHelpers, type: :feature
   config.include Features::SessionHelpers, type: :feature
 
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
diff --git a/spec/support/features/server_helpers.rb b/spec/support/features/server_helpers.rb
new file mode 100644
index 0000000..b28df90
--- /dev/null
+++ b/spec/support/features/server_helpers.rb
@@ -0,0 +1,49 @@
+module Features
+  module ServerHelpers
+    def test_server_creation_and_editing
+      dns = 'ServerDns.com'
+      ip = '192.168.1.1'
+      port = '8000'
+      rcon = 'whatsrcon'
+      password = 'secret'
+      name = 'MyNsServer'
+      description = 'My NS Server'
+      irc = '#some_channel'
+
+      visit new_server_path
+      fill_in 'Dns', with: dns
+      fill_in 'server_ip', with: ip
+      fill_in 'server_port', with: port
+      fill_in 'Password', with: password
+      fill_in 'Name', with: name
+      fill_in 'Description', with: description
+      fill_in 'Irc', with: irc
+      check 'Available for officials?'
+      click_button 'Save'
+
+      expect(page).to have_content(dns)
+      expect(page).to have_content("#{ip}:#{port}")
+      expect(page).to have_content(password)
+      expect(page).to have_content(irc)
+      expect(page).to have_content(description)
+
+      click_link 'Edit Server'
+
+      fill_in 'Dns', with: "#{dns}2"
+      fill_in 'server_ip', with: "192.168.1.2"
+      fill_in 'server_port', with: "8001"
+      fill_in 'Password', with: "#{password}2"
+      fill_in 'Name', with: "#{name}2"
+      fill_in 'Description', with: "#{description}2"
+      fill_in 'Irc', with: "#{irc}2"
+      check 'Available for officials?'
+      click_button 'Save'
+
+      expect(page).to have_content("192.168.1.2:8001")
+      expect(page).to have_content("#{dns}2")
+      expect(page).to have_content("#{password}2")
+      expect(page).to have_content("#{irc}2")
+      expect(page).to have_content("#{description}2")
+    end
+  end
+end
\ No newline at end of file

From dd29d92af0a094c965c3ce43a37882fac40f2292 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Thu, 14 May 2015 17:29:05 +0100
Subject: [PATCH 35/76] Indentation

---
 app/models/server.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/server.rb b/app/models/server.rb
index 1725dbd..aa0339f 100644
--- a/app/models/server.rb
+++ b/app/models/server.rb
@@ -47,8 +47,8 @@ class Server < ActiveRecord::Base
   validates_length_of [:rcon, :password, :irc], :maximum => 30, :allow_blank => true
   validates_length_of :description, :maximum => 255, :allow_blank => true
   validates_format_of :ip, :with => /\A[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\z/
-    validates_format_of :port, :with => /\A[0-9]{1,5}\z/
-    validates_format_of :reservation, :with => /\A[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:[0-9]{1,5}\z/, :allow_nil => true
+  validates_format_of :port, :with => /\A[0-9]{1,5}\z/
+  validates_format_of :reservation, :with => /\A[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:[0-9]{1,5}\z/, :allow_nil => true
   validates_format_of :pwd, :with => /\A[A-Za-z0-9_\-]*\z/, :allow_nil => true
 
   scope :ordered, :order => "name"

From fdfd58284652c2fd5d71eb1ffc9990941dfaabd9 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Thu, 14 May 2015 17:29:16 +0100
Subject: [PATCH 36/76] Create new annotations for models

---
 app/models/article.rb  | 4 ++--
 app/models/gatherer.rb | 1 +
 app/models/match.rb    | 1 +
 app/models/profile.rb  | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/article.rb b/app/models/article.rb
index 28b2f05..979b8ea 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -6,12 +6,12 @@
 #  title       :string(255)
 #  status      :integer          not null
 #  category_id :integer
-#  text        :text
+#  text        :text(16777215)
 #  user_id     :integer
 #  created_at  :datetime
 #  updated_at  :datetime
 #  version     :integer
-#  text_parsed :text
+#  text_parsed :text(16777215)
 #  text_coding :integer          default(0), not null
 #
 
diff --git a/app/models/gatherer.rb b/app/models/gatherer.rb
index 0b49f1b..d6697bf 100644
--- a/app/models/gatherer.rb
+++ b/app/models/gatherer.rb
@@ -9,6 +9,7 @@
 #  created_at :datetime
 #  updated_at :datetime
 #  votes      :integer          default(0), not null
+#  status     :integer          default(0), not null
 #
 
 class Gatherer < ActiveRecord::Base
diff --git a/app/models/match.rb b/app/models/match.rb
index 30d7d3b..1059d07 100644
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -25,6 +25,7 @@
 #  points1       :integer
 #  points2       :integer
 #  hltv_id       :integer
+#  caster_id     :string(255)
 #
 
 class Match < ActiveRecord::Base
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 194e0f8..e24e4d0 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -52,6 +52,8 @@
 #  steam_profile       :string(255)
 #  achievements_parsed :string(255)
 #  signature_parsed    :string(255)
+#  stream              :string(255)
+#  layout              :string(255)
 #
 
 class Profile < ActiveRecord::Base

From 8c26fed5423deabbfcf886f553d3ee38e6171c9f Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Thu, 14 May 2015 18:01:49 +0100
Subject: [PATCH 37/76] Quick fix to bring back EU flag

---
 app/views/users/edit.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index b9a17de..752f357 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -95,7 +95,7 @@
             <div class="fields horizontal">
               <%= f.label :country %>
               <div class="inputs">
-                <%= country_code_select :user, :country %>  
+                <%= country_code_select :user, :country, [['EU', 'EU']] %>  
               </div>
             </div>
             <div class="fields horizontal">

From 11635660ca2ba8a447a04fee5ffc4b488297a5f0 Mon Sep 17 00:00:00 2001
From: simplefl <phoenixfl@gmx.de>
Date: Sat, 16 May 2015 15:54:14 +0200
Subject: [PATCH 38/76] Init ladder prototype. Challenge stuff is still mostly
 broken.

---
 app/controllers/challenges_controller.rb |   8 +-
 app/controllers/contesters_controller.rb |  16 ++-
 app/models/challenge.rb                  | 118 +++++++++++------------
 app/models/contest.rb                    |  32 +++---
 app/models/contester.rb                  |   2 +
 app/views/challenges/new.html.erb        |  20 +---
 app/views/contesters/_ladder.html.erb    |  60 ++++++++++++
 app/views/contesters/edit.html.erb       |  15 ++-
 app/views/contests/current.html.erb      |   7 +-
 app/views/contests/historical.html.erb   |   5 +-
 app/views/contests/show.html.erb         |   6 +-
 11 files changed, 185 insertions(+), 104 deletions(-)
 create mode 100644 app/views/contesters/_ladder.html.erb

diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index b652cee..240b1b7 100644
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@@ -18,10 +18,13 @@ class ChallengesController < ApplicationController
   end
 
   def new
+    #No new challenges for now.
+    raise AccessError
     @challenge = Challenge.new
     @challenge.user = cuser
     @challenge.contester2 = Contester.active.find params[:id]
-    @challenge.get_contester1
+    contest = @challenge.contester2.contest
+    @challenge.contester1 = @challenge.user.active_contesters.of_contest(contest).first
     raise AccessError unless @challenge.can_create? cuser
   end
 
@@ -62,7 +65,8 @@ class ChallengesController < ApplicationController
   def destroy
     raise AccessError unless @challenge.can_destroy? cuser
     @challenge.destroy
-    return_to
+    #return_to FIX ME from challenge side
+    render text: t(:challenges_cleared)
   end
 
   private
diff --git a/app/controllers/contesters_controller.rb b/app/controllers/contesters_controller.rb
index 9818859..5c8f376 100644
--- a/app/controllers/contesters_controller.rb
+++ b/app/controllers/contesters_controller.rb
@@ -22,6 +22,9 @@ class ContestersController < ApplicationController
     @contester = Contester.new params[:contester]
     @contester.user = cuser
     raise AccessError unless @contester.can_create? cuser
+    if @contester.contest.contest_type == Contest::TYPE_LADDER
+      @contester.score = @contester.contest.contesters.active.count + 1
+    end
 
     if @contester.save
       flash[:notice] = t(:contests_join)
@@ -34,9 +37,20 @@ class ContestersController < ApplicationController
 
   def update
     raise AccessError unless @contester.can_update? cuser
+
+    if @contester.contest.contest_type == Contest::TYPE_LADDER
+      old_rank = @contester.score
+      new_rank = params[:contester][:score].to_i
+      raise Error, t(:rank_invalid) unless new_rank > 0 and
+        new_rank <= @contester.contest.contesters.active.count
+      if old_rank != new_rank
+        @contester.contest.update_ranks(@contester, old_rank, new_rank)
+      end
+    end
+
     if @contester.update_attributes params[:contester]
       flash[:notice] = t(:contests_contester_update)
-      redirect_to @contester
+      redirect_to @contester.contest
     else
       render :edit
     end
diff --git a/app/models/challenge.rb b/app/models/challenge.rb
index c55b289..93be423 100644
--- a/app/models/challenge.rb
+++ b/app/models/challenge.rb
@@ -36,7 +36,7 @@ class Challenge < ActiveRecord::Base
 
   attr_protected :id, :updated_at, :created_at, :default_time, :user_id, :status
 
-  validates_presence_of :contester1, :contester2, :server, :map1
+  validates_presence_of :contester1, :contester2
   validates_presence_of :map2, :on => :update
   #validates_datetime :match_time, :default_time
   #validates_length_of [:details, :response], :maximum => 255, :allow_blank => true, :allow_nil => true
@@ -111,102 +111,102 @@ class Challenge < ActiveRecord::Base
 
   def validate_teams
     if contester1.team == contester2.team
-      errors.add_to_base I18n.t(:challenges_yourself)
+      errors.add :base, I18n.t(:challenges_yourself)
     end
     if contester1.contest != contester2.contest
-      errors.add_to_base I18n.t(:challenges_opponent_contest)
+      errors.add :base, I18n.t(:challenges_opponent_contest)
     end
     if !contester2.active or !contester2.team.active
-      errors.add_to_base I18n.t(:challenges_opponent_inactive)
+      errors.add :base, I18n.t(:challenges_opponent_inactive)
     end
     if !contester1.active or !contester1.team.active
-      errors.add_to_base I18n.t(:challenges_inactive)
+      errors.add :base, I18n.t(:challenges_inactive)
     end
   end
 
   def validate_contest
     if contester1.contest.end.past? or contester1.contest.status == Contest::STATUS_CLOSED
-      errors.add_to_base I18n.t(:contests_closed)
+      errors.add :base, I18n.t(:contests_closed)
     end
     if contester1.contest.contest_type != Contest::TYPE_LADDER and !match
-      errors.add_to_base I18n.t(:contests_notladder)
+      errors.add :base, I18n.t(:contests_notladder)
     end
   end
 
   def validate_mandatory
-    return unless mandatory
+  #  return unless mandatory
 
-    if contester2.score < contester1.score
-      errors.add_to_base I18n.t(:challenges_mandatory)
-    end
-    if Challenge.pending.count(:conditions =>  \
-                               ["contester1_id = ? AND contester2_id = ? AND	mandatory = true AND default_time < UTC_TIMESTAMP()",
-                                contester1.id, contester2.id]) > 0
-      errors.add_to_base I18n.t(:challenges_mandatory_handled)
-    end
-    if Match.of_contester(contester2).on_week(match_time).count > 0
-      errors.add_to_base I18n.t(:challenges_opponent_week)
-    end
-    if Challenge.of_contester(contester2).mandatory.on_week(match_time).count > 0
-      errors.add_to_base I18n.t(:challenges_opponent_mandatory_week)
-    end
-    if Challenge.of_contester(contester2).mandatory.on_week(default_time).count > 0
-      errors.add_to_base I18n.t(:challenges_opponent_mandatory_week_defaulttime)
-    end
-    if Match.of_contester(contester2).around(default_time).count > 0
-      errors.add_to_base I18n.t(:challenges_opponent_defaulttime)
-    end
+  #  if contester2.score < contester1.score
+  #    errors.add :base, I18n.t(:challenges_mandatory)
+  #  end
+  #  if Challenge.pending.count(:conditions =>  \
+  #                             ["contester1_id = ? AND contester2_id = ? AND	mandatory = true AND default_time < UTC_TIMESTAMP()",
+  #                              contester1.id, contester2.id]) > 0
+  #    errors.add :base, I18n.t(:challenges_mandatory_handled)
+  #  end
+  #  if Match.of_contester(contester2).on_week(match_time).count > 0
+  #    errors.add :base, I18n.t(:challenges_opponent_week)
+  #  end
+  #  if Challenge.of_contester(contester2).mandatory.on_week(match_time).count > 0
+  #    errors.add :base, I18n.t(:challenges_opponent_mandatory_week)
+  #  end
+  #  if Challenge.of_contester(contester2).mandatory.on_week(default_time).count > 0
+  #    errors.add :base, I18n.t(:challenges_opponent_mandatory_week_defaulttime)
+  #  end
+  #  if Match.of_contester(contester2).around(default_time).count > 0
+  #    errors.add :base, I18n.t(:challenges_opponent_defaulttime)
+  #  end
   end
 
   def validate_match_time
-    if (match_time-get_margin).past?
-      if get_margin > 86400
-        errors.add_to_base I18n.t(:matches_time1) + get_margin / 60 / 60 / 24 + I18n.t(:matches_time2)
-      else
-        errors.add_to_base I18n.t(:matches_time1) + get_margin / 60 + I18n.t(:matches_time3)
-      end
-    end
-    if Challenge.of_contester(contester2).around(match_time).pending.count > 0
-      errors.add_to_base I18n.t(:challenges_opponent_specifictime)
-    end
-    if Match.of_contester(contester2).around(match_time).count > 0
-      errors.add_to_base I18n.t(:challenges_opponent_match_specifictime)
-    end
-    if match_time > contester1.contest.end
-      errors.add_to_base I18n.t(:contests_end)
-    end
+#    if (match_time-get_margin).past?
+#      if get_margin > 86400
+#        errors.add :base, I18n.t(:matches_time1) + get_margin / 60 / 60 / 24 + I18n.t(:matches_time2)
+#      else
+#        errors.add :base, I18n.t(:matches_time1) + get_margin / 60 + I18n.t(:matches_time3)
+#      end
+#    end
+#    if Challenge.of_contester(contester2).around(match_time).pending.count > 0
+#      errors.add :base, I18n.t(:challenges_opponent_specifictime)
+#    end
+#    if Match.of_contester(contester2).around(match_time).count > 0
+#      errors.add :base, I18n.t(:challenges_opponent_match_specifictime)
+#    end
+#    if match_time > contester1.contest.end
+#      errors.add :base, I18n.t(:contests_end)
+#    end
   end
 
   def validate_server
-    unless server and server.official
-      errors.add_to_base I18n.t(:servers_notavailable)
-    end
-    unless server.is_free match_time
-      errors.add_to_base I18n.t(:servers_notfree_specifictime)
-    end
-    if !server.is_free default_time
-      errors.add_to_base I18n.t(:servers_notfree_defaulttime)
-    end
+ #   unless server and server.official
+ #     errors.add :base, I18n.t(:servers_notavailable)
+ #   end
+ #   unless server.is_free match_time
+ #     errors.add :base, I18n.t(:servers_notfree_specifictime)
+ #   end
+ #   if !server.is_free default_time
+ #     errors.add :base, I18n.t(:servers_notfree_defaulttime)
+ #   end
   end
 
   def validate_map1
     unless contester1.contest.maps.exists?(map1)
-      errors.add_to_base I18n.t(:contests_map_notavailable)
+      errors.add :base, I18n.t(:contests_map_notavailable)
     end
   end
 
   def validate_map2
     unless contester2.contest.maps.exists?(map2)
-      errors.add_to_base I18n.t(:contests_map_notavailable)
+      errors.add :base, I18n.t(:contests_map_notavailable)
     end
   end
 
   def validate_status
     if mandatory and ![STATUS_ACCEPTED, STATUS_DEFAULT, STATUS_FORFEIT].include? status
-      errors.add_to_base I18n.t(:challenges_mandatory_invalidresult)
+      errors.add :base, I18n.t(:challenges_mandatory_invalidresult)
     end
     unless statuses.include? status
-      errors.add_to_base I18n.t(:challenges_mandatory_invalidresult)
+      errors.add :base, I18n.t(:challenges_mandatory_invalidresult)
     end
   end
 
@@ -251,10 +251,10 @@ class Challenge < ActiveRecord::Base
   end
 
   def can_update? cuser
-    cuser and (contester2.team.is_leader? cuser or cuser.admin?) and status == STATUS_PENDING and autodefault.future?
+    cuser and (contester2.team.is_leader? cuser or cuser.admin?) and status == STATUS_PENDING# and autodefault.future?
   end
 
   def can_destroy? cuser
-    cuser and (contester1.team.is_leader? cuser or cuser.admin?) and status == STATUS_PENDING and autodefault.future?
+    cuser and (contester1.team.is_leader? cuser or cuser.admin?) and status == STATUS_PENDING# and autodefault.future?
   end
 end
diff --git a/app/models/contest.rb b/app/models/contest.rb
index bb2ebf2..33da2c2 100644
--- a/app/models/contest.rb
+++ b/app/models/contest.rb
@@ -107,23 +107,27 @@ class Contest < ActiveRecord::Base
     end
   end
 
-  def elo_score score1, score2, diff, level = self.modulus_base, weight = self.weight, moduluses = [self.modulus_even, self.modulus_3to1, self.modulus_4to0]
-    points = (score2-score1).abs
-    modulus = moduluses[0].to_f if points <= 1
-    modulus = moduluses[1].to_f if points == 2
-    modulus = moduluses[2].to_f if points >= 3
-    if score1 == score2
-      result = 0.5
-    elsif score1 > score2
-      result = 1.0
-    elsif score2 > score1
-      result = 0.0
+  def update_ranks contester, old_rank, new_rank
+    if old_rank < new_rank
+      Contester.update_all(["score = score -1, trend = ?", Contester::TREND_UP],
+                           ["contest_id = ? and score > ? and score <= ?",
+                            self.id, old_rank, new_rank])
+      contester.trend = Contester::TREND_DOWN
+    elsif old_rank > new_rank
+      Contester.update_all(["score = score + 1, trend = ?", Contester::TREND_DOWN],
+                           ["contest_id = ? and score < ? and score >= ?",
+                            self.id, old_rank, new_rank])
+      contester.trend = Contester::TREND_UP
     end
-    prob = 1.0/(10**(diff.to_f/weight.to_f)+1.0)
-    total = (level.to_f*modulus*(result-prob)).round
-    return total
+    contester.score = new_rank
   end
 
+  def ladder_ranks_unique?
+    c = Contester.where({:contest_id => self.id})
+    c.uniq.pluck(:score).count == c.count
+  end
+
+
   def can_create? cuser
     cuser and cuser.admin?
   end
diff --git a/app/models/contester.rb b/app/models/contester.rb
index 99bf2f2..eafd233 100644
--- a/app/models/contester.rb
+++ b/app/models/contester.rb
@@ -27,6 +27,8 @@ class Contester < ActiveRecord::Base
   attr_accessor :user
 
   scope :active, :include => :team, :conditions => {"contesters.active" => true}
+  # ranked is used for ladder. lower score the higher the rank
+  scope :ranked, :select => "contesters.*", :order => "score ASC, win DESC, loss ASC"
   scope :ordered, :select => "contesters.*, (score + extra) AS total_score", :order => "total_score DESC, score DESC, win DESC, loss ASC"
   scope :chronological, :order => "created_at DESC"
   scope :of_contest, lambda { |contest| {:conditions => {"contesters.contest_id" => contest.id}} }
diff --git a/app/views/challenges/new.html.erb b/app/views/challenges/new.html.erb
index 9045e92..7267baa 100644
--- a/app/views/challenges/new.html.erb
+++ b/app/views/challenges/new.html.erb
@@ -9,30 +9,12 @@
     <%= f.hidden_field :contester2_id %>
 
     <div class="contentWide">
-      <% if @challenge.errors.empty? or @challenge.server %>
+      <% if @challenge.errors.empty? %>
         <h3 class="center">
           <%= namelink @challenge.contester1.team %>
           vs
           <%= namelink @challenge.contester2.team %>
         </h3>
-
-        <p>
-          <%= f.label :match_time %><br />
-          <%= f.datetime_select :match_time %>
-        </p>
-        <p>
-          <%= f.check_box :mandatory %>
-          <%= f.label :mandatory %>
-          ( Default time will be following Sunday <%= @challenge.contester1.contest.default_time.strftime("%H:%M") %> )
-        </p>
-        <p>
-          <%= f.label :server_id %><br />
-          <%= f.select :server_id, Server.hlds.active.collect{|c| [c.name, c.id]} %>
-        </p>
-        <p>
-          <%= f.label :map1_id, "Your Map" %><br />
-          <%= f.select :map1_id, @challenge.contester1.contest.maps.basic.collect{|m| [m.name, m.id]} %>
-        </p>
         <p>
           <%= f.label :details, "Information for the opponent" %><br />
           <%= f.text_area :details, :cols => 40, :rows => 7 %>
diff --git a/app/views/contesters/_ladder.html.erb b/app/views/contesters/_ladder.html.erb
new file mode 100644
index 0000000..4980141
--- /dev/null
+++ b/app/views/contesters/_ladder.html.erb
@@ -0,0 +1,60 @@
+<table class="contest striped">
+  <thead>
+    <tr>
+      <th class="rank">Rank</th>
+      <th class="movement"></th>
+      <th class="flag"></th>
+      <th class="team">Team</th>
+      <th class="awards"></th>
+      <th class="win">Win</th>
+      <th class="loss">Loss</th>
+      <th class="draw">Draw</th>
+      <% if actions and cuser %>
+        <th class="actions"></th>
+      <% end %>
+    </tr>
+  </thead>
+
+  <tbody>
+  <% contesters = contest.contesters.active.ranked
+     contesters.each_with_index do |contester, rank| %>
+    <tr>
+      <td><%= h rank + 1%>.</td>
+      <% if contester.trend == Contester::TREND_UP %>
+        <td><%= icon 'chevron-up' %></td>
+      <% elsif contester.trend == Contester::TREND_DOWN %>
+        <td><%= icon 'chevron-down' %></td>
+      <% elsif contester.trend == Contester::TREND_FLAT %>
+        <td><%= icon 'minus' %></td>
+      <% else %>
+        <td></td>
+      <% end %>
+      <td><%= flag contester.team.country %></td>
+      <td><%= link_to (h contester.team.name), contester %></td>
+      <td><%= icon 'trophy' if contester == contester.contest.winner %></td>
+      <td><%= h contester.win %></td>
+      <td><%= h contester.loss %></td>
+      <td><%= h contester.draw %></td>
+      <% if actions and cuser%>
+        <td class="actions">
+          <% if false %>
+          <% current = cuser.active_contesters.of_contest(contest).first %>
+          <% if current %>
+            <% challenge = Challenge.new
+            challenge.contester1 = current
+            challenge.contester2 = contester %>
+            <% if challenge.can_create? cuser %>
+              <%= link_to 'C', controller: 'challenges', id: contester, action: 'new' %>
+            <% end %>
+          <% end %>
+          <% end %>
+          <% if cuser and cuser.admin? %>
+            <%= link_to icon('pencil'), edit_contester_path(contester) %>
+            <%= link_to icon('times'), contester, confirm: 'Are you sure?', method: :delete %>
+          <% end %>
+        </td>
+      <% end %>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
diff --git a/app/views/contesters/edit.html.erb b/app/views/contesters/edit.html.erb
index 5e90b6c..f6e01ea 100644
--- a/app/views/contesters/edit.html.erb
+++ b/app/views/contesters/edit.html.erb
@@ -9,10 +9,17 @@
       <%= f.label :extra, "Extra Points" %>
       <%= f.text_field :extra %>
     </div>
-    <div class="fields horizontal">
-      <%= f.label :score %>
-      <%= f.text_field :score %>
-    </div>
+    <% if @contester.contest.contest_type == Contest::TYPE_LADDER %>
+        <div class="fields horizontal">
+          <%= f.label :rank %>
+          <%= f.text_field :score %>
+        </div>
+    <% else %>
+        <div class="fields horizontal">
+          <%= f.label :score %>
+          <%= f.text_field :score %>
+        </div>
+    <% end %>
     <div class="fields horizontal">
       <%= f.label :win %>
       <%= f.text_field :win %>
diff --git a/app/views/contests/current.html.erb b/app/views/contests/current.html.erb
index 80bb409..b58ffd6 100644
--- a/app/views/contests/current.html.erb
+++ b/app/views/contests/current.html.erb
@@ -5,7 +5,12 @@
 
   <% if contest.contest_type == Contest::TYPE_BRACKET %>
     <%= render partial: "bracket", locals: { contest: contest } %>
+  <% elsif contest.contest_type == Contest::TYPE_LADDER %>
+    <%= render partial: "contesters/ladder", 
+        locals: { actions: true, contest: contest } %>
   <% else %>  
-    <%= render partial: "contesters/list", locals: { contesters: contest.contesters.active.ordered, actions: true } %>
+    <%= render partial: "contesters/list", 
+        locals: { contesters: contest.contesters.active.ordered, 
+        actions: true, contest: contest } %>
   <% end %>
 <% end %>
diff --git a/app/views/contests/historical.html.erb b/app/views/contests/historical.html.erb
index 3e85395..ca40333 100644
--- a/app/views/contests/historical.html.erb
+++ b/app/views/contests/historical.html.erb
@@ -11,7 +11,10 @@
     <div class="wide centered">
       <% if contest.contest_type == Contest::TYPE_BRACKET %>
         <%= render :partial => "bracket", :locals => {:contest => contest} %>
-      <% else %>
+        <% elsif contest.contest_type == Contest::TYPE_LADDER %>
+        <%= render partial: "contesters/ladder",
+            locals: { actions: false, contest: contest } %>
+        <% else %>
         <%= render :partial => "contesters/list", :locals => {:contesters => contest.contesters.active.ordered, :actions => false} %>
       <% end %>
     </div>
diff --git a/app/views/contests/show.html.erb b/app/views/contests/show.html.erb
index dac3088..106bd3b 100644
--- a/app/views/contests/show.html.erb
+++ b/app/views/contests/show.html.erb
@@ -20,9 +20,6 @@
       <dd>Sunday: <%= Time.use_zone(timezone_offset) { @contest.default_time.strftime("%H:%M %Z") } %></dd>
     </dl>
 
-    <% if @contest.contest_type == Contest::TYPE_LADDER %>
-      <%= link_to 'Scoring', "/contests/#{@contest}/score", class: 'button' %>
-    <% end %>
     <% if cuser and cuser.admin? %>
       <%= link_to 'Edit Contest', edit_contest_path(@contest), class: 'button' %>
     <% end %>
@@ -32,6 +29,9 @@
 <div class="standings">
   <% if @contest.contest_type == Contest::TYPE_BRACKET %>
     <%= render partial: 'bracket', locals: { contest: @contest } %>
+  <% elsif @contest.contest_type == Contest::TYPE_LADDER %>
+    <%= render partial: "contesters/ladder",
+        locals: { actions: true, contest: @contest } %>
   <% else %>
     <%= render partial: 'normal' %>
   <% end %>

From 6ad165f108409459bba6018cbe07c4ed35edd0d7 Mon Sep 17 00:00:00 2001
From: simplefl <phoenixfl@gmx.de>
Date: Sat, 16 May 2015 16:14:40 +0200
Subject: [PATCH 39/76] Show extra points on edit contesters not for ladder.

---
 app/views/contesters/edit.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/contesters/edit.html.erb b/app/views/contesters/edit.html.erb
index f6e01ea..1478c70 100644
--- a/app/views/contesters/edit.html.erb
+++ b/app/views/contesters/edit.html.erb
@@ -5,16 +5,16 @@
   <%= form_for @contester, html: { class: 'square' } do |f| %>
     <%= render 'shared/errors', messages: @contester.errors.full_messages %>
 
-    <div class="fields horizontal">
-      <%= f.label :extra, "Extra Points" %>
-      <%= f.text_field :extra %>
-    </div>
     <% if @contester.contest.contest_type == Contest::TYPE_LADDER %>
         <div class="fields horizontal">
           <%= f.label :rank %>
           <%= f.text_field :score %>
         </div>
     <% else %>
+        <div class="fields horizontal">
+          <%= f.label :extra, "Extra Points" %>
+          <%= f.text_field :extra %>
+        </div>
         <div class="fields horizontal">
           <%= f.label :score %>
           <%= f.text_field :score %>

From 032b21874ab937940b640a04f96c8960fd305464 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Mon, 18 May 2015 17:24:18 +0100
Subject: [PATCH 40/76] Remove rcon from log model

---
 app/models/log.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/models/log.rb b/app/models/log.rb
index 4a24f5f..71e0794 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -21,8 +21,6 @@ class Log < ActiveRecord::Base
   attr_accessor :text
 
   DOMAIN_LOG = 1
-  DOMAIN_RCON_COMMAND = 2
-  DOMAIN_RCON_RESPONSE = 3
   DOMAIN_INFO = 4
 
   TEAM_MARINES = 1
@@ -52,10 +50,6 @@ class Log < ActiveRecord::Base
   belongs_to :actor, :class_name => "Rounder"
   belongs_to :target, :class_name => "Rounder"
 
-  #	def domains
-  #		return {DOMAIN_LOG => "HL Log", DOMAIN_RCON_COMMAND => "Rcon Command Log", DOMAIN_RCON_RESPONSE => "Rcon Response Log", DOMAIN_INFO => "Action Log"}
-  #	end
-
   def since
     (created_at - round.start).to_i
   end

From 2ada536da25495f024d2c803e3b79e5b8fdc1167 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Mon, 18 May 2015 17:24:31 +0100
Subject: [PATCH 41/76] Remove rcon from readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b7c9e71..efe83c8 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Features:
 - Map database
 - Votable polls
 - Twitter feed
-- Server database and RCON interface
+- Server database
 - Log file parsing (partially complete)
 
 ## Contributors

From 89891d2679ea582cbd1df539629e79d35ec62188 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Mon, 18 May 2015 17:30:45 +0100
Subject: [PATCH 42/76] Remove rcon column from servers table

---
 app/models/server.rb                                  | 4 +---
 app/views/servers/_form.html.erb                      | 4 ----
 db/migrate/20150518162749_remove_rcon_from_servers.rb | 9 +++++++++
 db/schema.rb                                          | 3 +--
 spec/models/server_spec.rb                            | 1 -
 5 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20150518162749_remove_rcon_from_servers.rb

diff --git a/app/models/server.rb b/app/models/server.rb
index aa0339f..129f684 100644
--- a/app/models/server.rb
+++ b/app/models/server.rb
@@ -8,7 +8,6 @@
 #  dns             :string(255)
 #  ip              :string(255)
 #  port            :string(255)
-#  rcon            :string(255)
 #  password        :string(255)
 #  irc             :string(255)
 #  user_id         :integer
@@ -44,7 +43,7 @@ class Server < ActiveRecord::Base
   attr_protected :id, :user_id, :updated_at, :created_at, :map, :players, :maxplayers, :ping, :version
 
   validates_length_of [:name, :dns,], :in => 1..30
-  validates_length_of [:rcon, :password, :irc], :maximum => 30, :allow_blank => true
+  validates_length_of [:password, :irc], :maximum => 30, :allow_blank => true
   validates_length_of :description, :maximum => 255, :allow_blank => true
   validates_format_of :ip, :with => /\A[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\z/
   validates_format_of :port, :with => /\A[0-9]{1,5}\z/
@@ -81,7 +80,6 @@ class Server < ActiveRecord::Base
   non_versioned_columns << 'dns'
   non_versioned_columns << 'ip'
   non_versioned_columns << 'port'
-  non_versioned_columns << 'rcon'
   non_versioned_columns << 'password'
   non_versioned_columns << 'irc'
   non_versioned_columns << 'user_id'
diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb
index 97c0403..ab8bcdb 100644
--- a/app/views/servers/_form.html.erb
+++ b/app/views/servers/_form.html.erb
@@ -16,10 +16,6 @@
       </div>      
     </div>
   </div>
-  <div class="fields horizontal">
-    <%= f.label :rcon %>
-    <%= f.text_field :rcon %>
-  </div>
   <div class="fields horizontal">
     <%= f.label :password %>
     <%= f.text_field :password %>
diff --git a/db/migrate/20150518162749_remove_rcon_from_servers.rb b/db/migrate/20150518162749_remove_rcon_from_servers.rb
new file mode 100644
index 0000000..400c2e3
--- /dev/null
+++ b/db/migrate/20150518162749_remove_rcon_from_servers.rb
@@ -0,0 +1,9 @@
+class RemoveRconFromServers < ActiveRecord::Migration
+  def up
+    remove_column :servers, :rcon
+  end
+
+  def down
+    add_column :servers, :rcon, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0839005..e0aad41 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20141010193221) do
+ActiveRecord::Schema.define(:version => 20150518162749) do
 
   create_table "admin_requests", :force => true do |t|
     t.string   "addr"
@@ -722,7 +722,6 @@ ActiveRecord::Schema.define(:version => 20141010193221) do
     t.string   "dns"
     t.string   "ip"
     t.string   "port"
-    t.string   "rcon"
     t.string   "password"
     t.string   "irc"
     t.integer  "user_id"
diff --git a/spec/models/server_spec.rb b/spec/models/server_spec.rb
index 19374e8..a4ec8cf 100644
--- a/spec/models/server_spec.rb
+++ b/spec/models/server_spec.rb
@@ -8,7 +8,6 @@
 #  dns             :string(255)
 #  ip              :string(255)
 #  port            :string(255)
-#  rcon            :string(255)
 #  password        :string(255)
 #  irc             :string(255)
 #  user_id         :integer

From ac4694518db84b6eb2bbcfa3b3f0bb9714e8508b Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Mon, 18 May 2015 17:33:38 +0100
Subject: [PATCH 43/76] Remove rcon from test

---
 spec/support/features/server_helpers.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/support/features/server_helpers.rb b/spec/support/features/server_helpers.rb
index b28df90..446f34c 100644
--- a/spec/support/features/server_helpers.rb
+++ b/spec/support/features/server_helpers.rb
@@ -4,7 +4,6 @@ module Features
       dns = 'ServerDns.com'
       ip = '192.168.1.1'
       port = '8000'
-      rcon = 'whatsrcon'
       password = 'secret'
       name = 'MyNsServer'
       description = 'My NS Server'

From 15f5fb583283140cceea0754310cc1eb46f21013 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 13:56:25 +0100
Subject: [PATCH 44/76] Removed unused accessors and validation

---
 app/models/ban.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/models/ban.rb b/app/models/ban.rb
index e234580..5a7eaf9 100644
--- a/app/models/ban.rb
+++ b/app/models/ban.rb
@@ -27,13 +27,12 @@ class Ban < ActiveRecord::Base
   VENT_BANS = "tmp/bans.txt"
 
   attr_protected :id, :created_at, :updated_at
-  attr_accessor :ts, :sign, :len, :user_name
+  attr_accessor :len, :user_name
 
   scope :ordered, order: "created_at DESC"
   scope :effective, conditions: "expiry > UTC_TIMESTAMP()"
   scope :ineffective, conditions: "expiry < UTC_TIMESTAMP()"
 
-  validate :validate_ts
   validate :validate_type
   validate :validate_ventban
   validates_format_of :steamid, with: /\A([0-9]{1,10}:){2}[0-9]{1,10}\Z/, allow_blank: true
@@ -58,12 +57,6 @@ class Ban < ActiveRecord::Base
      TYPE_GATHER => "Gather"}
   end
 
-  def validate_ts
-    if ts and Verification.verify(steamid + ts.to_s) != sign
-      errors.add :ts, I18n.t(:wrong_verification_code)
-    end
-  end
-
   def validate_type
     errors.add :ban_type, I18n.t(:invalid_ban_type) unless types.include? ban_type
   end

From 619136325f3c9bf1025f619067d84897e023eddd Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 13:56:42 +0100
Subject: [PATCH 45/76] Remove unusued method

---
 app/models/ban.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/models/ban.rb b/app/models/ban.rb
index 5a7eaf9..44fa7e1 100644
--- a/app/models/ban.rb
+++ b/app/models/ban.rb
@@ -87,12 +87,4 @@ class Ban < ActiveRecord::Base
   def can_destroy? cuser
     cuser and cuser.admin?
   end
-
-  def self.refresh
-    #file = File.new(VENT_BANS, "w")
-    #Ban.all(:conditions => ["ban_type = ? AND expiry > UTC_TIMESTAMP()", TYPE_VENT]).each do |ban|
-    #	file.write "#{ban.ip},,,"
-    #end
-    #file.close
-  end
 end

From 60e5279d2aea3ca7dd55c764ae51db447354bed3 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 13:57:15 +0100
Subject: [PATCH 46/76] Remove unrouted controller method

---
 app/controllers/bans_controller.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/controllers/bans_controller.rb b/app/controllers/bans_controller.rb
index a3ae9fb..83496c5 100644
--- a/app/controllers/bans_controller.rb
+++ b/app/controllers/bans_controller.rb
@@ -8,10 +8,6 @@ class BansController < ApplicationController
   def show
   end
 
-  def refresh
-    Ban.refresh
-  end
-
   def new
     @ban = Ban.new
     raise AccessError unless @ban.can_create? cuser

From 4a18d895a493b6c8c9f7e89cee6beae8f48107f7 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 14:16:31 +0100
Subject: [PATCH 47/76] Added tests for bans

---
 spec/models/ban_spec.rb | 73 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 spec/models/ban_spec.rb

diff --git a/spec/models/ban_spec.rb b/spec/models/ban_spec.rb
new file mode 100644
index 0000000..32bb277
--- /dev/null
+++ b/spec/models/ban_spec.rb
@@ -0,0 +1,73 @@
+# == Schema Information
+#
+# Table name: bans
+#
+#  id         :integer          not null, primary key
+#  steamid    :string(255)
+#  user_id    :integer
+#  addr       :string(255)
+#  server_id  :integer
+#  expiry     :datetime
+#  reason     :string(255)
+#  created_at :datetime
+#  updated_at :datetime
+#  ban_type   :integer
+#  ip         :string(255)
+#
+
+require 'spec_helper'
+
+describe Ban do
+	let!(:user) { create :user }
+	let(:ban) { Ban.new }
+	let!(:server) { create :server }
+
+	describe '#check_user' do
+		it "assigns user by user_name" do
+			ban.user_name = user.username
+			ban.check_user
+			expect(ban.user).to eq(user)
+		end
+		it "assigns user and server if user_name not present" do
+			ban.steamid = user.steamid
+			ban.addr = server.addr
+			ban.check_user
+			expect(ban.user).to eq(user)
+			expect(ban.server).to eq(server)
+		end
+	end
+	
+	describe 'Permissions' do
+		let!(:user) { create :user }
+		let!(:admin) { create :user, :admin }
+		let!(:server_user) { create :user }
+		let(:ban) { Ban.new }
+
+		describe 'can_create?' do
+			it 'returns true for admins' do
+				expect(ban.can_create? admin).to be_true
+			end
+			it 'returns false for non-admins' do
+				expect(ban.can_create? user).to be_false
+			end
+		end
+
+		describe 'can_destroy?' do
+			it 'returns true for admin' do
+				expect(ban.can_destroy? admin).to be_true
+			end
+			it 'returns false for non-admins' do
+				expect(ban.can_destroy? user).to be_false
+			end
+		end
+
+		describe 'can_update?' do
+			it 'returns true for admin' do
+				expect(ban.can_update? admin).to be_true
+			end
+			it 'returns false for non-admins' do
+				expect(ban.can_update? user).to be_false
+			end
+		end
+	end
+end

From 3aa865e1c9cdfea3931952fac18fe545cb6962da Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 14:17:07 +0100
Subject: [PATCH 48/76] Rerun annotate on server spec

---
 app/models/server.rb       | 1 -
 spec/models/server_spec.rb | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/models/server.rb b/app/models/server.rb
index aa0339f..c41c040 100644
--- a/app/models/server.rb
+++ b/app/models/server.rb
@@ -8,7 +8,6 @@
 #  dns             :string(255)
 #  ip              :string(255)
 #  port            :string(255)
-#  rcon            :string(255)
 #  password        :string(255)
 #  irc             :string(255)
 #  user_id         :integer
diff --git a/spec/models/server_spec.rb b/spec/models/server_spec.rb
index 19374e8..a4ec8cf 100644
--- a/spec/models/server_spec.rb
+++ b/spec/models/server_spec.rb
@@ -8,7 +8,6 @@
 #  dns             :string(255)
 #  ip              :string(255)
 #  port            :string(255)
-#  rcon            :string(255)
 #  password        :string(255)
 #  irc             :string(255)
 #  user_id         :integer

From cd2c421f0f20ec9ead890e0fb3dcc24645cd5a46 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 14:17:28 +0100
Subject: [PATCH 49/76] Remove plugins all hush like

---
 app/controllers/plugin_controller.rb | 128 ---------------------------
 config/routes.rb                     |   7 --
 2 files changed, 135 deletions(-)
 delete mode 100644 app/controllers/plugin_controller.rb

diff --git a/app/controllers/plugin_controller.rb b/app/controllers/plugin_controller.rb
deleted file mode 100644
index 02e7a73..0000000
--- a/app/controllers/plugin_controller.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-class PluginController < ApplicationController
-  def esi
-    buffer = []
-    out = []
-    buffer << Time.now.utc.to_i
-    buffer << "1.2"
-    buffer << params[:ch] ? params[:ch] : ""
-    out << "#ESI#"
-    out << Verification.verify(buffer.join)
-    out << buffer.join("\r")
-    render_out out
-  end
-
-  def user
-    buffer = []
-    out = []
-
-    if ban = Ban.first(:conditions => ["expiry > UTC_TIMESTAMP() AND steamid = ? AND ban_type = ?", params[:id], Ban::TYPE_SERVER])
-      out << "#USER#"
-      out << "BANNED"
-      out << ban.expiry.utc.to_i
-      out << ban.reason
-      out << "\r\r\r\r\r\r\r"
-    elsif user = User.first(:conditions => {:steamid => params[:id]})
-      teamer = (user.team ? user.teamers.active.of_team(user.team).first : nil)
-      icon = 0
-      rank = "User"
-      if Group.find(Group::DONORS).users.exists?(user)
-        rank = "Donor"
-        icon = icon | 1
-      end
-      if Group.find(Group::CHAMPIONS).users.exists?(user)
-        icon = icon | 2
-      end
-      if user.ref?
-        rank = "Referee"
-        icon = icon | 4
-      end
-      if user.admin?
-        rank = "Admin"
-        icon = icon | 8
-      end
-
-      buffer << user.steamid
-      buffer << user.username
-      buffer << user.lastip
-      buffer << (user.team ? Verification.uncrap(user.team.to_s) : "No Team")
-      buffer << user.id
-      buffer << user.team_id
-      buffer << rank
-      buffer << (teamer ? teamer.ranks[teamer.rank] : "")
-      buffer << icon
-      buffer << params[:ch] ? params[:ch] : ""
-      buffer << (user.can_play? ? "1" : "0")
-
-      out << "#USER#"
-      out << Verification.verify(buffer.join)
-      out << buffer.join("\r")
-    else
-      out << "#FAIL#"
-    end
-
-    render_out out
-  end
-
-  #def admin
-  #	areq = AdminRequest.new
-  #	areq.addr = params[:addr]
-  #	areq.pwd = params[:pwd]
-  #	areq.msg = params[:msg]
-  #	areq.player = params[:player]
-  #	areq.user_id = params[:user]
-  #	areq.save!
-  #	render :text => "Ok"
-  #end
-
-  def ban
-    ban = Ban.new
-    ban.steamid = params[:id]
-    ban.ts = params[:ts]
-    ban.sign = params[:sign]
-    ban.expiry = DateTime.now.ago(-(params[:len].to_i*60))
-    ban.addr = params[:addr]
-    ban.reason = params[:reason]
-    ban.ban_type = Ban::TYPE_SERVER
-    ban.save!
-
-    render :text => "Ok"
-  end
-
-  def hltv_req
-    if params[:game].to_i > 0
-      if match = Match.first(:conditions => {:id => params[:game]})
-        match.hltv_record params[:addr], params[:pwd]
-        hltv = match.hltv
-      else
-        render :text => t(:matches_notfound)
-      end
-    else
-      hltv = Server.hltvs.active.unreserved_now.unreserved_hltv_around(DateTime.now).first unless hltv
-      render :text => t(:hltv_notavailable) unless hltv
-
-      hltv.recording = params[:game]
-      hltv.reservation = params[:addr]
-      hltv.pwd = params[:pwd]
-      hltv.save!
-    end
-
-    render :text => t(:hltv_sent)
-  end
-
-  def hltv_move
-    Server.move params[:addr], params[:newaddr], params[:newpwd]
-    render :text => t(:hltv_movedd) + params[:newaddr]
-  end
-
-  def hltv_stop
-    Server.stop params[:addr]
-    render :text => t(:hltv_stopped)
-  end
-
-  private
-
-  def render_out out
-    @text = out.join("\r")
-    render :layout => false
-  end
-end
diff --git a/config/routes.rb b/config/routes.rb
index 5f247e1..9aaca00 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -111,13 +111,6 @@ Ensl::Application.routes.draw do
   match 'movies/preview'
   match 'movies/snapshot'
 
-  match 'plugin/esi'
-  match 'plugin/user'
-  match 'plugin/ban'
-  match 'plugin/hltv_req'
-  match 'plugin/hltv_move'
-  match 'plugin/hltv_stop'
-
   match 'users/forgot'
   match 'users/recover'
   match 'users/agenda'

From 93e49c74bae2c1aabebd38177dcc2dc32929ca15 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 14:18:50 +0100
Subject: [PATCH 50/76] Removed for githubs sake

---
 lib/verification.rb | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/lib/verification.rb b/lib/verification.rb
index 98257b4..0ca0403 100644
--- a/lib/verification.rb
+++ b/lib/verification.rb
@@ -1,45 +1,4 @@
 module Verification
-	def Verification.verify input
-		md5 = Digest::MD5.hexdigest("9WvcZ9hX" + input + "KF7L4luQ").upcase.split(//)
-		chars = ["A", "B", "C", "D", "E", "F"]
-		nums = []
-		lastPos = md5[31].to_i
-		result = ""
-
-		for i in 0..9
-			pos = md5[i].to_i
-
-			if pos == 0
-				pos = lastPos ** (i % 4)
-			elsif (pos % 4) == 0
-				pos = pos * lastPos + i
-			elsif (pos % 3) == 0
-				pos = pos ** (i % 4)
-			elsif (pos % 2) == 0
-				pos = pos * i + pos
-			end
-
-			pos = (pos > 31) ? (pos % 32) : pos
-			curChar = md5[31 - pos]
-			curNum = curChar.to_i
-
-			if nums.include? curNum
-				if curNum == 0
-					curChar = chars[pos % 6]
-				else
-					curChar = (pos % 10).to_s
-				end
-				curNum = curChar.to_i
-			end
-
-			nums << curNum
-			result << curChar
-			lastPos = pos
-		end
-
-		return result
-	end
-
 	def Verification.uncrap str
 		str.to_s.gsub(/[^A-Za-z0-9_\-]/, "")
 	end

From e25437aebb62d2d3aecf0191693fccb4b5d061d8 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 14:22:03 +0100
Subject: [PATCH 51/76] Remove unusued methods

---
 lib/verification.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/verification.rb b/lib/verification.rb
index 0ca0403..9611585 100644
--- a/lib/verification.rb
+++ b/lib/verification.rb
@@ -3,10 +3,6 @@ module Verification
 		str.to_s.gsub(/[^A-Za-z0-9_\-]/, "")
 	end
 
-	def Verification.match_addr str
-		str.to_s.match(/(([0-9]{1,3}\.){3}[0-9]{1,3}):?([0-9]{0,5})/)[0]
-	end
-
 	def Verification.random_string len
 		chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
 		str = ""

From e182bfda753fffbd5f9a6266827d5f248da044cf Mon Sep 17 00:00:00 2001
From: simplefl <phoenixfl@gmx.de>
Date: Tue, 26 May 2015 19:06:40 +0200
Subject: [PATCH 52/76] Add wait_timeout and reconnect to database.ym.

---
 config/database.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/database.yml b/config/database.yml
index c18ed69..0573d66 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -6,6 +6,9 @@ base: &db
   username: <%= ENV['MYSQL_USERNAME'] %>
   password: <%= ENV['MYSQL_PASSWORD'] %>
   pool: <%= Integer(ENV['MYSQL_CONNECTION_POOL'] || 8) %>
+  wait_timeout: 30
+  reconnect: true
+
 
 development:
   <<: *db

From 992608a90c8076f26da3f14481000e3a35075535 Mon Sep 17 00:00:00 2001
From: Chris Blanchard <chris@iddqd.org>
Date: Tue, 2 Jun 2015 17:55:08 +0100
Subject: [PATCH 53/76] Remove rcon from annotate and added message model specs

---
 spec/factories/ban.rb       | 23 +++++++++++++++
 spec/factories/message.rb   |  9 ++++++
 spec/models/message_spec.rb | 57 +++++++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 spec/factories/ban.rb
 create mode 100644 spec/factories/message.rb
 create mode 100644 spec/models/message_spec.rb

diff --git a/spec/factories/ban.rb b/spec/factories/ban.rb
new file mode 100644
index 0000000..81a5c7b
--- /dev/null
+++ b/spec/factories/ban.rb
@@ -0,0 +1,23 @@
+FactoryGirl.define do
+	factory :ban do
+		ban_type Ban::TYPE_SITE
+		expiry Date.today + 1
+		# Hack because of the awkward way bans are created (requires user_name)
+		before(:create) do |ban|
+			if ban.user.nil?
+				user = create :user
+				ban.user_name = user.username
+			else 
+				ban.user_name = ban.user.username
+			end
+		end
+	end
+
+	trait :mute do
+		ban_type Ban::TYPE_MUTE
+	end
+
+	trait :expired do
+		expiry Date.yesterday - 1
+	end
+end
\ No newline at end of file
diff --git a/spec/factories/message.rb b/spec/factories/message.rb
new file mode 100644
index 0000000..1f44662
--- /dev/null
+++ b/spec/factories/message.rb
@@ -0,0 +1,9 @@
+FactoryGirl.define do
+	factory :message do
+		association :sender, factory: :user
+		association :recipient, factory: :user
+		sequence(:text)    { |n| "text-#{n}" }
+		sequence(:title)    { |n| "title-#{n}" }
+		sequence(:text_parsed)    { |n| "text-#{n}" }
+	end
+end
\ No newline at end of file
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
new file mode 100644
index 0000000..b0aa6ef
--- /dev/null
+++ b/spec/models/message_spec.rb
@@ -0,0 +1,57 @@
+# == Schema Information
+#
+# Table name: messages
+#
+#  id             :integer          not null, primary key
+#  sender_type    :string(255)
+#  sender_id      :integer
+#  recipient_type :string(255)
+#  recipient_id   :integer
+#  title          :string(255)
+#  text           :text
+#  created_at     :datetime
+#  updated_at     :datetime
+#  text_parsed    :text
+#
+
+require 'spec_helper'
+
+describe Message do
+	let!(:user) { create :user }
+
+	describe 'create' do
+		let(:message) { build :message }
+		it 'creates a new message' do
+			expect(message.valid?).to be_true
+			expect do
+				message.save!
+			end.to change(Message, :count).by(1)
+		end
+	end
+
+	describe 'Permissions' do
+		let(:message) { Message.new }
+		describe 'can_create?' do
+			it 'returns true for user' do
+				expect(message.can_create?(user)).to be_true
+			end
+			it 'returns false if user is banned' do
+				create :ban, :mute, user: user
+				expect(message.can_create?(user)).to be_false
+			end
+		end
+
+		describe 'can_show?' do
+			let!(:message) { create :message }
+			it 'returns true if sender' do
+				expect(message.can_show?(message.sender)).to be_true
+			end
+			it 'returns true if receiver' do
+				expect(message.can_show?(message.recipient)).to be_true
+			end
+			it 'returns false if neither sender nor receiver' do
+				expect(message.can_show?(user)).to be_false
+			end
+		end
+	end
+end
\ No newline at end of file

From 6b8f5677b4bd48c6ef8514997ae2f4e9eb6c0b89 Mon Sep 17 00:00:00 2001
From: Chris Blanchard <chris@iddqd.org>
Date: Tue, 2 Jun 2015 18:50:41 +0100
Subject: [PATCH 54/76] Add recipient to messages

---
 app/views/messages/_message.html.erb    |  4 +-
 spec/features/messages/user_messages.rb | 59 +++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 spec/features/messages/user_messages.rb

diff --git a/app/views/messages/_message.html.erb b/app/views/messages/_message.html.erb
index 8422028..aed367f 100644
--- a/app/views/messages/_message.html.erb
+++ b/app/views/messages/_message.html.erb
@@ -5,5 +5,5 @@
 </p>
 
 <p>
-  <%= namelink message.sender %> on <em><%= longdate message.created_at %></em>
-</p>
+  To: <%= namelink message.recipient %> From: <%= namelink message.sender %> on <em><%= longdate message.created_at %></em></em>
+</p>
\ No newline at end of file
diff --git a/spec/features/messages/user_messages.rb b/spec/features/messages/user_messages.rb
new file mode 100644
index 0000000..7f43b7b
--- /dev/null
+++ b/spec/features/messages/user_messages.rb
@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+feature 'Message creation' do
+  let!(:sender) { create :user }
+  let!(:recipient) { create :user }
+
+  background do
+    sign_in_as sender
+  end
+
+  scenario 'User creates a message' do
+    visit root_path
+    within '.links' do
+	    click_link 'Messages'
+    end
+    expect(page).to have_content('Sent (0)')
+    visit user_path(recipient)
+    expect(page).to have_content(recipient.username)
+    click_link 'Send PM'
+    expect(page).to have_content('New Message')
+    title = "This is my title"
+    message = "This is my message"
+    fill_in 'Title', with: title
+    fill_in 'Text', with: message
+    click_button 'Send Message'
+    expect(page).to have_content('Message was successfully sent.')
+    expect(page).to have_content(title)
+    expect(page).to have_content(message)
+    within '.links' do
+	    click_link 'Messages'
+    end
+    expect(page).to have_content('Sent (1)')
+    within '#sent' do
+	    expect(page).to have_content(title)
+	    expect(page).to have_content(message)
+	    expect(page).to have_content(sender.username)
+	    expect(page).to have_content(recipient.username)
+    end
+  end
+end
+
+feature 'Message receiving' do
+  let!(:message) { create :message }
+
+  background do
+    sign_in_as message.recipient
+  end
+
+  scenario 'User receives a message' do
+    visit root_path
+    within '.links' do
+    	expect(page).to have_content('(1)')
+	    click_link 'Messages'
+    end
+    expect(page).to have_content(message.title)
+    expect(page).to have_content(message.text)
+    expect(page).to have_content(message.sender.username)
+  end
+end
\ No newline at end of file

From b91960066398a669e7c8370aa3a1e2baccc26e66 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Sun, 7 Jun 2015 00:26:09 +0100
Subject: [PATCH 55/76] Added initial issue specs

---
 app/controllers/shoutmsgs_controller.rb |  1 +
 spec/models/issue_spec.rb               | 63 +++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 spec/models/issue_spec.rb

diff --git a/app/controllers/shoutmsgs_controller.rb b/app/controllers/shoutmsgs_controller.rb
index 041116c..395328a 100644
--- a/app/controllers/shoutmsgs_controller.rb
+++ b/app/controllers/shoutmsgs_controller.rb
@@ -15,6 +15,7 @@ class ShoutmsgsController < ApplicationController
 
   def create
     @shoutmsg = Shoutmsg.new params[:shoutmsg]
+    puts @shoutmsg
     @shoutmsg.user = cuser
     raise AccessError unless @shoutmsg.can_create? cuser
 
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
new file mode 100644
index 0000000..5912530
--- /dev/null
+++ b/spec/models/issue_spec.rb
@@ -0,0 +1,63 @@
+# == Schema Information
+#
+# Table name: issues
+#
+#  id          :integer          not null, primary key
+#  title       :string(255)
+#  status      :integer
+#  assigned_id :integer
+#  category_id :integer
+#  text        :text
+#  author_id   :integer
+#  created_at  :datetime
+#  updated_at  :datetime
+#  solution    :text
+#  text_parsed :text
+#
+
+require 'spec_helper'
+
+describe 'User' do
+	describe 'Permissions' do
+		let!(:user) { create :user }
+		let!(:admin) { create :user, :admin }
+		let(:issue) { Issue.new }
+
+		describe 'can_show?' do
+			it 'returns true for author' do
+				issue.author = user
+				expect(issue.can_show? user).to be_true
+			end
+			it 'returns true for admin' do
+				expect(issue.can_show? admin).to be_true
+			end
+			it 'returns false if neither admin nor author' do
+				expect(issue.can_show? user).to be_false
+			end
+		end
+		describe 'can_create? is weird and broken' do
+			it "returns true if no params" do
+				expect(issue.can_create? user).to be_true
+			end
+			it 'returns false if no params' do
+				expect(issue.can_create? user, {foo: "bar"}).to be_false
+			end
+		end
+		describe 'can_update?' do
+			it 'returns true for admin' do
+				expect(issue.can_update? admin).to be_true
+			end
+			it 'returns false for non-admin' do
+				expect(issue.can_update? user).to be_false
+			end
+		end
+		describe 'can_destroy?' do
+			it 'returns true for admin' do
+				expect(issue.can_destroy? admin).to be_true
+			end
+			it 'returns false for non-admin' do
+				expect(issue.can_destroy? user).to be_false
+			end
+		end
+	end
+end 
\ No newline at end of file

From 3f49bdf8b5fbbf35e9f7d8037d24aae96088de07 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Sun, 7 Jun 2015 00:58:41 +0100
Subject: [PATCH 56/76] Added issue feature spec

---
 spec/factories/issue.rb             |  8 +++++
 spec/features/issues/issues_spec.rb | 50 +++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 spec/factories/issue.rb
 create mode 100644 spec/features/issues/issues_spec.rb

diff --git a/spec/factories/issue.rb b/spec/factories/issue.rb
new file mode 100644
index 0000000..f7a9d4d
--- /dev/null
+++ b/spec/factories/issue.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+	factory :issue do
+		sequence(:title) { |n| "Issue title #{n}"  } 
+		sequence(:text) { |n| "Issue Text #{n}"  } 
+		status Issue::STATUS_OPEN
+		association :author, factory: :user
+	end
+end
\ No newline at end of file
diff --git a/spec/features/issues/issues_spec.rb b/spec/features/issues/issues_spec.rb
new file mode 100644
index 0000000..2b01efc
--- /dev/null
+++ b/spec/features/issues/issues_spec.rb
@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+feature 'Issues' do
+	let!(:user) { create :user }
+
+	scenario 'creation' do
+		sign_in_as user
+		click_link 'Agenda'
+		click_link 'Issues'
+		click_link 'New issue'
+		expect(page).to have_content('New Issue')
+		issue_title = 'My Problem'
+		issue_description = "There's a fly in my soup"
+		fill_in 'Title', with: issue_title
+		fill_in 'Text', with: issue_description
+		click_button 'Submit'
+		expect(page).to have_content('Issue was successfully created.')
+		expect(page).to have_content(issue_title)
+		expect(page).to have_content(issue_description)
+	end	
+
+	feature 'adminstration' do
+		let!(:admin) { create :user, :admin }
+		let!(:issue) { create :issue, author: user }
+
+		scenario 'issue management' do
+			sign_in_as admin
+			click_link 'Admin'
+			click_link 'Issues (1)'
+			within '#open' do
+				expect(page).to have_content(issue.title)
+				expect(page).to have_content(issue.author.username)
+			end
+			visit edit_issue_path(issue)
+			expect(page).to have_content('Editing Issue')
+			solution = "Use a baseball bat"
+			fill_in "Title", with: "Foo"
+			fill_in "Text", with: "Bar"
+			fill_in "Solution", with: solution
+			select 'Solved', from: 'Status'
+			click_button 'Submit'
+			expect(page).to have_content('Issue was successfully updated.')
+			visit issues_path
+			within '#solved' do
+				expect(page).to have_content("Foo")
+				expect(page).to have_content(issue.author.username)
+			end
+		end
+	end
+end
\ No newline at end of file

From 9cd652c3bf6abdf26c166b26f95a00976b669dea Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Sun, 7 Jun 2015 10:20:23 +0100
Subject: [PATCH 57/76] Fix for can_create? weirdness

---
 app/models/issue.rb       | 4 ++--
 spec/models/issue_spec.rb | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index f31f870..594ddb0 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -99,8 +99,8 @@ class Issue < ActiveRecord::Base
     cuser and !cuser.nil? and ((author == cuser) or cuser.admin?)
   end
 
-  def can_create? cuser, params = {}
-    Verification.contain params, [:title, :category_id, :text]
+  def can_create? cuser
+    true
   end
 
   def can_update? cuser
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 5912530..dc5f961 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -35,12 +35,9 @@ describe 'User' do
 				expect(issue.can_show? user).to be_false
 			end
 		end
-		describe 'can_create? is weird and broken' do
-			it "returns true if no params" do
-				expect(issue.can_create? user).to be_true
-			end
-			it 'returns false if no params' do
-				expect(issue.can_create? user, {foo: "bar"}).to be_false
+		describe 'can_create?' do
+			it "returns true" do
+				expect(issue.can_create? nil).to be_true
 			end
 		end
 		describe 'can_update?' do

From ea232e86ec4f28e4eddbdb48795a72db96101e60 Mon Sep 17 00:00:00 2001
From: simplefl <phoenixfl@gmx.de>
Date: Thu, 11 Jun 2015 17:18:51 +0200
Subject: [PATCH 58/76] Up wait_timeout to 90.

---
 config/database.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/database.yml b/config/database.yml
index 0573d66..b91e757 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -6,7 +6,7 @@ base: &db
   username: <%= ENV['MYSQL_USERNAME'] %>
   password: <%= ENV['MYSQL_PASSWORD'] %>
   pool: <%= Integer(ENV['MYSQL_CONNECTION_POOL'] || 8) %>
-  wait_timeout: 30
+  wait_timeout: 90
   reconnect: true
 
 

From 5df8b917089b057ee9e129edba3f14a4ae16c6b3 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Mon, 18 May 2015 17:24:18 +0100
Subject: [PATCH 59/76] Remove rcon from log model

---
 app/models/log.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/models/log.rb b/app/models/log.rb
index 4a24f5f..71e0794 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -21,8 +21,6 @@ class Log < ActiveRecord::Base
   attr_accessor :text
 
   DOMAIN_LOG = 1
-  DOMAIN_RCON_COMMAND = 2
-  DOMAIN_RCON_RESPONSE = 3
   DOMAIN_INFO = 4
 
   TEAM_MARINES = 1
@@ -52,10 +50,6 @@ class Log < ActiveRecord::Base
   belongs_to :actor, :class_name => "Rounder"
   belongs_to :target, :class_name => "Rounder"
 
-  #	def domains
-  #		return {DOMAIN_LOG => "HL Log", DOMAIN_RCON_COMMAND => "Rcon Command Log", DOMAIN_RCON_RESPONSE => "Rcon Response Log", DOMAIN_INFO => "Action Log"}
-  #	end
-
   def since
     (created_at - round.start).to_i
   end

From e9296246e26b8afd951a418605f2bcbfaa3f3cda Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Mon, 18 May 2015 17:24:31 +0100
Subject: [PATCH 60/76] Remove rcon from readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b7c9e71..efe83c8 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Features:
 - Map database
 - Votable polls
 - Twitter feed
-- Server database and RCON interface
+- Server database
 - Log file parsing (partially complete)
 
 ## Contributors

From 754e3d1156d20bc781b535ef4e71fe8b05975cb9 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Mon, 18 May 2015 17:30:45 +0100
Subject: [PATCH 61/76] Remove rcon column from servers table

---
 app/models/server.rb                                  | 4 +---
 app/views/servers/_form.html.erb                      | 4 ----
 db/migrate/20150518162749_remove_rcon_from_servers.rb | 9 +++++++++
 db/schema.rb                                          | 3 +--
 spec/models/server_spec.rb                            | 1 -
 5 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20150518162749_remove_rcon_from_servers.rb

diff --git a/app/models/server.rb b/app/models/server.rb
index aa0339f..129f684 100644
--- a/app/models/server.rb
+++ b/app/models/server.rb
@@ -8,7 +8,6 @@
 #  dns             :string(255)
 #  ip              :string(255)
 #  port            :string(255)
-#  rcon            :string(255)
 #  password        :string(255)
 #  irc             :string(255)
 #  user_id         :integer
@@ -44,7 +43,7 @@ class Server < ActiveRecord::Base
   attr_protected :id, :user_id, :updated_at, :created_at, :map, :players, :maxplayers, :ping, :version
 
   validates_length_of [:name, :dns,], :in => 1..30
-  validates_length_of [:rcon, :password, :irc], :maximum => 30, :allow_blank => true
+  validates_length_of [:password, :irc], :maximum => 30, :allow_blank => true
   validates_length_of :description, :maximum => 255, :allow_blank => true
   validates_format_of :ip, :with => /\A[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\z/
   validates_format_of :port, :with => /\A[0-9]{1,5}\z/
@@ -81,7 +80,6 @@ class Server < ActiveRecord::Base
   non_versioned_columns << 'dns'
   non_versioned_columns << 'ip'
   non_versioned_columns << 'port'
-  non_versioned_columns << 'rcon'
   non_versioned_columns << 'password'
   non_versioned_columns << 'irc'
   non_versioned_columns << 'user_id'
diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb
index 97c0403..ab8bcdb 100644
--- a/app/views/servers/_form.html.erb
+++ b/app/views/servers/_form.html.erb
@@ -16,10 +16,6 @@
       </div>      
     </div>
   </div>
-  <div class="fields horizontal">
-    <%= f.label :rcon %>
-    <%= f.text_field :rcon %>
-  </div>
   <div class="fields horizontal">
     <%= f.label :password %>
     <%= f.text_field :password %>
diff --git a/db/migrate/20150518162749_remove_rcon_from_servers.rb b/db/migrate/20150518162749_remove_rcon_from_servers.rb
new file mode 100644
index 0000000..400c2e3
--- /dev/null
+++ b/db/migrate/20150518162749_remove_rcon_from_servers.rb
@@ -0,0 +1,9 @@
+class RemoveRconFromServers < ActiveRecord::Migration
+  def up
+    remove_column :servers, :rcon
+  end
+
+  def down
+    add_column :servers, :rcon, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0839005..e0aad41 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20141010193221) do
+ActiveRecord::Schema.define(:version => 20150518162749) do
 
   create_table "admin_requests", :force => true do |t|
     t.string   "addr"
@@ -722,7 +722,6 @@ ActiveRecord::Schema.define(:version => 20141010193221) do
     t.string   "dns"
     t.string   "ip"
     t.string   "port"
-    t.string   "rcon"
     t.string   "password"
     t.string   "irc"
     t.integer  "user_id"
diff --git a/spec/models/server_spec.rb b/spec/models/server_spec.rb
index 19374e8..a4ec8cf 100644
--- a/spec/models/server_spec.rb
+++ b/spec/models/server_spec.rb
@@ -8,7 +8,6 @@
 #  dns             :string(255)
 #  ip              :string(255)
 #  port            :string(255)
-#  rcon            :string(255)
 #  password        :string(255)
 #  irc             :string(255)
 #  user_id         :integer

From 6aca0dcc43b0948a2e222d9de116827a1490c879 Mon Sep 17 00:00:00 2001
From: cblanc <cablanchard@gmail.com>
Date: Mon, 18 May 2015 17:33:38 +0100
Subject: [PATCH 62/76] Remove rcon from test

---
 spec/support/features/server_helpers.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/support/features/server_helpers.rb b/spec/support/features/server_helpers.rb
index b28df90..446f34c 100644
--- a/spec/support/features/server_helpers.rb
+++ b/spec/support/features/server_helpers.rb
@@ -4,7 +4,6 @@ module Features
       dns = 'ServerDns.com'
       ip = '192.168.1.1'
       port = '8000'
-      rcon = 'whatsrcon'
       password = 'secret'
       name = 'MyNsServer'
       description = 'My NS Server'

From 53d054c7255080f39a37f395c174bb3fec6be39e Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 13:56:25 +0100
Subject: [PATCH 63/76] Removed unused accessors and validation

---
 app/models/ban.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/models/ban.rb b/app/models/ban.rb
index e234580..5a7eaf9 100644
--- a/app/models/ban.rb
+++ b/app/models/ban.rb
@@ -27,13 +27,12 @@ class Ban < ActiveRecord::Base
   VENT_BANS = "tmp/bans.txt"
 
   attr_protected :id, :created_at, :updated_at
-  attr_accessor :ts, :sign, :len, :user_name
+  attr_accessor :len, :user_name
 
   scope :ordered, order: "created_at DESC"
   scope :effective, conditions: "expiry > UTC_TIMESTAMP()"
   scope :ineffective, conditions: "expiry < UTC_TIMESTAMP()"
 
-  validate :validate_ts
   validate :validate_type
   validate :validate_ventban
   validates_format_of :steamid, with: /\A([0-9]{1,10}:){2}[0-9]{1,10}\Z/, allow_blank: true
@@ -58,12 +57,6 @@ class Ban < ActiveRecord::Base
      TYPE_GATHER => "Gather"}
   end
 
-  def validate_ts
-    if ts and Verification.verify(steamid + ts.to_s) != sign
-      errors.add :ts, I18n.t(:wrong_verification_code)
-    end
-  end
-
   def validate_type
     errors.add :ban_type, I18n.t(:invalid_ban_type) unless types.include? ban_type
   end

From fec99e15534a97f9f9707e19082b8affbedad859 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 13:56:42 +0100
Subject: [PATCH 64/76] Remove unusued method

---
 app/models/ban.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/models/ban.rb b/app/models/ban.rb
index 5a7eaf9..44fa7e1 100644
--- a/app/models/ban.rb
+++ b/app/models/ban.rb
@@ -87,12 +87,4 @@ class Ban < ActiveRecord::Base
   def can_destroy? cuser
     cuser and cuser.admin?
   end
-
-  def self.refresh
-    #file = File.new(VENT_BANS, "w")
-    #Ban.all(:conditions => ["ban_type = ? AND expiry > UTC_TIMESTAMP()", TYPE_VENT]).each do |ban|
-    #	file.write "#{ban.ip},,,"
-    #end
-    #file.close
-  end
 end

From 74e5bce311220239675652cd212f29526338ffcf Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 13:57:15 +0100
Subject: [PATCH 65/76] Remove unrouted controller method

---
 app/controllers/bans_controller.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/controllers/bans_controller.rb b/app/controllers/bans_controller.rb
index a3ae9fb..83496c5 100644
--- a/app/controllers/bans_controller.rb
+++ b/app/controllers/bans_controller.rb
@@ -8,10 +8,6 @@ class BansController < ApplicationController
   def show
   end
 
-  def refresh
-    Ban.refresh
-  end
-
   def new
     @ban = Ban.new
     raise AccessError unless @ban.can_create? cuser

From 0035a2f2db2dae5ebee001a04ba6a21c8b4ffb79 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 14:16:31 +0100
Subject: [PATCH 66/76] Added tests for bans

---
 spec/models/ban_spec.rb | 73 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 spec/models/ban_spec.rb

diff --git a/spec/models/ban_spec.rb b/spec/models/ban_spec.rb
new file mode 100644
index 0000000..32bb277
--- /dev/null
+++ b/spec/models/ban_spec.rb
@@ -0,0 +1,73 @@
+# == Schema Information
+#
+# Table name: bans
+#
+#  id         :integer          not null, primary key
+#  steamid    :string(255)
+#  user_id    :integer
+#  addr       :string(255)
+#  server_id  :integer
+#  expiry     :datetime
+#  reason     :string(255)
+#  created_at :datetime
+#  updated_at :datetime
+#  ban_type   :integer
+#  ip         :string(255)
+#
+
+require 'spec_helper'
+
+describe Ban do
+	let!(:user) { create :user }
+	let(:ban) { Ban.new }
+	let!(:server) { create :server }
+
+	describe '#check_user' do
+		it "assigns user by user_name" do
+			ban.user_name = user.username
+			ban.check_user
+			expect(ban.user).to eq(user)
+		end
+		it "assigns user and server if user_name not present" do
+			ban.steamid = user.steamid
+			ban.addr = server.addr
+			ban.check_user
+			expect(ban.user).to eq(user)
+			expect(ban.server).to eq(server)
+		end
+	end
+	
+	describe 'Permissions' do
+		let!(:user) { create :user }
+		let!(:admin) { create :user, :admin }
+		let!(:server_user) { create :user }
+		let(:ban) { Ban.new }
+
+		describe 'can_create?' do
+			it 'returns true for admins' do
+				expect(ban.can_create? admin).to be_true
+			end
+			it 'returns false for non-admins' do
+				expect(ban.can_create? user).to be_false
+			end
+		end
+
+		describe 'can_destroy?' do
+			it 'returns true for admin' do
+				expect(ban.can_destroy? admin).to be_true
+			end
+			it 'returns false for non-admins' do
+				expect(ban.can_destroy? user).to be_false
+			end
+		end
+
+		describe 'can_update?' do
+			it 'returns true for admin' do
+				expect(ban.can_update? admin).to be_true
+			end
+			it 'returns false for non-admins' do
+				expect(ban.can_update? user).to be_false
+			end
+		end
+	end
+end

From 5fc209174caa6007c6ea09a97798014998c07679 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 14:17:28 +0100
Subject: [PATCH 67/76] Remove plugins all hush like

---
 app/controllers/plugin_controller.rb | 128 ---------------------------
 config/routes.rb                     |   7 --
 2 files changed, 135 deletions(-)
 delete mode 100644 app/controllers/plugin_controller.rb

diff --git a/app/controllers/plugin_controller.rb b/app/controllers/plugin_controller.rb
deleted file mode 100644
index 02e7a73..0000000
--- a/app/controllers/plugin_controller.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-class PluginController < ApplicationController
-  def esi
-    buffer = []
-    out = []
-    buffer << Time.now.utc.to_i
-    buffer << "1.2"
-    buffer << params[:ch] ? params[:ch] : ""
-    out << "#ESI#"
-    out << Verification.verify(buffer.join)
-    out << buffer.join("\r")
-    render_out out
-  end
-
-  def user
-    buffer = []
-    out = []
-
-    if ban = Ban.first(:conditions => ["expiry > UTC_TIMESTAMP() AND steamid = ? AND ban_type = ?", params[:id], Ban::TYPE_SERVER])
-      out << "#USER#"
-      out << "BANNED"
-      out << ban.expiry.utc.to_i
-      out << ban.reason
-      out << "\r\r\r\r\r\r\r"
-    elsif user = User.first(:conditions => {:steamid => params[:id]})
-      teamer = (user.team ? user.teamers.active.of_team(user.team).first : nil)
-      icon = 0
-      rank = "User"
-      if Group.find(Group::DONORS).users.exists?(user)
-        rank = "Donor"
-        icon = icon | 1
-      end
-      if Group.find(Group::CHAMPIONS).users.exists?(user)
-        icon = icon | 2
-      end
-      if user.ref?
-        rank = "Referee"
-        icon = icon | 4
-      end
-      if user.admin?
-        rank = "Admin"
-        icon = icon | 8
-      end
-
-      buffer << user.steamid
-      buffer << user.username
-      buffer << user.lastip
-      buffer << (user.team ? Verification.uncrap(user.team.to_s) : "No Team")
-      buffer << user.id
-      buffer << user.team_id
-      buffer << rank
-      buffer << (teamer ? teamer.ranks[teamer.rank] : "")
-      buffer << icon
-      buffer << params[:ch] ? params[:ch] : ""
-      buffer << (user.can_play? ? "1" : "0")
-
-      out << "#USER#"
-      out << Verification.verify(buffer.join)
-      out << buffer.join("\r")
-    else
-      out << "#FAIL#"
-    end
-
-    render_out out
-  end
-
-  #def admin
-  #	areq = AdminRequest.new
-  #	areq.addr = params[:addr]
-  #	areq.pwd = params[:pwd]
-  #	areq.msg = params[:msg]
-  #	areq.player = params[:player]
-  #	areq.user_id = params[:user]
-  #	areq.save!
-  #	render :text => "Ok"
-  #end
-
-  def ban
-    ban = Ban.new
-    ban.steamid = params[:id]
-    ban.ts = params[:ts]
-    ban.sign = params[:sign]
-    ban.expiry = DateTime.now.ago(-(params[:len].to_i*60))
-    ban.addr = params[:addr]
-    ban.reason = params[:reason]
-    ban.ban_type = Ban::TYPE_SERVER
-    ban.save!
-
-    render :text => "Ok"
-  end
-
-  def hltv_req
-    if params[:game].to_i > 0
-      if match = Match.first(:conditions => {:id => params[:game]})
-        match.hltv_record params[:addr], params[:pwd]
-        hltv = match.hltv
-      else
-        render :text => t(:matches_notfound)
-      end
-    else
-      hltv = Server.hltvs.active.unreserved_now.unreserved_hltv_around(DateTime.now).first unless hltv
-      render :text => t(:hltv_notavailable) unless hltv
-
-      hltv.recording = params[:game]
-      hltv.reservation = params[:addr]
-      hltv.pwd = params[:pwd]
-      hltv.save!
-    end
-
-    render :text => t(:hltv_sent)
-  end
-
-  def hltv_move
-    Server.move params[:addr], params[:newaddr], params[:newpwd]
-    render :text => t(:hltv_movedd) + params[:newaddr]
-  end
-
-  def hltv_stop
-    Server.stop params[:addr]
-    render :text => t(:hltv_stopped)
-  end
-
-  private
-
-  def render_out out
-    @text = out.join("\r")
-    render :layout => false
-  end
-end
diff --git a/config/routes.rb b/config/routes.rb
index 5f247e1..9aaca00 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -111,13 +111,6 @@ Ensl::Application.routes.draw do
   match 'movies/preview'
   match 'movies/snapshot'
 
-  match 'plugin/esi'
-  match 'plugin/user'
-  match 'plugin/ban'
-  match 'plugin/hltv_req'
-  match 'plugin/hltv_move'
-  match 'plugin/hltv_stop'
-
   match 'users/forgot'
   match 'users/recover'
   match 'users/agenda'

From 37834584f5d432383256fcf5155e2f621384350a Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 14:18:50 +0100
Subject: [PATCH 68/76] Removed for githubs sake

---
 lib/verification.rb | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/lib/verification.rb b/lib/verification.rb
index 98257b4..0ca0403 100644
--- a/lib/verification.rb
+++ b/lib/verification.rb
@@ -1,45 +1,4 @@
 module Verification
-	def Verification.verify input
-		md5 = Digest::MD5.hexdigest("9WvcZ9hX" + input + "KF7L4luQ").upcase.split(//)
-		chars = ["A", "B", "C", "D", "E", "F"]
-		nums = []
-		lastPos = md5[31].to_i
-		result = ""
-
-		for i in 0..9
-			pos = md5[i].to_i
-
-			if pos == 0
-				pos = lastPos ** (i % 4)
-			elsif (pos % 4) == 0
-				pos = pos * lastPos + i
-			elsif (pos % 3) == 0
-				pos = pos ** (i % 4)
-			elsif (pos % 2) == 0
-				pos = pos * i + pos
-			end
-
-			pos = (pos > 31) ? (pos % 32) : pos
-			curChar = md5[31 - pos]
-			curNum = curChar.to_i
-
-			if nums.include? curNum
-				if curNum == 0
-					curChar = chars[pos % 6]
-				else
-					curChar = (pos % 10).to_s
-				end
-				curNum = curChar.to_i
-			end
-
-			nums << curNum
-			result << curChar
-			lastPos = pos
-		end
-
-		return result
-	end
-
 	def Verification.uncrap str
 		str.to_s.gsub(/[^A-Za-z0-9_\-]/, "")
 	end

From 8ac4fd770bf5425929db0ad193c203b6e24fa309 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Fri, 22 May 2015 14:22:03 +0100
Subject: [PATCH 69/76] Remove unusued methods

---
 lib/verification.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/verification.rb b/lib/verification.rb
index 0ca0403..9611585 100644
--- a/lib/verification.rb
+++ b/lib/verification.rb
@@ -3,10 +3,6 @@ module Verification
 		str.to_s.gsub(/[^A-Za-z0-9_\-]/, "")
 	end
 
-	def Verification.match_addr str
-		str.to_s.match(/(([0-9]{1,3}\.){3}[0-9]{1,3}):?([0-9]{0,5})/)[0]
-	end
-
 	def Verification.random_string len
 		chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
 		str = ""

From 6b6a335c9fd322e4407ab10870ee7ac4c632cac0 Mon Sep 17 00:00:00 2001
From: simplefl <phoenixfl@gmx.de>
Date: Tue, 26 May 2015 19:06:40 +0200
Subject: [PATCH 70/76] Add wait_timeout and reconnect to database.ym.

---
 config/database.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/database.yml b/config/database.yml
index c18ed69..0573d66 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -6,6 +6,9 @@ base: &db
   username: <%= ENV['MYSQL_USERNAME'] %>
   password: <%= ENV['MYSQL_PASSWORD'] %>
   pool: <%= Integer(ENV['MYSQL_CONNECTION_POOL'] || 8) %>
+  wait_timeout: 30
+  reconnect: true
+
 
 development:
   <<: *db

From bfd4184073478d3d8d92983b3641e4f747a23124 Mon Sep 17 00:00:00 2001
From: Chris Blanchard <chris@iddqd.org>
Date: Tue, 2 Jun 2015 17:55:08 +0100
Subject: [PATCH 71/76] Remove rcon from annotate and added message model specs

---
 spec/factories/ban.rb       | 23 +++++++++++++++
 spec/factories/message.rb   |  9 ++++++
 spec/models/message_spec.rb | 57 +++++++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 spec/factories/ban.rb
 create mode 100644 spec/factories/message.rb
 create mode 100644 spec/models/message_spec.rb

diff --git a/spec/factories/ban.rb b/spec/factories/ban.rb
new file mode 100644
index 0000000..81a5c7b
--- /dev/null
+++ b/spec/factories/ban.rb
@@ -0,0 +1,23 @@
+FactoryGirl.define do
+	factory :ban do
+		ban_type Ban::TYPE_SITE
+		expiry Date.today + 1
+		# Hack because of the awkward way bans are created (requires user_name)
+		before(:create) do |ban|
+			if ban.user.nil?
+				user = create :user
+				ban.user_name = user.username
+			else 
+				ban.user_name = ban.user.username
+			end
+		end
+	end
+
+	trait :mute do
+		ban_type Ban::TYPE_MUTE
+	end
+
+	trait :expired do
+		expiry Date.yesterday - 1
+	end
+end
\ No newline at end of file
diff --git a/spec/factories/message.rb b/spec/factories/message.rb
new file mode 100644
index 0000000..1f44662
--- /dev/null
+++ b/spec/factories/message.rb
@@ -0,0 +1,9 @@
+FactoryGirl.define do
+	factory :message do
+		association :sender, factory: :user
+		association :recipient, factory: :user
+		sequence(:text)    { |n| "text-#{n}" }
+		sequence(:title)    { |n| "title-#{n}" }
+		sequence(:text_parsed)    { |n| "text-#{n}" }
+	end
+end
\ No newline at end of file
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
new file mode 100644
index 0000000..b0aa6ef
--- /dev/null
+++ b/spec/models/message_spec.rb
@@ -0,0 +1,57 @@
+# == Schema Information
+#
+# Table name: messages
+#
+#  id             :integer          not null, primary key
+#  sender_type    :string(255)
+#  sender_id      :integer
+#  recipient_type :string(255)
+#  recipient_id   :integer
+#  title          :string(255)
+#  text           :text
+#  created_at     :datetime
+#  updated_at     :datetime
+#  text_parsed    :text
+#
+
+require 'spec_helper'
+
+describe Message do
+	let!(:user) { create :user }
+
+	describe 'create' do
+		let(:message) { build :message }
+		it 'creates a new message' do
+			expect(message.valid?).to be_true
+			expect do
+				message.save!
+			end.to change(Message, :count).by(1)
+		end
+	end
+
+	describe 'Permissions' do
+		let(:message) { Message.new }
+		describe 'can_create?' do
+			it 'returns true for user' do
+				expect(message.can_create?(user)).to be_true
+			end
+			it 'returns false if user is banned' do
+				create :ban, :mute, user: user
+				expect(message.can_create?(user)).to be_false
+			end
+		end
+
+		describe 'can_show?' do
+			let!(:message) { create :message }
+			it 'returns true if sender' do
+				expect(message.can_show?(message.sender)).to be_true
+			end
+			it 'returns true if receiver' do
+				expect(message.can_show?(message.recipient)).to be_true
+			end
+			it 'returns false if neither sender nor receiver' do
+				expect(message.can_show?(user)).to be_false
+			end
+		end
+	end
+end
\ No newline at end of file

From c318c60b2a2f321c5ea33959fdb625111d2438b6 Mon Sep 17 00:00:00 2001
From: Chris Blanchard <chris@iddqd.org>
Date: Tue, 2 Jun 2015 18:50:41 +0100
Subject: [PATCH 72/76] Add recipient to messages

---
 app/views/messages/_message.html.erb    |  4 +-
 spec/features/messages/user_messages.rb | 59 +++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 spec/features/messages/user_messages.rb

diff --git a/app/views/messages/_message.html.erb b/app/views/messages/_message.html.erb
index 8422028..aed367f 100644
--- a/app/views/messages/_message.html.erb
+++ b/app/views/messages/_message.html.erb
@@ -5,5 +5,5 @@
 </p>
 
 <p>
-  <%= namelink message.sender %> on <em><%= longdate message.created_at %></em>
-</p>
+  To: <%= namelink message.recipient %> From: <%= namelink message.sender %> on <em><%= longdate message.created_at %></em></em>
+</p>
\ No newline at end of file
diff --git a/spec/features/messages/user_messages.rb b/spec/features/messages/user_messages.rb
new file mode 100644
index 0000000..7f43b7b
--- /dev/null
+++ b/spec/features/messages/user_messages.rb
@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+feature 'Message creation' do
+  let!(:sender) { create :user }
+  let!(:recipient) { create :user }
+
+  background do
+    sign_in_as sender
+  end
+
+  scenario 'User creates a message' do
+    visit root_path
+    within '.links' do
+	    click_link 'Messages'
+    end
+    expect(page).to have_content('Sent (0)')
+    visit user_path(recipient)
+    expect(page).to have_content(recipient.username)
+    click_link 'Send PM'
+    expect(page).to have_content('New Message')
+    title = "This is my title"
+    message = "This is my message"
+    fill_in 'Title', with: title
+    fill_in 'Text', with: message
+    click_button 'Send Message'
+    expect(page).to have_content('Message was successfully sent.')
+    expect(page).to have_content(title)
+    expect(page).to have_content(message)
+    within '.links' do
+	    click_link 'Messages'
+    end
+    expect(page).to have_content('Sent (1)')
+    within '#sent' do
+	    expect(page).to have_content(title)
+	    expect(page).to have_content(message)
+	    expect(page).to have_content(sender.username)
+	    expect(page).to have_content(recipient.username)
+    end
+  end
+end
+
+feature 'Message receiving' do
+  let!(:message) { create :message }
+
+  background do
+    sign_in_as message.recipient
+  end
+
+  scenario 'User receives a message' do
+    visit root_path
+    within '.links' do
+    	expect(page).to have_content('(1)')
+	    click_link 'Messages'
+    end
+    expect(page).to have_content(message.title)
+    expect(page).to have_content(message.text)
+    expect(page).to have_content(message.sender.username)
+  end
+end
\ No newline at end of file

From 41dbda50c08dff711316dd3f0ca6338383cb5897 Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Sun, 7 Jun 2015 00:26:09 +0100
Subject: [PATCH 73/76] Added initial issue specs

---
 app/controllers/shoutmsgs_controller.rb |  1 +
 spec/models/issue_spec.rb               | 63 +++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 spec/models/issue_spec.rb

diff --git a/app/controllers/shoutmsgs_controller.rb b/app/controllers/shoutmsgs_controller.rb
index 041116c..395328a 100644
--- a/app/controllers/shoutmsgs_controller.rb
+++ b/app/controllers/shoutmsgs_controller.rb
@@ -15,6 +15,7 @@ class ShoutmsgsController < ApplicationController
 
   def create
     @shoutmsg = Shoutmsg.new params[:shoutmsg]
+    puts @shoutmsg
     @shoutmsg.user = cuser
     raise AccessError unless @shoutmsg.can_create? cuser
 
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
new file mode 100644
index 0000000..5912530
--- /dev/null
+++ b/spec/models/issue_spec.rb
@@ -0,0 +1,63 @@
+# == Schema Information
+#
+# Table name: issues
+#
+#  id          :integer          not null, primary key
+#  title       :string(255)
+#  status      :integer
+#  assigned_id :integer
+#  category_id :integer
+#  text        :text
+#  author_id   :integer
+#  created_at  :datetime
+#  updated_at  :datetime
+#  solution    :text
+#  text_parsed :text
+#
+
+require 'spec_helper'
+
+describe 'User' do
+	describe 'Permissions' do
+		let!(:user) { create :user }
+		let!(:admin) { create :user, :admin }
+		let(:issue) { Issue.new }
+
+		describe 'can_show?' do
+			it 'returns true for author' do
+				issue.author = user
+				expect(issue.can_show? user).to be_true
+			end
+			it 'returns true for admin' do
+				expect(issue.can_show? admin).to be_true
+			end
+			it 'returns false if neither admin nor author' do
+				expect(issue.can_show? user).to be_false
+			end
+		end
+		describe 'can_create? is weird and broken' do
+			it "returns true if no params" do
+				expect(issue.can_create? user).to be_true
+			end
+			it 'returns false if no params' do
+				expect(issue.can_create? user, {foo: "bar"}).to be_false
+			end
+		end
+		describe 'can_update?' do
+			it 'returns true for admin' do
+				expect(issue.can_update? admin).to be_true
+			end
+			it 'returns false for non-admin' do
+				expect(issue.can_update? user).to be_false
+			end
+		end
+		describe 'can_destroy?' do
+			it 'returns true for admin' do
+				expect(issue.can_destroy? admin).to be_true
+			end
+			it 'returns false for non-admin' do
+				expect(issue.can_destroy? user).to be_false
+			end
+		end
+	end
+end 
\ No newline at end of file

From 46c6c89aec66a769550f0686fee514d2a4ef7e4a Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Sun, 7 Jun 2015 00:58:41 +0100
Subject: [PATCH 74/76] Added issue feature spec

---
 spec/factories/issue.rb             |  8 +++++
 spec/features/issues/issues_spec.rb | 50 +++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 spec/factories/issue.rb
 create mode 100644 spec/features/issues/issues_spec.rb

diff --git a/spec/factories/issue.rb b/spec/factories/issue.rb
new file mode 100644
index 0000000..f7a9d4d
--- /dev/null
+++ b/spec/factories/issue.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+	factory :issue do
+		sequence(:title) { |n| "Issue title #{n}"  } 
+		sequence(:text) { |n| "Issue Text #{n}"  } 
+		status Issue::STATUS_OPEN
+		association :author, factory: :user
+	end
+end
\ No newline at end of file
diff --git a/spec/features/issues/issues_spec.rb b/spec/features/issues/issues_spec.rb
new file mode 100644
index 0000000..2b01efc
--- /dev/null
+++ b/spec/features/issues/issues_spec.rb
@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+feature 'Issues' do
+	let!(:user) { create :user }
+
+	scenario 'creation' do
+		sign_in_as user
+		click_link 'Agenda'
+		click_link 'Issues'
+		click_link 'New issue'
+		expect(page).to have_content('New Issue')
+		issue_title = 'My Problem'
+		issue_description = "There's a fly in my soup"
+		fill_in 'Title', with: issue_title
+		fill_in 'Text', with: issue_description
+		click_button 'Submit'
+		expect(page).to have_content('Issue was successfully created.')
+		expect(page).to have_content(issue_title)
+		expect(page).to have_content(issue_description)
+	end	
+
+	feature 'adminstration' do
+		let!(:admin) { create :user, :admin }
+		let!(:issue) { create :issue, author: user }
+
+		scenario 'issue management' do
+			sign_in_as admin
+			click_link 'Admin'
+			click_link 'Issues (1)'
+			within '#open' do
+				expect(page).to have_content(issue.title)
+				expect(page).to have_content(issue.author.username)
+			end
+			visit edit_issue_path(issue)
+			expect(page).to have_content('Editing Issue')
+			solution = "Use a baseball bat"
+			fill_in "Title", with: "Foo"
+			fill_in "Text", with: "Bar"
+			fill_in "Solution", with: solution
+			select 'Solved', from: 'Status'
+			click_button 'Submit'
+			expect(page).to have_content('Issue was successfully updated.')
+			visit issues_path
+			within '#solved' do
+				expect(page).to have_content("Foo")
+				expect(page).to have_content(issue.author.username)
+			end
+		end
+	end
+end
\ No newline at end of file

From a4d9c41e517ed99c9af9c453798e9bd50ef17fde Mon Sep 17 00:00:00 2001
From: Christopher Blanchard <cablanchard@epicurus.home>
Date: Sun, 7 Jun 2015 10:20:23 +0100
Subject: [PATCH 75/76] Fix for can_create? weirdness

---
 app/models/issue.rb       | 4 ++--
 spec/models/issue_spec.rb | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index f31f870..594ddb0 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -99,8 +99,8 @@ class Issue < ActiveRecord::Base
     cuser and !cuser.nil? and ((author == cuser) or cuser.admin?)
   end
 
-  def can_create? cuser, params = {}
-    Verification.contain params, [:title, :category_id, :text]
+  def can_create? cuser
+    true
   end
 
   def can_update? cuser
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 5912530..dc5f961 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -35,12 +35,9 @@ describe 'User' do
 				expect(issue.can_show? user).to be_false
 			end
 		end
-		describe 'can_create? is weird and broken' do
-			it "returns true if no params" do
-				expect(issue.can_create? user).to be_true
-			end
-			it 'returns false if no params' do
-				expect(issue.can_create? user, {foo: "bar"}).to be_false
+		describe 'can_create?' do
+			it "returns true" do
+				expect(issue.can_create? nil).to be_true
 			end
 		end
 		describe 'can_update?' do

From 732095fa9cc3a1e8f11bc2126e8d01e5321f2c20 Mon Sep 17 00:00:00 2001
From: simplefl <phoenixfl@gmx.de>
Date: Thu, 11 Jun 2015 17:18:51 +0200
Subject: [PATCH 76/76] Up wait_timeout to 90.

---
 config/database.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/database.yml b/config/database.yml
index 0573d66..b91e757 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -6,7 +6,7 @@ base: &db
   username: <%= ENV['MYSQL_USERNAME'] %>
   password: <%= ENV['MYSQL_PASSWORD'] %>
   pool: <%= Integer(ENV['MYSQL_CONNECTION_POOL'] || 8) %>
-  wait_timeout: 30
+  wait_timeout: 90
   reconnect: true