middleman 2.0.0.rc92 → 2.0.0.rc93

data/lib/middleman/cli.rb

@@ -0,0 +1,84 @@
+require 'thor'
+
+module Middleman
+  class CLI < Thor
+    include Thor::Actions
+    check_unknown_options!
+    default_task :server
+
+    class_option "help", :type => :boolean, :default => false, :aliases => "-h"
+    def initialize(*)
+      super
+      help_check if options[:help]
+    end
+
+    desc "init NAME", "Create new Middleman project directory NAME"
+    available_templates = Middleman::Templates.registered_names.join(", ")
+    method_option "template", :aliases => "-T", :default => "default", :desc => "Optionally use a pre-defined project template: #{available_templates}"
+    method_option "css_dir", :default => "stylesheets", :desc => 'The path to the css files'
+    method_option "js_dir", :default => "javascripts", :desc => 'The path to the javascript files'
+    method_option "images_dir", :default => "images", :desc => 'The path to the image files'
+    def init(name)
+      key = options[:template].to_sym
+      unless Middleman::Templates.registered_templates.has_key?(key)
+        key = :default
+      end
+      
+      thor_group = Middleman::Templates.registered_templates[key]
+      thor_group.new([name], options).invoke_all
+    end
+
+    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 "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
+      config_check
+      if options["livereload"]
+        livereload_options = {:port => options["livereload-port"]}
+      end
+      
+      Middleman::Guard.start({
+        :port        => options[:port],
+        :environment => options[:environment]
+      }, livereload_options)
+    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'
+    def build
+      config_check
+      thor_group = Middleman::Builder.new([], options).invoke_all
+    end
+
+    desc "migrate", "Migrates an older Middleman project to the 2.0 structure"
+    def migrate
+      config_check
+      return if File.exists?("source")
+      `mv public source`
+      `cp -R views/* source/`
+      `rm -rf views`
+    end
+
+  private
+
+    def config_check
+      if !File.exists?("config.rb")
+        $stderr.puts "== Error: Could not find a Middleman project config, perhaps you are in the wrong folder?"
+        exit 1
+      end
+
+      if File.exists?("views") || File.exists?("public")
+        $stderr.puts "== Error: The views and public folders are have been combined. Create a new 'source' folder, add the contents of views and public to it and then remove the empty views and public folders."
+        exit 1
+      end
+    end
+
+    def help_check
+      help self.class.send(:retrieve_task_name, ARGV.dup)
+      exit 0
+    end
+
+  end
+end

data/lib/middleman/core_extensions/routing.rb

@@ -4,6 +4,11 @@ module Middleman::CoreExtensions::Routing
       app.extend ClassMethods
       
       app.set :proxied_paths, {}
+      app.set :excluded_paths, []
+      
+      app.build_reroute do |destination, request_path|
+        throw if app.settings.excluded_paths.include?(request_path)
+      end
       
       # Normalize the path and add index if we're looking at a directory
       app.before_processing do
@@ -38,7 +43,7 @@ module Middleman::CoreExtensions::Routing
     end
   
     def paths_for_url(url)
