From 0b863b3ddbeddcdda08de9a6084dd0d3014210e1 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Mon, 13 Feb 2012 11:55:43 -0500 Subject: [PATCH] bundler fun --- bin/attentive | 15 ++++++++------- lib/assets/javascripts/attentive.js.coffee | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/attentive b/bin/attentive index 92d369b..4b709e7 100755 --- a/bin/attentive +++ b/bin/attentive @@ -10,20 +10,13 @@ rescue Bundler::GemfileNotFound end require 'thor' -require 'rack' require 'attentive' -require 'pygments' -require 'coffee_script' -require 'sass' begin load 'presentation.rb' rescue LoadError => e end -# make sure pygments is ready -Pygments.highlight("attentive") - class Attentive::CLI < Thor include Thor::Actions @@ -33,6 +26,14 @@ class Attentive::CLI < Thor method_options [ :port, '-p' ] => 9393 def start if Attentive.has_presentation? + require 'rack' + require 'pygments' + require 'coffee_script' + require 'sass' + + # make sure pygments is ready + Pygments.highlight("attentive") + Rack::Handler::WEBrick.run(Attentive::Server, :Port => options[:port]) do |server| trap(:INT) { server.shutdown } end diff --git a/lib/assets/javascripts/attentive.js.coffee b/lib/assets/javascripts/attentive.js.coffee index 0744bf6..03e8482 100644 --- a/lib/assets/javascripts/attentive.js.coffee +++ b/lib/assets/javascripts/attentive.js.coffee @@ -7,7 +7,7 @@ $(-> setTimeout( -> $(window).trigger('resize') - , 250 + , 500 ) )