From f18d698d09afda894a568de79c5770704a0c9de7 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 31 Aug 2016 12:15:20 +0200
Subject: refactor: remove global require in test_helper

require all the things we depend upon where we depend upon them.
---
 lib/nickserver.rb                                     | 7 -------
 lib/nickserver/adapters/celluloid_http.rb             | 1 +
 lib/nickserver/daemon.rb                              | 3 +++
 lib/nickserver/request_handlers/leap_email_handler.rb | 1 +
 lib/nickserver/server.rb                              | 5 +++--
 lib/nickserver/source.rb                              | 2 ++
 6 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 lib/nickserver.rb

(limited to 'lib')

diff --git a/lib/nickserver.rb b/lib/nickserver.rb
deleted file mode 100644
index 8843acd..0000000
--- a/lib/nickserver.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-
-require "nickserver/version"
-require "nickserver/config"
-require "nickserver/email_address"
-
-require "nickserver/server"
-require "nickserver/daemon"
diff --git a/lib/nickserver/adapters/celluloid_http.rb b/lib/nickserver/adapters/celluloid_http.rb
index 44b6fe8..92c5c53 100644
--- a/lib/nickserver/adapters/celluloid_http.rb
+++ b/lib/nickserver/adapters/celluloid_http.rb
@@ -1,4 +1,5 @@
 require 'nickserver/adapters'
+require 'nickserver/config'
 silence_warnings do
   require 'celluloid/io'
 end
diff --git a/lib/nickserver/daemon.rb b/lib/nickserver/daemon.rb
index 9b06a3c..9cc1af7 100644
--- a/lib/nickserver/daemon.rb
+++ b/lib/nickserver/daemon.rb
@@ -1,3 +1,6 @@
+require "nickserver/version"
+require "nickserver/config"
+
 require 'etc'
 require 'fileutils'
 
diff --git a/lib/nickserver/request_handlers/leap_email_handler.rb b/lib/nickserver/request_handlers/leap_email_handler.rb
index 548bc8a..bdebc23 100644
--- a/lib/nickserver/request_handlers/leap_email_handler.rb
+++ b/lib/nickserver/request_handlers/leap_email_handler.rb
@@ -1,3 +1,4 @@
+require 'nickserver/request_handlers/base'
 require 'nickserver/email_address'
 require 'nickserver/nicknym/source'
 
diff --git a/lib/nickserver/server.rb b/lib/nickserver/server.rb
index 8f4a49f..11e7012 100644
--- a/lib/nickserver/server.rb
+++ b/lib/nickserver/server.rb
@@ -1,7 +1,8 @@
-require 'kernel_ext'
-require 'json'
+require 'nickserver/config'
 require 'nickserver/reel_server'
 
+require 'kernel_ext'
+require 'json'
 
 #
 # This is the main HTTP server that clients connect to in order to fetch keys
diff --git a/lib/nickserver/source.rb b/lib/nickserver/source.rb
index 78f245b..edc57e9 100644
--- a/lib/nickserver/source.rb
+++ b/lib/nickserver/source.rb
@@ -1,3 +1,5 @@
+require 'nickserver/adapters/celluloid_http'
+
 module Nickserver
   class Source
 
-- 
cgit v1.2.3