middleman 2.0.12 → 2.0.13

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
 script: "bundle exec rake test"

data/CHANGELOG

@@ -1,3 +1,8 @@
+2.0.13
+====
+middleman build --clean keeps the build directory clean of leftover files
+Padrino 0.10.5 and Rack 1.3.5
+
 2.0.12
 ====
 Sinatra 1.3.1 and Padrino 0.10.4

data/features/clean_build.feature

@@ -0,0 +1,10 @@
+Feature: Build Clean
+  Scenario: Build and Clean an app
+    Given app "clean-app" is using config "empty"
+    And a built app at "clean-app"
+    And app "clean-app" is using config "complications"
+    And a built app at "clean-app" with flags "--clean"
+    Then "should_be_ignored.html" should not exist at "clean-app"
+    And "should_be_ignored2.html" should not exist at "clean-app"
+    And "should_be_ignored3.html" should not exist at "clean-app"
+    And cleanup built app at "clean-app"

data/features/step_definitions/builder_steps.rb

@@ -1,5 +1,13 @@
 require 'fileutils'
 
+Given /^app "([^"]*)" is using config "([^"]*)"$/ do |path, config_name|
+  root = File.dirname(File.dirname(File.dirname(__FILE__)))
+  target = File.join(root, "fixtures", path)
+  config_path = File.join(target, "config-#{config_name}.rb")
+  config_dest = File.join(target, "config.rb")
+  FileUtils.cp(config_path, config_dest)
+end
+
 Given /^a built app at "([^"]*)"$/ do |path|
   root = File.dirname(File.dirname(File.dirname(__FILE__)))
   target = File.join(root, "fixtures", path)

data/fixtures/clean-app/config-complications.rb

@@ -0,0 +1,11 @@
+page "/fake.html", :proxy => "/real.html", :layout => false
+
+ignore "/should_be_ignored.html"
+page "/should_be_ignored2.html", :ignore => true
+page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => true
+
+%w(one two).each do |num|
+  page "/fake/#{num}.html", :proxy => "/real/index.html" do
+    @num = num
+  end
+end

data/fixtures/clean-app/config.rb

@@ -0,0 +1,11 @@
+page "/fake.html", :proxy => "/real.html", :layout => false
+
+ignore "/should_be_ignored.html"
+page "/should_be_ignored2.html", :ignore => true
+page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => true
+
+%w(one two).each do |num|
+  page "/fake/#{num}.html", :proxy => "/real/index.html" do
+    @num = num
+  end
+end

data/fixtures/clean-app/source/index.html.haml

@@ -0,0 +1,6 @@
+%h1 Welcome
+
+:markdown
+  ## H2
+  
+  Paragraph

data/fixtures/clean-app/source/layout.haml

@@ -0,0 +1,6 @@
+%html
+  %head
+    %title My Sample Site
+    / Comment in layout
+  %body
+    = yield

data/fixtures/clean-app/source/layouts/custom.haml

@@ -0,0 +1,5 @@
+%html
+  %head
+    %title Custom Layout
+  %body
+    = yield

data/fixtures/clean-app/source/real.html

@@ -0,0 +1 @@
+I am real

data/fixtures/clean-app/source/real/index.html.erb

@@ -0,0 +1,5 @@
+---
+layout: false
+---
+
+I am real: <%= @num %>

data/fixtures/clean-app/source/should_be_ignored.html

@@ -0,0 +1 @@
+<h1>Ignore me!</h1>

data/fixtures/clean-app/source/should_be_ignored2.html

@@ -0,0 +1 @@
+<h1>Ignore me! 2</h1>

data/fixtures/clean-app/source/should_be_ignored3.html

@@ -0,0 +1 @@
+<h1>Ignore me! 3</h1>

data/fixtures/clean-app/source/static.html

@@ -0,0 +1 @@
+Static, no code!

data/lib/middleman.rb

@@ -163,10 +163,10 @@ module Middleman
   
   def self.rubygems_latest_specs
     # If newer Rubygems
-    if Gem::Specification.respond_to? :latest_specs
-      Gem::Specification.latest_specs
+    if ::Gem::Specification.respond_to? :latest_specs
+      ::Gem::Specification.latest_specs
     else
-      Gem.source_index.latest_specs
+      ::Gem.source_index.latest_specs
     end
   end
   
