From 92080bd337cabd0fd39c8bb23f6f0ece4a0f1205 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Sun, 14 Nov 2010 10:59:49 -0800
Subject: [PATCH] Revert "Updated gitignore"

This reverts commit c9a684c1cf998eb8b411c870835312aa2bff08a5.
---
 .gitignore  |  2 --
 bin/compass | 34 ++++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 321d6186..51fd921a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,11 +18,9 @@ test/fixtures/stylesheets/*/sass/.sass-cache
 pkg/*
 compass-*.gem
 coverage*
-bin/*
 docs
 doc-src/tmp
 doc-src/.bundle
 .bundle
 attic
-.rvmrc
 devbin
diff --git a/bin/compass b/bin/compass
index e1ac7493..f816f3e9 100755
--- a/bin/compass
+++ b/bin/compass
@@ -1,16 +1,26 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'compass' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
+# The compass command line utility
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+# This allows compass to run easily from a git checkout without install.
+def fallback_load_path(path)
+  retried = false
+  begin
+    yield
+  rescue LoadError
+    unless retried
+      $: << path
+      retried = true
+      retry
+    end
+    raise
+  end
+end
 
-require 'rubygems'
-require 'bundler/setup'
+fallback_load_path(File.join(File.dirname(__FILE__), '..', 'lib')) do
+  require 'compass'
+  require 'compass/exec'
+end
 
-load Gem.bin_path('compass', 'compass')
+
+command_line_class = Compass::Exec::Helpers.select_appropriate_command_line_ui(ARGV)
+exit command_line_class.new(ARGV).run!