Don't like the executable - use config.ru again for now

config.ru

@@ -0,0 +1,10 @@
+ENV['RACK_ENV'] ||= 'development'
+
+require 'bundler'
+
+Bundler.setup
+Bundler.require(:default, ENV['RACK_ENV'])
+
+require File.expand_path('lib/mpd_client', __dir__)
+
+run MPDClient::Webserver

lib/mpd_client.rb

@@ -1,6 +1,7 @@
 require 'forwardable'
 require 'ruby-mpd'
 require 'set'
+require 'json'
 
 module MPDClient
 
@@ -14,6 +15,9 @@ module MPDClient
   autoload :Control, File.expand_path('mpd_client/control.rb', __dir__)
   autoload :Queue, File.expand_path('mpd_client/queue.rb', __dir__)
 
+  # Don't want to automatically require this thing
+  autoload :Webserver, File.expand_path('mpd_client/webserver.rb', __dir__)
+
   MPD_HOST = ENV.fetch('MPD_HOST', 'localhost')
   MPD_PORT = ENV.fetch('MPD_PORT', 6600)
 

lib/mpd_client/webserver.rb

@@ -1,29 +1,15 @@
-#!/usr/bin/env ruby
-
-ENV['RACK_ENV'] ||= 'development'
-
-require 'bundler'
-
-Bundler.setup
-Bundler.require(:default, ENV['RACK_ENV'])
-
 require 'sinatra'
 require 'sinatra/asset_pipeline'
-
 require 'sass'
-require 'json'
 require 'cgi'
-
 require 'active_support/core_ext/hash/slice'
 
-require File.expand_path('../lib/mpd_client', __dir__)
-
 module MPDClient
-  class Application < Sinatra::Base
+  class Webserver < Sinatra::Base
 
     set server: 'thin'
 
-    set :root, File.expand_path('../', __dir__)
+    set :root, File.expand_path('../../', __dir__)
 
     set :assets_precompile, %w(app.js app.css *.png *.jpg *.svg *.eot *.ttf *.woff)
     set :assets_prefix, ['assets']
@@ -131,5 +117,3 @@ module MPDClient
 
   end
 end
-
-MPDClient::Application.run!

spec/spec_helper.rb

@@ -1,12 +1,15 @@
 ENV['RACK_ENV'] = 'test'
 
+require 'bundler'
+Bundler.setup
+Bundler.require(:default, ENV['RACK_ENV'])
+
 require File.expand_path('../lib/mpd_client', __dir__)
 require 'rspec'
 require 'rspec/mocks'
 require 'rack/test'
 
 RSpec.configure do |config|
-  config.include Rack::Test::Methods
 
   config.before(:each) do
     allow_message_expectations_on_nil