middleman 2.0.0.rc92 → 2.0.0.rc93

data/CHANGELOG

@@ -9,4 +9,6 @@
 - Support YAML front-matter
 - Added callback to run code after Compass is configured
 - Added support for a compass.config file which is passed directly to Compass
-- Blog-aware Feature (and project template)
+- Blog-aware Feature (and project template)
+- Thor-based, unified `middleman` binary
+- :directory_indexes feature

data/Rakefile

@@ -12,43 +12,4 @@ end
 require 'rake/testtask'
 require 'rake/clean'
 
-task :test => ["cucumber"]
-
-# rocco depends on rdiscount, which makes me sad.
-unless defined?(JRUBY_VERSION)
-  # Bring in Rocco tasks
-  require 'rocco/tasks'
-  Rocco::make 'docs/'
-
-  desc 'Build rocco docs'
-  task :docs => :rocco
-  directory 'docs/'
-
-  # Make index.html a copy of rocco.html
-  file 'docs/index.html' => 'docs/middleman.html' do |f|
-    cp 'docs/middleman.html', 'docs/index.html', :preserve => true
-  end
-  task :docs => 'docs/index.html'
-  CLEAN.include 'docs/index.html'
-
-  desc 'Update gh-pages branch'
-  task :pages => ['docs/.git', :docs] do
-    rev = `git rev-parse --short HEAD`.strip
-    Dir.chdir 'docs' do
-      sh "git add *.html"
-      sh "git commit -m 'rebuild pages from #{rev}'" do |ok,res|
-        if ok
-          verbose { puts "gh-pages updated" }
-          sh "git push -q o HEAD:gh-pages"
-        end
-      end
-    end
-  end
-
-  # Update the pages/ directory clone
-  file 'docs/.git' => ['docs/', '.git/refs/heads/gh-pages'] do |f|
-    sh "cd docs && git init -q && git remote add o ../.git" if !File.exist?(f.name)
-    sh "cd docs && git fetch -q o && git reset -q --hard o/gh-pages && touch ."
-  end
-  CLOBBER.include 'docs/.git'
-end
+task :test => ["cucumber"]

data/bin/middleman

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require "rubygems"
+
+libdir = File.join(File.dirname(File.dirname(__FILE__)), "lib")
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require 'middleman'
+Middleman::CLI.start

data/bin/mm-build

@@ -1,7 +1,2 @@
-#!/usr/bin/env ruby
-
-ENV['MM_ENV'] = "build"
-
-# Require app
-require File.join(File.dirname(__FILE__), "..", "lib", "middleman")
-Middleman::Builder.start
+#!/bin/bash
+/usr/bin/env middleman build $@

data/bin/mm-init

@@ -1,27 +1,2 @@
-#!/usr/bin/env ruby
-require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'middleman')
-require "middleman/templates"
-
-module Middleman
-  class Generator < ::Thor::Group
-    include Thor::Actions
-    
-    argument :location, :type => :string, :desc => "New project location"
-    
-    available_templates = Middleman::Templates.registered_names.join(", ")
-    class_option :template, :aliases => "-T", :default => "default", :desc => "Optionally use a pre-defined project template: #{available_templates}"
-    
-    class_option :css_dir, :default => "stylesheets", :desc => 'The path to the css files'
-    class_option :js_dir, :default => "javascripts", :desc => 'The path to the javascript files'
-    class_option :images_dir, :default => "images", :desc => 'The path to the image files'
-    
-    def create_project
-      key = options[:template].to_sym
-      key = :default unless Middleman::Templates.registered_templates.has_key?(key)
-      
-      Middleman::Templates.registered_templates[key].start
-    end
-  end
-end
-
-Middleman::Generator.start
+#!/bin/bash
+/usr/bin/env middleman init $@

data/bin/mm-server

@@ -1,46 +1,2 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-require "thor"
-require "thor/group"
-
-# Require Middleman
-require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
-
-module Middleman
-  class GuardServer < ::Thor::Group
-    include Thor::Actions
-    
-    class_option :environment, :aliases => "-e", :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development'
-    
-    class_option :port, :aliases => "-p", :default => "4567"
-    class_option :"livereload-port", :default => "35729"
-    class_option :"livereload", :default => false, :type => :boolean
-    
-    def start_guard
-      if !File.exists?("config.rb")
-        $stderr.puts "== Error: Could not find a Middleman project config, perhaps you are in the wrong folder?"
-        return
-      end
-
-      # If the old directories exists, use it, but issue warning
-      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."
-        return
-      end
-
-      ENV['RACK_ENV'] = options[:environment]
-      
-      livereload_options = {
-        :port => options[:"livereload-port"]
-      }
-      livereload_options = nil unless options[:"livereload"] 
-      
-      ::Middleman::Guard.start({
-        :port => options[:port],
-      }, livereload_options)
-    end
-  end
-end
-
-Middleman::GuardServer.start
+#!/bin/bash
+/usr/bin/env middleman server $@

data/features/asset_host.feature

