summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile3
-rw-r--r--lib/nickserver/adapters/celluloid_http.rb4
-rw-r--r--lib/nickserver/reel_server.rb11
-rw-r--r--lib/nickserver/server.rb1
-rw-r--r--test/integration/hkp_test.rb1
-rw-r--r--test/integration/nickserver_test.rb1
-rw-r--r--test/test_helper.rb1
-rw-r--r--test/unit/adapters/celluloid_http_test.rb1
8 files changed, 13 insertions, 10 deletions
diff --git a/Gemfile b/Gemfile
index d3dc389..619272b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,3 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in keymachine.gemspec
gemspec
-
-gem 'byebug'
-
diff --git a/lib/nickserver/adapters/celluloid_http.rb b/lib/nickserver/adapters/celluloid_http.rb
index 9e5fa3b..1adfaca 100644
--- a/lib/nickserver/adapters/celluloid_http.rb
+++ b/lib/nickserver/adapters/celluloid_http.rb
@@ -1,5 +1,7 @@
require 'nickserver/adapters'
-# require 'celluloid/io'
+silence_warnings do
+ require 'celluloid/io'
+end
require 'http'
module Nickserver::Adapters
diff --git a/lib/nickserver/reel_server.rb b/lib/nickserver/reel_server.rb
index abda57f..8e17bc6 100644
--- a/lib/nickserver/reel_server.rb
+++ b/lib/nickserver/reel_server.rb
@@ -1,5 +1,6 @@
-require 'celluloid/autostart'
-require 'reel'
+silence_warnings do
+ require 'reel'
+end
require 'nickserver/adapters/celluloid_http'
require 'nickserver/request_handler'
@@ -14,6 +15,12 @@ module Nickserver
super(host, port, &method(:on_connection))
end
+ def handle_connection(*args)
+ silence_warnings do
+ super
+ end
+ end
+
def on_connection(connection)
connection.each_request do |request|
handler = handler_for(request)
diff --git a/lib/nickserver/server.rb b/lib/nickserver/server.rb
index b8f5604..8f4a49f 100644
--- a/lib/nickserver/server.rb
+++ b/lib/nickserver/server.rb
@@ -6,7 +6,6 @@ require 'nickserver/reel_server'
#
# This is the main HTTP server that clients connect to in order to fetch keys
#
-# For info on EM::HttpServer, see https://github.com/eventmachine/evma_httpserver
#
module Nickserver
class Server
diff --git a/test/integration/hkp_test.rb b/test/integration/hkp_test.rb
index 586b3ab..09673cf 100644
--- a/test/integration/hkp_test.rb
+++ b/test/integration/hkp_test.rb
@@ -1,7 +1,6 @@
require 'test_helper'
require 'nickserver/hkp/source'
require 'nickserver/adapters/celluloid_http'
-require 'celluloid/test'
class HkpTest < Minitest::Test
diff --git a/test/integration/nickserver_test.rb b/test/integration/nickserver_test.rb
index f30d2ba..d179d7e 100644
--- a/test/integration/nickserver_test.rb
+++ b/test/integration/nickserver_test.rb
@@ -1,6 +1,5 @@
require 'test_helper'
require 'json'
-require 'celluloid/test'
#
# Some important notes to understanding these tests:
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 689928c..1ed2a98 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -7,6 +7,7 @@ require 'minitest/autorun'
silence_warnings do
require 'webmock/minitest'
end
+require 'celluloid/test'
require 'nickserver'
require 'minitest/pride'
require 'minitest/hell'
diff --git a/test/unit/adapters/celluloid_http_test.rb b/test/unit/adapters/celluloid_http_test.rb
index c9ea411..87e7f55 100644
--- a/test/unit/adapters/celluloid_http_test.rb
+++ b/test/unit/adapters/celluloid_http_test.rb
@@ -1,6 +1,5 @@
require 'test_helper'
require 'nickserver/adapters/celluloid_http'
-require 'celluloid/test'
class Nickserver::Adapters::CelluloidHttpTest < Minitest::Test