From 973a568c1d33d59d7d878ddd508eabcc2902de83 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Thu, 5 Aug 2010 22:11:39 -0700
Subject: [PATCH] Tests are more useful if you actually run them.

---
 VERSION.yml                           | 2 +-
 doc-src/content/CHANGELOG.markdown    | 4 +++-
 lib/compass/commands/stamp_pattern.rb | 2 +-
 lib/compass/installers/manifest.rb    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/VERSION.yml b/VERSION.yml
index f4977bd38a..86c8e45b63 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -2,4 +2,4 @@
 :major: 0
 :minor: 10
 :patch: 4
-:build: pre.1
+:build: pre.2
diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown
index 51d26d7ddf..8ec601fbec 100644
--- a/doc-src/content/CHANGELOG.markdown
+++ b/doc-src/content/CHANGELOG.markdown
@@ -7,8 +7,10 @@ layout: article
 COMPASS CHANGELOG
 =================
 
-0.10.4.pre.1 (8/5/2010)
+
+0.10.4.pre.2 (8/5/2010)
 -----------------------
+*Note:* 0.10.4.pre.1 had a bug and was yanked.
 
 * [Extensions] Make it easier to create manifest files.
 * [Rails] Don't install configuration files when installing extensions.
diff --git a/lib/compass/commands/stamp_pattern.rb b/lib/compass/commands/stamp_pattern.rb
index eedacc70e0..d2a164a5ce 100644
--- a/lib/compass/commands/stamp_pattern.rb
+++ b/lib/compass/commands/stamp_pattern.rb
@@ -72,7 +72,7 @@ def initialize(working_path, options)
       # all commands must implement perform
       def perform
         installer.init
-        installer.run(:skip_finalization => true, :skip_preparation => true)
+        installer.run(:skip_finalization => true, :skip_preparation => !is_project_creation?)
         UpdateProject.new(working_path, options).perform if installer.compilation_required?
         installer.finalize(options.merge(:create => is_project_creation?))
       end
diff --git a/lib/compass/installers/manifest.rb b/lib/compass/installers/manifest.rb
index 34fd588ef2..b5faf022b3 100644
--- a/lib/compass/installers/manifest.rb
+++ b/lib/compass/installers/manifest.rb
@@ -51,7 +51,7 @@ def each_#{t}
       type :javascript, :plural => :javascripts, :extensions => %w(js)
       type :font,       :plural => :fonts,       :extensions => %w(otf woff ttf)
       type :html,       :plural => :html,        :extensions => %w(html haml)
-      type :file        :plural => :files
+      type :file,       :plural => :files
       type :directory,  :plural => :directories
 
       def discover(type)