Fix some bugs in the watcher when files were added and removed.

cli/lib/compass/compiler.rb

@@ -86,6 +86,12 @@ def new_config?
       nil
     end
 
+    def reset!
+      reset_staleness_checker!
+      @sass_files = nil
+      @css_files = nil
+    end
+
     def clean!
       remove options[:cache_location]
       css_files.each do |css_file|
@@ -154,6 +160,7 @@ def compile(sass_filename, css_filename)
     end
 
     def should_compile?(sass_filename, css_filename)
+      return true unless css_filename && File.exist?(css_filename)
       options[:force] || needs_update?(css_filename, sass_filename)
     end
 

cli/lib/compass/watcher/compiler.rb

@@ -16,7 +16,7 @@ def initialize(working_path, additional_options={})
 
       def compile
         @memory_cache.reset! if @memory_cache
-        compiler.reset_staleness_checker!
+        compiler.reset!
         if file = compiler.out_of_date?
           begin
             time = Time.now.strftime("%T")
@@ -56,4 +56,4 @@ def determine_cache_location
       end
     end
   end
-end
+end

cli/lib/compass/watcher/project_watcher.rb

@@ -102,7 +102,7 @@ def sass_added(file)
 
       def sass_removed(file)
         log_action(:info, "#{filename_for_display(file)} was removed", options)
-        css_file = compiler.corresponding_css_file(File.join(project_path, file))
+        css_file = compiler.corresponding_css_file(file)
         compile
         if File.exists?(css_file)
           remove(css_file)