-      url = url.gsub(%r{#{settings.index_file}$}, "")
+      url = url.gsub(%r{\/#{settings.index_file}$}, "")
       url = url.gsub(%r{(\/)$}, "") if url.length > 1
     
       paths = [url]
@@ -47,6 +52,13 @@ module Middleman::CoreExtensions::Routing
       paths
     end
   
+    # Keep a path from building
+    def ignore(path)
+      settings.excluded_paths << paths_for_url(path)
+      settings.excluded_paths.flatten!
+      settings.excluded_paths.uniq!
+    end
+    
     # The page method allows the layout to be set on a specific path
     # page "/about.html", :layout => false
     # page "/", :layout => :homepage_layout
@@ -56,11 +68,19 @@ module Middleman::CoreExtensions::Routing
       
       if options.has_key?(:proxy)
         settings.proxied_paths[url] = options[:proxy]
+        if options.has_key?(:ignore) && options[:ignore]
+          settings.ignore(options[:proxy])
+        end
+      else
+        if options.has_key?(:ignore) && options[:ignore]
+          settings.ignore(url)
+        end
       end
-    
+      
       paths_for_url(url).each do |p|
         get(p) do
           if settings.proxied_paths.has_key?(url)
+            request["is_proxy"] = true
             request.path_info = settings.proxied_paths[url]
           end
           

data/lib/middleman/features/blog.rb

@@ -46,7 +46,6 @@ module Middleman
             end
             
             app.get("/#{app.blog_permalink}") do
-              $stderr.puts "*" * 500
               process_request({
                 :layout        => app.blog_layout,
                 :layout_engine => app.blog_layout_engine

data/lib/middleman/features/directory_indexes.rb

@@ -0,0 +1,50 @@
+module Middleman::Features::DirectoryIndexes
+  class << self
+    def registered(app)
+      app.set :ignored_directory_indexes, []
+      app.extend ClassMethods
+      
+      app.build_reroute do |destination, request_path|
+        index_ext = File.extname(app.settings.index_file)
+        new_index_path = "/#{app.settings.index_file}"
+      
+        indexed_path = request_path.gsub(/\/$/, "") + index_ext
+        
+        if app.settings.ignored_directory_indexes.include?(request_path)
+          false
+        else
+          [
+            destination.gsub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path),
+            request_path.gsub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path)
+          ]
+        end
+      end
+      
+      app.before do
+        indexed_path = request.path_info.gsub(/\/$/, "") + File.extname(app.settings.index_file)
+        
+        if !settings.ignored_directory_indexes.include?(indexed_path)
+          parts = request.path_info.split("/")
+          last_part = parts.last
+          last_part_ext = File.extname(last_part)
+        
+          if last_part_ext.blank?
+            # This is a folder, redirect to index
+            request.path_info = indexed_path
+          end
+        end
+      end
+    end
+    alias :included :registered
+  end
+  
+  module ClassMethods
+    def page(url, options={}, &block)
+      if options.has_key?(:directory_index) && !options["directory_index"]
+        settings.ignored_directory_indexes << url
+      else
+        super
+      end
+    end
+  end
+end

data/lib/middleman/guard.rb

@@ -56,11 +56,15 @@ module Guard
     def server_start
       @server_options = { 
         :Port => @options[:port],
-        :Logger => ::WEBrick::Log.new('/dev/null'),
-        :AccessLog => ::WEBrick::Log.new('/dev/null')
+        :AccessLog => []
+        # :AccessLog => ::WEBrick::Log.new('/dev/null'),
+        # :Logger => ::WEBrick::Log.new('/dev/null')
       }
       @server_job = fork do
-        @server_options[:app] = ::Middleman.server.new
+        app = ::Middleman.server
+        app.set :environment, @options[:environment].to_sym
+        @server_options[:app] = app.new
+        @server_options[:server] = 'thin'
         ::Rack::Server.new(@server_options).start
       end
 

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.rc92"
+  VERSION = "2.0.0.rc93"
 end

data/middleman.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Middleman::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Thomas Reynolds"]
-  s.email       = ["tdreyno@gmail.com"]
+  s.email       = ["me@tdreyno.com"]
   s.homepage    = "http://middlemanapp.com"
   s.summary     = "A static site generator based on Sinatra. Providing Haml, Sass, Compass, CoffeeScript and including minification, compression and cache busting."
 
@@ -19,20 +19,21 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency("rack", ["~> 1.3.0"])
+  s.add_runtime_dependency("thin", ["~> 1.2.11"])
   s.add_runtime_dependency("thor", ["~> 0.14.0"])
   s.add_runtime_dependency("tilt", ["~> 1.3.1"])
   s.add_runtime_dependency("rdiscount", ["~> 1.6.8"])
-  s.add_runtime_dependency("sinatra", ["~> 1.2.0"])
-  s.add_runtime_dependency("padrino-core", ["~> 0.9.23"])
-  s.add_runtime_dependency("padrino-helpers", ["~> 0.9.23"])
-  s.add_runtime_dependency("rack-test", ["~> 0.5.0"])
-  s.add_runtime_dependency("uglifier", ["~> 0.5.0"])
-  s.add_runtime_dependency("slim", ["~> 1.0.0"])
+  s.add_runtime_dependency("sinatra", ["~> 1.2.6"])
+  s.add_runtime_dependency("padrino-core", ["~> 0.10.0"])
+  s.add_runtime_dependency("padrino-helpers", ["~> 0.10.0"])
+  s.add_runtime_dependency("rack-test", ["~> 0.6.1"])
+  s.add_runtime_dependency("uglifier", ["~> 1.0.0"])
+  s.add_runtime_dependency("slim", ["~> 0.9.0"])
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
   s.add_runtime_dependency("sass", ["~> 3.1.5"])
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("compass", ["~> 0.11.3"])
-  s.add_runtime_dependency("sprockets", ["2.0.0.beta.10"])
+  s.add_runtime_dependency("sprockets", ["2.0.0.beta.12"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
   s.add_runtime_dependency("guard", ["~> 0.5.1"])
   s.add_runtime_dependency("guard-livereload", ["~> 0.2.0"])
@@ -40,6 +41,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("cucumber", ["~> 0.10.0"])
   s.add_development_dependency("rake", ["0.8.7"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])
-  s.add_development_dependency("rocco", ["~> 0.8.1"]) unless defined?(JRUBY_VERSION)
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 15424237
+  hash: 15424239
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - rc
-  - 92
-  version: 2.0.0.rc92
+  - 93
+  version: 2.0.0.rc93
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 Z
+date: 2011-08-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -36,9 +36,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: thin
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 2
+        - 11
+        version: 1.2.11
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,11 +66,11 @@ dependencies:
         - 0
         version: 0.14.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: tilt
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,11 +82,11 @@ dependencies:
         - 1
         version: 1.3.1
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rdiscount
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,107 +98,107 @@ dependencies:
         - 8
         version: 1.6.8
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 19
         segments: 
         - 1
         - 2
-        - 0
-        version: 1.2.0
+        - 6
+        version: 1.2.6
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: padrino-core
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 55
         segments: 
         - 0
-        - 9
-        - 23
-        version: 0.9.23
+        - 10
+        - 0
+        version: 0.10.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: padrino-helpers
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 55
         segments: 
         - 0
-        - 9
-        - 23
-        version: 0.9.23
+        - 10
+        - 0
+        version: 0.10.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 5
         segments: 
         - 0
-        - 5
-        - 0
-        version: 0.5.0
+        - 6
+        - 1
+        version: 0.6.1
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: uglifier
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 5
         - 0
-        version: 0.5.0
+        version: 1.0.0
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: slim
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 59
         segments: 
-        - 1
         - 0
+        - 9
         - 0
-        version: 1.0.0
+        version: 0.9.0
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -194,11 +210,11 @@ dependencies:
         - 0
         version: 3.1.0
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: sass
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -210,11 +226,11 @@ dependencies:
         - 5
         version: 3.1.5
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: coffee-script
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -226,11 +242,11 @@ dependencies:
         - 0
         version: 2.2.0
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: compass
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -242,29 +258,29 @@ dependencies:
         - 3
         version: 0.11.3
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: sprockets
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196471
+        hash: 62196475
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 10
-        version: 2.0.0.beta.10
+        - 12
+        version: 2.0.0.beta.12
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -276,11 +292,11 @@ dependencies:
         - 0
         version: 0.7.0
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: guard
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -292,11 +308,11 @@ dependencies:
         - 1
         version: 0.5.1
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: guard-livereload
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -308,11 +324,11 @@ dependencies:
         - 0
         version: 0.2.0
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: coffee-filter
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -324,11 +340,11 @@ dependencies:
         - 1
         version: 0.1.1
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -340,11 +356,11 @@ dependencies:
         - 0
         version: 0.10.0
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -356,11 +372,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id021
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -372,30 +388,14 @@ dependencies:
         - 0
         version: 2.6.0
   type: :development
-  version_requirements: *id022
-- !ruby/object:Gem::Dependency 
-  name: rocco
-  prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 8
-        - 1
-        version: 0.8.1
-  type: :development
   version_requirements: *id023
 description: 
 email: 
-- tdreyno@gmail.com
+- me@tdreyno.com
 executables: 
+- middleman
 - mm-build
 - mm-init
-- mm-migrate
 - mm-server
 extensions: []
 
@@ -409,9 +409,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/middleman
 - bin/mm-build
 - bin/mm-init
-- bin/mm-migrate
 - bin/mm-server
 - features/asset_host.feature
 - features/automatic_image_sizes.feature
@@ -419,6 +419,7 @@ files:
 - features/cache_buster.feature
 - features/coffee-script.feature
 - features/data.feature
+- features/directory_index.feature
 - features/dynamic_pages.feature
 - features/front-matter.feature
 - features/generator.feature
@@ -441,9 +442,14 @@ files:
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
 - features/tiny_src.feature
+- fixtures/indexable-app/config.rb
+- fixtures/indexable-app/source/a_folder/needs_index.html
+- fixtures/indexable-app/source/leave_me_alone.html
+- fixtures/indexable-app/source/needs_index.html
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/source/_partial.haml
+- fixtures/test-app/source/a_folder/needs_index.html
 - fixtures/test-app/source/asset_host.html.haml
 - fixtures/test-app/source/auto-css.html.haml
 - fixtures/test-app/source/auto-css/auto-css.html.haml
@@ -478,12 +484,16 @@ files:
 - fixtures/test-app/source/javascripts/sprockets_sub.js
 - fixtures/test-app/source/layout.haml
 - fixtures/test-app/source/layouts/custom.haml
+- fixtures/test-app/source/needs_index.html
 - fixtures/test-app/source/padrino_test.html.haml
 - fixtures/test-app/source/page-classes.html.haml
 - fixtures/test-app/source/real.html
 - fixtures/test-app/source/real/index.html.erb
 - fixtures/test-app/source/relative_image.html.erb
 - fixtures/test-app/source/services/index.html.haml
+- fixtures/test-app/source/should_be_ignored.html
+- fixtures/test-app/source/should_be_ignored2.html
+- fixtures/test-app/source/should_be_ignored3.html
 - fixtures/test-app/source/slim.html.slim
 - fixtures/test-app/source/spaces in file.html.erb
 - fixtures/test-app/source/static.html
@@ -503,6 +513,7 @@ files:
 - lib/middleman.rb
 - lib/middleman/base.rb
 - lib/middleman/builder.rb
+- lib/middleman/cli.rb
 - lib/middleman/config.ru
 - lib/middleman/core_extensions/assets.rb
 - lib/middleman/core_extensions/compass.rb
@@ -519,6 +530,7 @@ files:
 - lib/middleman/features/automatic_image_sizes/fastimage.rb
 - lib/middleman/features/blog.rb
 - lib/middleman/features/cache_buster.rb
+- lib/middleman/features/directory_indexes.rb
 - lib/middleman/features/lorem.rb
 - lib/middleman/features/minify_css.rb
 - lib/middleman/features/minify_javascript.rb
@@ -617,6 +629,7 @@ test_files:
 - features/cache_buster.feature
 - features/coffee-script.feature
 - features/data.feature
+- features/directory_index.feature
 - features/dynamic_pages.feature
 - features/front-matter.feature
 - features/generator.feature
@@ -639,9 +652,14 @@ test_files:
 - features/step_definitions/page_layout_steps.rb
 - features/support/env.rb
 - features/tiny_src.feature
+- fixtures/indexable-app/config.rb
+- fixtures/indexable-app/source/a_folder/needs_index.html
+- fixtures/indexable-app/source/leave_me_alone.html
+- fixtures/indexable-app/source/needs_index.html
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/source/_partial.haml
+- fixtures/test-app/source/a_folder/needs_index.html
 - fixtures/test-app/source/asset_host.html.haml
 - fixtures/test-app/source/auto-css.html.haml
 - fixtures/test-app/source/auto-css/auto-css.html.haml
@@ -676,12 +694,16 @@ test_files:
 - fixtures/test-app/source/javascripts/sprockets_sub.js
 - fixtures/test-app/source/layout.haml
 - fixtures/test-app/source/layouts/custom.haml
+- fixtures/test-app/source/needs_index.html
 - fixtures/test-app/source/padrino_test.html.haml
 - fixtures/test-app/source/page-classes.html.haml
 - fixtures/test-app/source/real.html
 - fixtures/test-app/source/real/index.html.erb
 - fixtures/test-app/source/relative_image.html.erb
 - fixtures/test-app/source/services/index.html.haml
+- fixtures/test-app/source/should_be_ignored.html
+- fixtures/test-app/source/should_be_ignored2.html
+- fixtures/test-app/source/should_be_ignored3.html
 - fixtures/test-app/source/slim.html.slim
 - fixtures/test-app/source/spaces in file.html.erb
 - fixtures/test-app/source/static.html