From ed50d4326a87dfad6974ceb73a567717b126a80f Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Thu, 10 May 2012 16:07:11 -0700
Subject: [PATCH] Try to avoid running bundler in tests on Travis

---
 .travis.yml                                    | 2 ++
 Gemfile                                        | 2 +-
 middleman-core/lib/middleman-core/templates.rb | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8ca32eb7..0257dc10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ rvm:
   
 script: "bundle exec rake test"
 
+env: TRAVIS=true
+
 matrix:
   allow_failures:
     - rvm: jruby-19mode
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index f451be1f..a2ee3415 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ group :development do
   gem "rdoc",     "~> 3.9"
   gem "yard",     "~> 0.8.0"
 end
-  
+
 group :test do
   gem "cucumber", "~> 1.1.0"
   gem "fivemat"
diff --git a/middleman-core/lib/middleman-core/templates.rb b/middleman-core/lib/middleman-core/templates.rb
index 4667f8ec..dae2c9a8 100644
--- a/middleman-core/lib/middleman-core/templates.rb
+++ b/middleman-core/lib/middleman-core/templates.rb
@@ -57,7 +57,7 @@ module Middleman::Templates
       
       inside(location) do
         ::Middleman::Cli::Bundle.new.invoke(:bundle)
-      end
+      end unless ENV["TRAVIS"]
     end
 
     # Output a .gitignore file