From 14581c126de7f80c45dfa7a56016df8e3431aa81 Mon Sep 17 00:00:00 2001
From: Ben Hollis <ben@benhollis.net>
Date: Wed, 4 Jan 2012 00:21:44 -0800
Subject: [PATCH] Fix build --clean and generally make it more robust by
 dealing with absolute Pathnames instead of regexing paths.

---
 middleman-core/lib/middleman-core/cli/build.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/middleman-core/lib/middleman-core/cli/build.rb b/middleman-core/lib/middleman-core/cli/build.rb
index 4d84bbec..1cc766bc 100644
--- a/middleman-core/lib/middleman-core/cli/build.rb
+++ b/middleman-core/lib/middleman-core/cli/build.rb
@@ -144,14 +144,14 @@ module Middleman::Cli
     # Remove files which were not built in this cycle
     # @return [void]
     def clean!
-      files       = @cleaning_queue.select { |q| File.file? q }
-      directories = @cleaning_queue.select { |q| File.directory? q }
+      files       = @cleaning_queue.select { |q| q.file? }
+      directories = @cleaning_queue.select { |q| q.directory? }
 
       files.each do |f| 
         base.remove_file f, :force => true
       end
 
-      directories = directories.sort_by {|d| d.length }.reverse!
+      directories = directories.sort_by {|d| d.to_s.length }.reverse!
 
       directories.each do |d|
         base.remove_file d, :force => true if directory_empty? d 
@@ -168,7 +168,7 @@ module Middleman::Cli
     # @param [String] directory
     # @return [Boolean]
     def directory_empty?(directory)
-      Dir[File.join(directory, "*")].empty?
+      directory.children.empty?
     end
 
     # Get a list of all the paths in the destination folder and save them
@@ -179,7 +179,7 @@ module Middleman::Cli
       Find.find(@destination) do |path|
         next if path.match(/\/\./) && !path.match(/\.htaccess/)
         unless path == destination
-          @cleaning_queue << path.sub(@destination, destination[/([^\/]+?)$/])
+          @cleaning_queue << Pathname.new(path)
         end
       end if File.exist?(@destination)
     end
@@ -219,11 +219,11 @@ module Middleman::Cli
 
         file_destination = base.tilt_template(file_source, file_destination)
 
-        @cleaning_queue.delete(file_destination) if cleaning?
+        @cleaning_queue.delete(Pathname.new(file_destination).realpath) if cleaning?
       end
     end
   end
   
   # Alias "b" to "build"
   Base.map({ "b" => "build" })
-end
\ No newline at end of file
+end