@@ -3,12 +3,12 @@ Feature: Alternate between multiple asset hosts
   
   Scenario: Rendering css with the feature enabled
     Given I am using an asset host
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/stylesheets/asset_host.css"
     Then I should see "http://assets"
     
   Scenario: Rendering html with the feature enabled
     Given I am using an asset host
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/asset_host.html"
     Then I should see "http://assets"

data/features/automatic_image_sizes.feature

@@ -3,14 +3,14 @@ Feature: Automatically detect and insert image dimensions into tags
 
   Scenario: Rendering an image with the feature disabled
     Given "automatic_image_sizes" feature is "disabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/auto-image-sizes.html"
     Then I should not see "width="
     And I should not see "height="
   
   Scenario: Rendering an image with the feature enabled
     Given "automatic_image_sizes" feature is "enabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/auto-image-sizes.html"
     Then I should see "width="
     And I should see "height="

data/features/builder.feature

@@ -2,22 +2,22 @@ Feature: Builder
   In order to output static html and css for delivery
 
   Scenario: Checking built folder for content
-    Given a built test app
-    Then "index.html" should exist and include "Comment in layout"
-    Then "javascripts/coffee_test.js" should exist and include "Array.prototype.slice"
-    Then "index.html" should exist and include "<h1>Welcome</h1>"
-    Then "static.html" should exist and include "Static, no code!"
-    Then "services/index.html" should exist and include "Services"
-    Then "stylesheets/site.css" should exist and include "html, body, div, span"
-    Then "stylesheets/site_scss.css" should exist and include "html, body, div, span"
-    Then "stylesheets/static.css" should exist and include "body"
-    Then "_partial.html" should not exist
-    Then "spaces in file.html" should exist and include "spaces"
-    Then "images/Read me (example).txt" should exist
-    Then "images/Child folder/regular_file(example).txt" should exist
-    And cleanup built test app
+    Given a built app at "test-app"
+    Then "index.html" should exist at "test-app" and include "Comment in layout"
+    Then "javascripts/coffee_test.js" should exist at "test-app" and include "Array.prototype.slice"
+    Then "index.html" should exist at "test-app" and include "<h1>Welcome</h1>"
+    Then "static.html" should exist at "test-app" and include "Static, no code!"
+    Then "services/index.html" should exist at "test-app" and include "Services"
+    Then "stylesheets/site.css" should exist at "test-app" and include "html, body, div, span"
+    Then "stylesheets/site_scss.css" should exist at "test-app" and include "html, body, div, span"
+    Then "stylesheets/static.css" should exist at "test-app" and include "body"
+    Then "_partial.html" should not exist at "test-app"
+    Then "spaces in file.html" should exist at "test-app" and include "spaces"
+    Then "images/Read me (example).txt" should exist at "test-app"
+    Then "images/Child folder/regular_file(example).txt" should exist at "test-app"
+    And cleanup built app at "test-app"
     
   Scenario: Force relative assets
     Given a built test app with flags "--relative"
-    Then "stylesheets/relative_assets.css" should exist and include "../"
-    And cleanup built test app
+    Then "stylesheets/relative_assets.css" should exist at "test-app" and include "../"
+    And cleanup built app at "test-app"

data/features/cache_buster.feature

@@ -3,24 +3,24 @@ Feature: Generate mtime-based query string for busting browser caches
     
   Scenario: Rendering css with the feature disabled
     Given "cache_buster" feature is "disabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/stylesheets/relative_assets.css"
     Then I should not see "?"
     
   Scenario: Rendering html with the feature disabled
     Given "cache_buster" feature is "disabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/cache-buster.html"
     Then I should not see "?"
 
   Scenario: Rendering css with the feature enabled
     Given "cache_buster" feature is "enabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/stylesheets/relative_assets.css"
     Then I should see "?"
 
   Scenario: Rendering html with the feature enabled
     Given "cache_buster" feature is "enabled"
-    And the Server is running
+    And the Server is running at "test-app"
     When I go to "/cache-buster.html"
     Then I should not see "?"

data/features/coffee-script.feature

@@ -2,16 +2,16 @@ Feature: Support coffee-script
   In order to offer an alternative when writing Javascript
 
   Scenario: Rendering coffee script
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/javascripts/coffee_test.js"
     Then I should see "Array.prototype.slice"
 
   Scenario: Rendering coffee-script with :coffeescript haml-filter
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/inline-coffeescript.html"
     Then I should see "Array.prototype.slice"
   
   Scenario: Rendering broken coffee
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/javascripts/broken-coffee.js"
     Then I should see "Reserved word"

data/features/data.feature

@@ -2,6 +2,6 @@ Feature: Local Data API
   In order to abstract content from structure
 
   Scenario: Rendering html
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/data.html"
     Then I should see "One:Two"

data/features/directory_index.feature

