From 5fdf337790a62bdcb8a7db3379cba4007426ebec Mon Sep 17 00:00:00 2001
From: Evan Phoenix <evan@phx.io>
Date: Mon, 5 Sep 2016 11:29:16 -0700
Subject: [PATCH] Move puma.rb to just autoloads. Fixes #1063

---
 lib/puma.rb               |  9 +++++----
 lib/puma/binder.rb        |  9 ++++++---
 lib/puma/cli.rb           |  3 +++
 lib/puma/cluster.rb       |  3 +++
 lib/puma/commonlogger.rb  |  1 -
 lib/puma/configuration.rb |  2 ++
 lib/puma/launcher.rb      | 18 ++++++++----------
 lib/puma/rack/builder.rb  |  3 +++
 lib/puma/runner.rb        |  3 +++
 lib/puma/single.rb        |  2 ++
 10 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/lib/puma.rb b/lib/puma.rb
index 678415c1..7e16b229 100644
--- a/lib/puma.rb
+++ b/lib/puma.rb
@@ -9,7 +9,8 @@ require 'stringio'
 
 require 'thread'
 
-# Ruby Puma
-require 'puma/const'
-require 'puma/server'
-require 'puma/launcher'
+module Puma
+  autoload :Const, 'puma/const'
+  autoload :Server, 'puma/server'
+  autoload :Launcher, 'puma/launcher'
+end
diff --git a/lib/puma/binder.rb b/lib/puma/binder.rb
index f484bc21..771b43d6 100644
--- a/lib/puma/binder.rb
+++ b/lib/puma/binder.rb
@@ -1,5 +1,8 @@
-require 'puma/const'
 require 'uri'
+require 'socket'
+
+require 'puma/const'
+require 'puma/util'
 
 module Puma
   class Binder
@@ -140,11 +143,11 @@ module Puma
 
           @listeners << [str, io]
         when "ssl"
-          MiniSSL.check
-
           params = Util.parse_query uri.query
           require 'puma/minissl'
 
+          MiniSSL.check
+
           ctx = MiniSSL::Context.new
 
           if defined?(JRUBY_VERSION)
diff --git a/lib/puma/cli.rb b/lib/puma/cli.rb
index ca8210bf..760eb70f 100644
--- a/lib/puma/cli.rb
+++ b/lib/puma/cli.rb
@@ -1,7 +1,10 @@
 require 'optparse'
 require 'uri'
 
+require 'puma/configuration'
 require 'puma/launcher'
+require 'puma/const'
+require 'puma/events'
 
 module Puma
   class << self
diff --git a/lib/puma/cluster.rb b/lib/puma/cluster.rb
index b9141116..0a29198f 100644
--- a/lib/puma/cluster.rb
+++ b/lib/puma/cluster.rb
@@ -1,4 +1,7 @@
 require 'puma/runner'
+require 'puma/util'
+require 'puma/plugin'
+
 require 'time'
 
 module Puma
diff --git a/lib/puma/commonlogger.rb b/lib/puma/commonlogger.rb
index dc7c61c2..9c3905c7 100644
--- a/lib/puma/commonlogger.rb
+++ b/lib/puma/commonlogger.rb
@@ -71,7 +71,6 @@ module Puma
 
     GET  = 'GET'.freeze
     HEAD = 'HEAD'.freeze
-    
 
     def log(env, status, header, began_at)
       now = Time.now
diff --git a/lib/puma/configuration.rb b/lib/puma/configuration.rb
index 24b5569b..116ded28 100644
--- a/lib/puma/configuration.rb
+++ b/lib/puma/configuration.rb
@@ -1,5 +1,6 @@
 require 'puma/rack/builder'
 require 'puma/plugin'
+require 'puma/const'
 
 module Puma
 
@@ -251,6 +252,7 @@ module Puma
       end
 
       if @options[:log_requests]
+        require 'puma/commonlogger'
         logger = @options[:logger]
         found = CommonLogger.new(found, logger)
       end
diff --git a/lib/puma/launcher.rb b/lib/puma/launcher.rb
index 57abccb8..1e58654f 100644
--- a/lib/puma/launcher.rb
+++ b/lib/puma/launcher.rb
@@ -1,15 +1,13 @@
-require 'puma/server'
-require 'puma/const'
-require 'puma/configuration'
-require 'puma/binder'
+require 'puma/events'
 require 'puma/detect'
-require 'puma/daemon_ext'
-require 'puma/util'
-require 'puma/single'
-require 'puma/cluster'
-require 'puma/state_file'
 
-require 'puma/commonlogger'
+require 'puma/cluster'
+require 'puma/single'
+
+require 'puma/const'
+
+require 'puma/binder'
+require 'puma/state_file'
 
 module Puma
   # Puma::Launcher is the single entry point for starting a Puma server based on user
diff --git a/lib/puma/rack/builder.rb b/lib/puma/rack/builder.rb
index 9e6aa6a1..7676ad54 100644
--- a/lib/puma/rack/builder.rb
+++ b/lib/puma/rack/builder.rb
@@ -1,3 +1,6 @@
+module Puma
+end
+
 module Puma::Rack
   class Options
     def parse!(args)
diff --git a/lib/puma/runner.rb b/lib/puma/runner.rb
index 7a79bdfd..72f37798 100644
--- a/lib/puma/runner.rb
+++ b/lib/puma/runner.rb
@@ -1,3 +1,6 @@
+require 'puma/server'
+require 'puma/const'
+
 module Puma
   class Runner
     def initialize(cli, events)
diff --git a/lib/puma/single.rb b/lib/puma/single.rb
index f60ee5d0..4adf56ea 100644
--- a/lib/puma/single.rb
+++ b/lib/puma/single.rb
@@ -1,4 +1,6 @@
 require 'puma/runner'
+require 'puma/detect'
+require 'puma/plugin'
 
 module Puma
   class Single < Runner