@@ -184,7 +184,7 @@ module Middleman
   
   def self.start_server(options={})
     opts = {
-      :Port      => options[:port],
+      :Port      => options[:port] || 4567,
       :AccessLog => []
     }
     

data/lib/middleman/builder.rb

@@ -1,6 +1,7 @@
 require "thor"
 require "thor/group"
 require 'rack/test'
+require 'find'
 
 SHARED_SERVER = Middleman.server
 SHARED_SERVER.set :environment, :build
@@ -16,18 +17,67 @@ module Middleman
       
       request_path = destination.sub(/^#{SHARED_SERVER.build_dir}/, "")
       
-      begin        
+      begin
         destination, request_path = SHARED_SERVER.reroute_builder(destination, request_path)
         
         request_path.gsub!(/\s/, "%20")
         response = Middleman::Builder.shared_rack.get(request_path)
         
+        dequeue_file_from destination if cleaning?
+
         create_file destination, nil, config do
           response.body
         end if response.status == 200
       rescue
       end
     end
+    
+    
+    def clean!(destination)
+      return unless cleaning?
+      queue_current_paths_from destination
+      add_clean_up_callback
+    end
+    
+    def cleaning?
+      options.has_key?("clean") && options["clean"]
+    end
+    
+    def add_clean_up_callback
+      clean_up_callback = lambda do 
+        files       = @cleaning_queue.select { |q| File.file? q }
+        directories = @cleaning_queue.select { |q| File.directory? q }
+
+        files.each { |f| remove_file f, :force => true }
+
+        directories = directories.sort_by {|d| d.length }.reverse!
+
+        directories.each do |d|
+          remove_file d, :force => true if directory_empty? d 
+        end
+      end
+      self.class.after_run :clean_up_callback do
+        clean_up_callback.call
+      end
+    end
+
+    def directory_empty?(directory)
+      Dir["#{directory}/*"].empty?
+    end
+
+    def queue_current_paths_from(destination)
+      @cleaning_queue = []
+      Find.find(destination) do |path|
+        unless path == destination
+          @cleaning_queue << path.sub(destination, destination[/([^\/]+?)$/])
+        end
+      end
+    end
+
+    def dequeue_file_from(destination)
+      @cleaning_queue.delete_if {|q| q == destination }
+    end
+    
   end
   
   class Builder < Thor::Group
@@ -102,6 +152,7 @@ module Middleman
     end
 
     def invoke!
+      base.clean! destination
       execute!
     end
 
@@ -198,5 +249,6 @@ module Middleman
         end
       end
     end
+    
   end
 end

data/lib/middleman/cli.rb

@@ -33,6 +33,8 @@ module Middleman
     desc "server [-p 4567] [-e development]", "Starts the Middleman preview server"
     method_option "environment", :aliases => "-e", :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development', :desc => "The environment Middleman will run under"
     method_option "port", :aliases => "-p", :default => "4567", :desc => "The port Middleman will listen on"
+    
+    method_option "disable-watcher", :default => false, :type => :boolean, :desc => "Don't use config.rb watcher (also disables livereload)"
     method_option "livereload", :default => false, :type => :boolean, :desc => "Whether to enable Livereload or not"
     method_option "livereload-port", :default => "35729", :desc => "The port Livereload will listen on"
     def server
@@ -41,15 +43,22 @@ module Middleman
       if options["livereload"]
         livereload_options = {:port => options["livereload-port"]}
       end
-    
-      Middleman::Guard.start({
+      
+      params = {
         :port        => options[:port],
         :environment => options[:environment]
-      }, livereload_options)
+      }
+      
+      if options["disable-watcher"]
+        Middleman.start_server(params)
+      else
+        Middleman::Guard.start(params, livereload_options)
+      end
     end
 
     desc "build", "Builds the static site for deployment"
     method_option :relative, :type => :boolean, :aliases => "-r", :default => false, :desc => 'Override the config.rb file and force relative urls'
+    method_option :clean, :type => :boolean, :aliases => "-c", :default => false, :desc => 'Builds a clean project removing any orpahand files or directories'
     method_option :glob, :type => :string, :aliases => "-g", :default => nil, :desc => 'Build a subset of the project'
     def build
       v1_check

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.12"
+  VERSION = "2.0.13"
 end

data/middleman-x86-mingw32.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
 ********************************************************************************
 eos
 
-  s.add_dependency("rack", ["~> 1.3.0"])
+  s.add_dependency("rack", ["~> 1.3.5"])
   s.add_dependency("thin", ["~> 1.2.11"])
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
@@ -50,9 +50,9 @@ eos
   s.add_dependency("sass", ["~> 3.1.7"])
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
-  s.add_dependency("sprockets", ["~> 2.0.0"])
-  s.add_dependency("padrino-core", ["~> 0.10.4"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.4"])
+  s.add_dependency("sprockets", ["~> 2.0.3"])
+  s.add_dependency("padrino-core", ["~> 0.10.5"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.5"])
   
   s.add_dependency("eventmachine", ["1.0.0.beta.3"])
   s.add_dependency("win32-process", ["~> 0.6.5"])
@@ -66,7 +66,7 @@ eos
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   s.add_development_dependency("liquid", ["~> 2.2.0"])
   s.add_development_dependency("cucumber", ["~> 1.0.2"])
-  s.add_development_dependency("rake", ["0.8.7"])
+  s.add_development_dependency("rake", ["~> 0.9.2"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])
 end
 

data/middleman.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
 ********************************************************************************
 eos
 
-  s.add_dependency("rack", ["~> 1.3.0"])
+  s.add_dependency("rack", ["~> 1.3.5"])
   s.add_dependency("thin", ["~> 1.2.11"])
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
@@ -52,9 +52,9 @@ eos
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.2.7"])
-  s.add_dependency("sprockets", ["~> 2.0.0"])
-  s.add_dependency("padrino-core", ["~> 0.10.4"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.4"])
+  s.add_dependency("sprockets", ["~> 2.0.3"])
+  s.add_dependency("padrino-core", ["~> 0.10.5"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.5"])
   
   s.add_dependency("guard", ["~> 0.6.2"])
   s.add_dependency("middleman-livereload", ["~> 0.2.0"])
@@ -63,7 +63,7 @@ eos
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   s.add_development_dependency("liquid", ["~> 2.2.0"])
   s.add_development_dependency("cucumber", ["~> 1.0.2"])
-  s.add_development_dependency("rake", ["0.8.7"])
+  s.add_development_dependency("rake", ["~> 0.9.2"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 2
   - 0
-  - 12
-  version: 2.0.12
+  - 13
+  version: 2.0.13
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,27 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 -07:00
+date: 2011-10-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 17
         segments: 
         - 1
         - 3
-        - 0
-        version: 1.3.0
-  type: :runtime
-  name: rack
+        - 5
+        version: 1.3.5
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: rack
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +46,11 @@ dependencies:
         - 2
         - 11
         version: 1.2.11
-  type: :runtime
-  name: thin
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: thin
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,11 +62,11 @@ dependencies:
         - 14
         - 0
         version: 0.14.0
-  type: :runtime
-  name: thor
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,11 +78,11 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  type: :runtime
-  name: tilt
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  name: tilt
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,11 +94,11 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  type: :runtime
-  name: maruku
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  name: maruku
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,11 +110,11 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  type: :runtime
-  name: sinatra
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -127,11 +126,11 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
-  type: :runtime
-  name: rack-test
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  name: rack-test
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,11 +142,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :runtime
-  name: uglifier
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  name: uglifier
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -159,11 +158,11 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  type: :runtime
-  name: slim
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  name: slim
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -175,11 +174,11 @@ dependencies:
         - 1
         - 0
         version: 3.1.0
-  type: :runtime
-  name: haml
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  name: haml
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -191,11 +190,11 @@ dependencies:
         - 1
         - 7
         version: 3.1.7
-  type: :runtime
-  name: sass
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  name: sass
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -207,11 +206,11 @@ dependencies:
         - 11
         - 3
         version: 0.11.3
-  type: :runtime
-  name: compass
   version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  name: compass
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -223,11 +222,11 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  type: :runtime
-  name: coffee-script
   version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  name: coffee-script
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -239,59 +238,59 @@ dependencies:
         - 2
         - 7
         version: 1.2.7
-  type: :runtime
-  name: execjs
   version_requirements: *id014
-- !ruby/object:Gem::Dependency 
+  name: execjs
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 9
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
-  type: :runtime
-  name: sprockets
+        - 3
+        version: 2.0.3
   version_requirements: *id015
-- !ruby/object:Gem::Dependency 
+  name: sprockets
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 61
         segments: 
         - 0
         - 10
-        - 4
-        version: 0.10.4
-  type: :runtime
-  name: padrino-core
+        - 5
+        version: 0.10.5
   version_requirements: *id016
-- !ruby/object:Gem::Dependency 
+  name: padrino-core
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 61
         segments: 
         - 0
         - 10
-        - 4
-        version: 0.10.4
-  type: :runtime
-  name: padrino-helpers
+        - 5
+        version: 0.10.5
   version_requirements: *id017
-- !ruby/object:Gem::Dependency 
+  name: padrino-helpers
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -303,11 +302,11 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
-  type: :runtime
-  name: guard
   version_requirements: *id018
-- !ruby/object:Gem::Dependency 
+  name: guard
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -319,11 +318,11 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  type: :runtime
-  name: middleman-livereload
   version_requirements: *id019
-- !ruby/object:Gem::Dependency 
+  name: middleman-livereload
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -335,11 +334,11 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  type: :development
-  name: coffee-filter
   version_requirements: *id020
-- !ruby/object:Gem::Dependency 
+  name: coffee-filter
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -351,11 +350,11 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  type: :development
-  name: liquid
   version_requirements: *id021
-- !ruby/object:Gem::Dependency 
+  name: liquid
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -367,27 +366,27 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  type: :development
-  name: cucumber
   version_requirements: *id022
-- !ruby/object:Gem::Dependency 
+  name: cucumber
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 63
         segments: 
         - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :development
-  name: rake
+        - 9
+        - 2
+        version: 0.9.2
   version_requirements: *id023
-- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -399,9 +398,10 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  type: :development
-  name: rspec
   version_requirements: *id024
+  name: rspec
+  prerelease: false
+  type: :development
 description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
 email: 
 - me@tdreyno.com
@@ -431,6 +431,7 @@ files:
 - features/automatic_image_sizes.feature
 - features/builder.feature
 - features/cache_buster.feature
+- features/clean_build.feature
 - features/coffee-script.feature
 - features/data.feature
 - features/directory_index.feature
@@ -460,6 +461,18 @@ files:
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
 - features/tiny_src.feature
+- fixtures/clean-app/config-complications.rb
+- fixtures/clean-app/config-empty.rb
+- fixtures/clean-app/config.rb
+- fixtures/clean-app/source/index.html.haml
+- fixtures/clean-app/source/layout.haml
+- fixtures/clean-app/source/layouts/custom.haml
+- fixtures/clean-app/source/real.html
+- fixtures/clean-app/source/real/index.html.erb
+- fixtures/clean-app/source/should_be_ignored.html
+- fixtures/clean-app/source/should_be_ignored2.html
+- fixtures/clean-app/source/should_be_ignored3.html
+- fixtures/clean-app/source/static.html
 - fixtures/data-app/config.rb
 - fixtures/data-app/data/pages.yml
 - fixtures/data-app/source/index.html.haml
@@ -749,6 +762,7 @@ test_files:
 - features/automatic_image_sizes.feature
 - features/builder.feature
 - features/cache_buster.feature
+- features/clean_build.feature
 - features/coffee-script.feature
 - features/data.feature
 - features/directory_index.feature
@@ -778,6 +792,18 @@ test_files:
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
 - features/tiny_src.feature
+- fixtures/clean-app/config-complications.rb
+- fixtures/clean-app/config-empty.rb
+- fixtures/clean-app/config.rb
+- fixtures/clean-app/source/index.html.haml
+- fixtures/clean-app/source/layout.haml
+- fixtures/clean-app/source/layouts/custom.haml
+- fixtures/clean-app/source/real.html
+- fixtures/clean-app/source/real/index.html.erb
+- fixtures/clean-app/source/should_be_ignored.html
+- fixtures/clean-app/source/should_be_ignored2.html
+- fixtures/clean-app/source/should_be_ignored3.html
+- fixtures/clean-app/source/static.html
 - fixtures/data-app/config.rb
 - fixtures/data-app/data/pages.yml
 - fixtures/data-app/source/index.html.haml