@@ -0,0 +1,27 @@
+Feature: Directory Index
+  In order output Apache-friendly directories and indexes
+
+  Scenario: Checking built folder for content
+    Given a built app at "indexable-app"
+    Then "needs_index/index.html" should exist at "indexable-app" and include "Indexable"
+    Then "a_folder/needs_index/index.html" should exist at "indexable-app" and include "Indexable"
+    Then "leave_me_alone.html" should exist at "indexable-app" and include "Stay away"
+    Then "needs_index.html" should not exist at "indexable-app"
+    Then "a_folder/needs_index.html" should not exist at "indexable-app"
+    Then "leave_me_alone/index.html" should not exist at "indexable-app"
+    And cleanup built app at "indexable-app"
+    
+  Scenario: Preview normal file
+    Given the Server is running at "indexable-app"
+    When I go to "/needs_index/"
+    Then I should see "Indexable"
+    
+  Scenario: Preview normal file subdirectory
+    Given the Server is running at "indexable-app"
+    When I go to "/a_folder/needs_index/"
+    Then I should see "Indexable"
+    
+  Scenario: Preview ignored file
+    Given the Server is running at "indexable-app"
+    When I go to "/leave_me_alone/"
+    Then I should see "File Not Found"

data/features/dynamic_pages.feature

@@ -2,23 +2,32 @@ Feature: Dynamic Pages
   In order to use a single view to generate multiple output files
 
   Scenario: Checking built folder for content
-    Given a built test app
-    Then "fake.html" should exist and include "I am real"
-    Then "fake/one.html" should exist and include "I am real: one"
-    Then "fake/two.html" should exist and include "I am real: two"
-    And cleanup built test app
+    Given a built app at "test-app"
+    Then "fake.html" should exist at "test-app" and include "I am real"
+    Then "fake/one.html" should exist at "test-app" and include "I am real: one"
+    Then "fake/two.html" should exist at "test-app" and include "I am real: two"
+    Then "target_ignore.html" should exist at "test-app" and include "Ignore me"
+    Then "should_be_ignored.html" should not exist at "test-app"
+    Then "should_be_ignored2.html" should not exist at "test-app"
+    Then "should_be_ignored3.html" should not exist at "test-app"
+    And cleanup built app at "test-app"
     
   Scenario: Preview basic proxy
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/fake.html"
     Then I should see "I am real"
     
   Scenario: Preview proxy with variable one
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/fake/one.html"
     Then I should see "I am real: one"
     
   Scenario: Preview proxy with variable two
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/fake/two.html"
-    Then I should see "I am real: two"
+    Then I should see "I am real: two"
+    
+  Scenario: Preview ignored paths
+    Given the Server is running at "test-app"  
+    When I go to "/should_be_ignored.html"
+    Then I should see "File Not Found"

data/features/front-matter.feature

@@ -2,6 +2,6 @@ Feature: YAML Front Matter
   In order to specific options and data inline
 
   Scenario: Rendering html
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/front-matter.html"
     Then I should see "<h1>This is the title</h1>"

data/features/helpers_auto_javascript_include_tag.feature

@@ -2,26 +2,26 @@ Feature: Built-in auto_javascript_include_tag view helper
   In order to simplify including javascript files
 
   Scenario: Viewing the root path
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/auto-js.html"
     Then I should see "javascripts/auto-js.js"
 
   Scenario: Viewing a tier-1 path
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/auto-js/auto-js.html"
     Then I should see "javascripts/auto-js/auto-js.js"
 
   Scenario: Viewing the index file of a tier-1 path, without filename
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/auto-js"
     Then I should see "javascripts/auto-js/index.js"
 
   Scenario: Viewing the index file of a tier-1 path, without filename, with a trailing slash
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/auto-js/"
     Then I should see "javascripts/auto-js/index.js"
 
   Scenario: Viewing a tier-2 path
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/auto-js/sub/auto-js.html"
     Then I should see "javascripts/auto-js/sub/auto-js.js"

data/features/helpers_auto_stylesheet_link_tag.feature

@@ -2,26 +2,26 @@ Feature: Built-in auto_stylesheet_link_tag view helper
   In order to simplify including css files
 
   Scenario: Viewing the root path
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/auto-css.html"
     Then I should see "stylesheets/auto-css.css"
 
   Scenario: Viewing a tier-1 path
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/auto-css/auto-css.html"
     Then I should see "stylesheets/auto-css/auto-css.css"
 
   Scenario: Viewing the index file of a tier-1 path, without filename
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/auto-css"
     Then I should see "stylesheets/auto-css/index.css"
 
   Scenario: Viewing the index file of a tier-1 path, without filename, with a trailing slash
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/auto-css/"
     Then I should see "stylesheets/auto-css/index.css"
 
   Scenario: Viewing a tier-2 path
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/auto-css/sub/auto-css.html"
     Then I should see "stylesheets/auto-css/sub/auto-css.css"

data/features/helpers_page_classes.feature

@@ -2,16 +2,16 @@ Feature: Built-in page_classes view helper
   In order to generate body classes for views
   
   Scenario: Viewing the root path
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/page-classes.html"
     Then I should see "page-classes"
 
   Scenario: Viewing a tier-1 path
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/sub1/page-classes.html"
     Then I should see "sub1 sub1_page-classes"
 
   Scenario: Viewing a tier-2 path
-    Given the Server is running
+    Given the Server is running at "test-app"
     When I go to "/sub1/sub2/page-classes.html"
     Then I should see "sub1 sub1_sub2 sub1_sub2_page-classes"