From bf1e1147190b9e3021389a21ec76061e820a25b3 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Fri, 23 Mar 2012 08:47:08 -0400
Subject: [PATCH] make it nicer to work with and run

---
 bin/attentive           | 8 +++-----
 lib/attentive/server.rb | 5 ++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/attentive b/bin/attentive
index f82aa4e..23454e2 100755
--- a/bin/attentive
+++ b/bin/attentive
@@ -1,11 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'bundler'
+if !ENV['BUNDLE_GEMFILE'] && File.file?('Gemfile')
+  require 'rubygems'
+  require 'bundler/setup'
 
-begin
-  Bundler.setup(:default)
-rescue Bundler::GemfileNotFound
   $: << File.expand_path('../../lib', __FILE__)
 end
 
diff --git a/lib/attentive/server.rb b/lib/attentive/server.rb
index 7b6323a..4fd0609 100644
--- a/lib/attentive/server.rb
+++ b/lib/attentive/server.rb
@@ -41,7 +41,10 @@ module Attentive
       Pygments.highlight("attentive")
 
       Rack::Handler.default.run(Attentive::Server, :Port => options[:port]) do |server|
-        trap(:INT) { server.shutdown }
+        trap(:INT) do
+          server.shutdown if server.respond_to?(:server)
+          server.stop if server.respond_to?(:stop)
+        end
       end
     end