middleman 3.0.0.alpha.4 → 3.0.0.alpha.5

data/.gitignore

@@ -13,3 +13,4 @@ fixtures/generator-test
 build
 doc
 .yardoc
+tmp

data/.yardopts

@@ -1,7 +1,11 @@
 lib/**/*.rb 
---exclude lib/middleman/vendor 
+--exclude lib/middleman/vendor/
 --exclude lib/middleman/extensions/automatic_image_sizes/fastimage.rb 
 --exclude lib/middleman/extensions/minify_css/cssmin.rb
 --exclude lib/middleman/step_definitions
---exclude lib/middleman/step_definitions.rb
---no-private
+--exclude lib/middleman/templates/default/
+--exclude lib/middleman/templates/html5/
+--exclude lib/middleman/templates/mobile/
+--exclude lib/middleman/templates/shared/
+--no-private
+--hide-void-return

data/CHANGELOG.md

@@ -10,9 +10,12 @@
 * Sitemap object representing the known world
 * FileWatcher proxies file change events
 * Unified callback solution
-* Removed Slim and Maruku from base install. Will need to be installed and required by the user (in - config.rb)
+* Removed Slim from base install. Will need to be installed and required by the user (in - config.rb)
 * Activate mobile html5boilerplate template
 * Update to Redcarpet for Markdown (breaks Haml :markdown filter)
+* Return correct exit codes (0 for success, 1 for failure) from CLI
+* Yard code docs: http://rubydoc.info/github/tdreyno/middleman
+* config.rb and extensions can add command-line commands
 
 2.0.14
 ====

data/bin/middleman

@@ -9,7 +9,7 @@ require 'rubygems'
 module Middleman
   module ProjectLocator
     class << self
-      def locate_middleman_root!(args)
+      def locate_middleman_root!
         cwd = Dir.pwd
       
         if !in_middleman_project? && !in_middleman_project_subdirectory?
@@ -18,14 +18,14 @@ module Middleman
         end
       
         if in_middleman_project?
-          did_locate_middleman_project(cwd, args)
+          did_locate_middleman_project(cwd)
           return
         end
       
         Dir.chdir("..") do
           # Recurse in a chdir block: if the search fails we want to be sure
           # the application is generated in the original working directory.
-          locate_middleman_root!(args) unless cwd == Dir.pwd
+          locate_middleman_root! unless cwd == Dir.pwd
         end
       rescue SystemCallError
         # could not chdir, no problem just return
@@ -39,39 +39,25 @@ module Middleman
         File.exists?(File.join(path, 'config.rb')) || !path.root? && in_middleman_project_subdirectory?(path.parent)
       end
     
-      def did_locate_middleman_project(path, args)
+      def did_locate_middleman_project(path)
         # Set up gems listed in the Gemfile.
         ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', path)
 
         require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 
-        start_cli!(args)
+        start_cli!
       end
     
-      def start_cli!(args)
+      def start_cli!
         require 'middleman'
-        Middleman::CLI.start(args)
+        Middleman::Cli::Base.start
       end
     end
   end
 end
 
-args = ARGV.dup
-
-ARG_ALIASES = {
-  "s"   => "server",
-  "b"   => "build",
-  "i"   => "init",
-  "new" => "init",
-  "n"   => "init"
-}
-
-if ARG_ALIASES.has_key?(args[0])
-  args[0] = ARG_ALIASES[args[0]]
-end
-  
-if args.length < 1 || %w(server build migrate).include?(args.first)
-  Middleman::ProjectLocator.locate_middleman_root!(args)
+if ARGV.length < 1 || %w(server build migrate).include?(ARGV.first)
+  Middleman::ProjectLocator.locate_middleman_root!
 else
-  Middleman::ProjectLocator.start_cli!(args)
+  Middleman::ProjectLocator.start_cli!
 end

data/features/3rd_party_cli.feature

@@ -0,0 +1,5 @@
+Feature: Allow config.rb and extensions to add CLI commands
+  Scenario: Test 3rd Party Command
+    Given a fixture app "3rd-party-command"
+    When I run `middleman hello`
+    Then the output should contain "Hello World"

data/features/builder.feature

@@ -2,33 +2,51 @@ Feature: Builder
   In order to output static html and css for delivery
 
   Scenario: Checking built folder for content
-    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/blank.gif" should exist at "test-app"
-    Then "images/Read me (example).txt" should exist at "test-app"
-    Then "images/Child folder/regular_file(example).txt" should exist at "test-app"
-    Then ".htaccess" should exist at "test-app"
-    Then the last exit code should be "0"
+    Given a successfully built app at "test-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html                                    |
+      | javascripts/coffee_test.js                    |
+      | static.html                                   |
+      | services/index.html                           |
+      | stylesheets/site.css                          |
+      | stylesheets/site_scss.css                     |
+      | stylesheets/static.css                        |
+      | spaces in file.html                           |
+      | images/blank.gif                              |
+      | images/Read me (example).txt                  |
+      | images/Child folder/regular_file(example).txt |
+      | .htaccess                                     |
+    Then the following files should not exist:
+      | _partial                                      |
+      | _liquid_partial                               |
+      | layout                                        |
+      | layouts/custom                                |
+      | layouts/content_for                           |
+      
+    And the file "index.html" should contain "Comment in layout"
+    And the file "index.html" should contain "<h1>Welcome</h1>"
+    And the file "javascripts/coffee_test.js" should contain "Array.prototype.slice"
+    And the file "static.html" should contain "Static, no code!"
+    And the file "services/index.html" should contain "Services"
+    And the file "stylesheets/site.css" should contain "html, body, div, span"
+    And the file "stylesheets/site_scss.css" should contain "html, body, div, span"
+    And the file "stylesheets/static.css" should contain "body"
+    And the file "spaces in file.html" should contain "spaces"
     
   Scenario: Build glob
-    Given a built app at "glob-app" with flags "--glob '*.css'"
-    Then "stylesheets/site.css" should exist at "glob-app" and include "html"
-    Then "index.html" should not exist at "glob-app"
-    Then the last exit code should be "0"
+    Given a successfully built app at "glob-app" with flags "--glob '*.css'"
+    When I cd to "build"
+    Then the following files should not exist:
+      | index.html                                    |
+    Then the following files should exist:
+      | stylesheets/site.css                          |
   
   Scenario: Build with errors
     Given a built app at "build-with-errors-app"
-    Then the last exit code should be "1"
-    
-  # Scenario: Force relative assets
-  #   Given a built app at "relative-app" with flags "--relative"
-  #   Then "stylesheets/relative_assets.css" should exist at "relative-app" and include "../"
+    Then the exit status should be 1
+
+  Scenario: Build alias (b)
+    Given a fixture app "test-app"
+    When I run `middleman b`
+    Then was successfully built

data/features/chained_templates.feature

@@ -9,7 +9,11 @@ Feature: Templates should be chainable
     And I should see "Sup</h3>"
     
   Scenario: Build chained template
-    Given a built app at "chained-app"
-    Then "index.html" should exist at "chained-app" and include "Title</h1>"
-    Then "index.html" should exist at "chained-app" and include "Subtitle</h2>"
-    Then "index.html" should exist at "chained-app" and include "Sup</h3>"
+    Given a successfully built app at "chained-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html                                    |
+
+    And the file "index.html" should contain "Title</h1>"
+    And the file "index.html" should contain "Subtitle</h2>"
+    And the file "index.html" should contain "Sup</h3>"

data/features/clean_build.feature

@@ -1,20 +1,31 @@
 Feature: Build Clean
   Scenario: Build and Clean an app
-    Given app "clean-app" is using config "empty"
-    And a built app at "clean-app"
+    Given a fixture app "clean-app"
+    And app "clean-app" is using config "empty"
+    And a successfully 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"
+    
+    Given a successfully built app at "clean-app" with flags "--clean"
+    When I cd to "build"
+    Then the following files should not exist:
+      | should_be_ignored.html                        |
+      | should_be_ignored2.html                       |
+      | should_be_ignored3.html                       |
+    And the file "index.html" should contain "Comment in layout"
 
   Scenario: Clean an app with directory indexes
-    Given a built app at "clean-dir-app"
-    Then "about/index.html" should exist at "clean-dir-app"
-    Given a built app at "clean-dir-app" with flags "--clean"
-    Then "about/index.html" should exist at "clean-dir-app"
-    Then cleanup built app at "clean-dir-app"
+    Given a successfully built app at "clean-dir-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | about/index.html                               |
+    
+    Given a successfully built app at "clean-dir-app" with flags "--clean"
+      When I cd to "build"
+    Then the following files should exist:
+      | about/index.html                               |
 
   Scenario: Clean build an app that's never been built
-    Given a built app at "clean-dir-app" with flags "--clean"
-    Then "about/index.html" should exist at "clean-dir-app"
+    Given a successfully built app at "clean-dir-app" with flags "--clean"
+    When I cd to "build"
+    Then the following files should exist:
+      | about/index.html                               |

data/features/cli.feature

@@ -0,0 +1,121 @@
+Feature: Middleman CLI
+
+  Scenario: Create a new project
+    When I run `middleman init MY_PROJECT`
+    Then a directory named "MY_PROJECT" should exist
+    When I cd to "MY_PROJECT"
+    Then the following files should exist:
+      | config.rb                                     |
+    Then the following files should not exist:
+      | config.ru                                     |
+      | Gemfile                                       |
+    Then a directory named "source" should exist
+    When I cd to "source"
+    Then the following files should exist:
+      | index.html.erb                                |
+      | layout.erb                                    |
+      | stylesheets/site.css.scss                     |
+      
+  Scenario: Create a new project (alias i)
+    When I run `middleman i MY_PROJECT`
+    Then a directory named "MY_PROJECT" should exist
+    
+  Scenario: Create a new project (alias i)
+    When I run `middleman new MY_PROJECT`
+    Then a directory named "MY_PROJECT" should exist
+  
+  Scenario: Create a new project (alias i)
+    When I run `middleman n MY_PROJECT`
+    Then a directory named "MY_PROJECT" should exist
+    
+  Scenario: Create a new project with Rack
+    When I run `middleman init MY_PROJECT --rack`
+    Then a directory named "MY_PROJECT" should exist
+    When I cd to "MY_PROJECT"
+    Then the following files should exist:
+      | config.rb                                     |
+      | config.ru                                     |
+    Then the following files should not exist:
+      | Gemfile                                       |
+    
+  Scenario: Create a new project with Bundler
+    When I run `middleman init MY_PROJECT --bundler`
+    Then a directory named "MY_PROJECT" should exist
+    When I cd to "MY_PROJECT"
+    Then the following files should exist:
+      | config.rb                                     |
+      | Gemfile                                       |
+    Then the following files should not exist:  
+      | config.ru                                     |
+      
+  Scenario: Create a new HTML5 project
+    When I run `middleman init MY_PROJECT --template=html5`
+    Then a directory named "MY_PROJECT" should exist
+    When I cd to "MY_PROJECT"
+    Then the following files should exist:
+      | config.rb                                     |
+    Then the following files should not exist:
+      | config.ru                                     |
+      | Gemfile                                       |
+    Then a directory named "source" should exist
+    When I cd to "source"
+    Then the following files should exist:
+      | index.html                                    |
+      | humans.txt                                    |
+      | js/script.js                                  |
+      
+  Scenario: Create a new HTML5 project with Rack
+    When I run `middleman init MY_PROJECT --rack --template=html5`
+    Then a directory named "MY_PROJECT" should exist
+    When I cd to "MY_PROJECT"
+    Then the following files should exist:
+      | config.rb                                     |
+      | config.ru                                     |
+    Then the following files should not exist:
+      | Gemfile                                       |
+    
+  Scenario: Create a new HTML5 project with Bundler
+    When I run `middleman init MY_PROJECT --bundler --template=html5`
+    Then a directory named "MY_PROJECT" should exist
+    When I cd to "MY_PROJECT"
+    Then the following files should exist:
+      | config.rb                                     |
+      | Gemfile                                       |
+    Then the following files should not exist:  
+      | config.ru                                     |
+      
+  Scenario: Create a new Mobile HTML5 project
+    When I run `middleman init MY_PROJECT --template=mobile`
+    Then a directory named "MY_PROJECT" should exist
+    When I cd to "MY_PROJECT"
+    Then the following files should exist:
+      | config.rb                                     |
+    Then the following files should not exist:
+      | config.ru                                     |
+      | Gemfile                                       |
+    Then a directory named "source" should exist
+    When I cd to "source"
+    Then the following files should exist:
+      | index.html                                    |
+      | humans.txt                                    |
+      | js/libs/respond.min.js                        |
+      
+  Scenario: Create a new Mobile HTML5 project with Rack
+    When I run `middleman init MY_PROJECT --rack --template=mobile`
+    Then a directory named "MY_PROJECT" should exist
+    When I cd to "MY_PROJECT"
+    Then the following files should exist:
+      | config.rb                                     |
+      | config.ru                                     |
+    Then the following files should not exist:
+      | Gemfile                                       |
+    
+  Scenario: Create a new Mobile HTML5 project with Bundler
+    When I run `middleman init MY_PROJECT --bundler --template=mobile`
+    Then a directory named "MY_PROJECT" should exist
+    When I cd to "MY_PROJECT"
+    Then the following files should exist:
+      | config.rb                                     |
+      | Gemfile                                       |
+    Then the following files should not exist:  
+      | config.ru                                     |

data/features/coffee-script.feature

@@ -14,4 +14,4 @@ Feature: Support coffee-script
   Scenario: Rendering broken coffee
     Given the Server is running at "test-app"
     When I go to "/javascripts/broken-coffee.js"
-    Then I should see "ProgramError"
+    Then I should see "Error"

data/features/custom_layout_engines.feature

@@ -1,8 +1,11 @@
 Feature: Custom Layout Engine
 
   Scenario: Checking built folder for content
-    Given a built app at "custom-layout-app"
-    Then "index.html" should exist at "custom-layout-app" and include "Comment in layout"
+    Given a successfully built app at "custom-layout-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html                                    |
+    And the file "index.html" should contain "Comment in layout"
     
   Scenario: Checking server for content
     Given the Server is running at "test-app"

data/features/directory_index.feature

@@ -2,16 +2,23 @@ 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 "regular/index.html" should exist at "indexable-app" and include "Regular"
-    Then "regular/index/index.html" should not exist at "indexable-app"
-    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"
-    Then ".htaccess" should exist at "indexable-app"
+    Given a successfully built app at "indexable-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | needs_index/index.html                        |
+      | a_folder/needs_index/index.html               |
+      | leave_me_alone.html                           |
+      | regular/index.html                            |
+      | .htaccess                                     |
+    Then the following files should not exist:
+      | egular/index/index.html                       |
+      | needs_index.html                              |
+      | a_folder/needs_index.html                     |
+      | leave_me_alone/index.html                     |
+    And the file "needs_index/index.html" should contain "Indexable"
+    And the file "a_folder/needs_index/index.html" should contain "Indexable"
+    And the file "leave_me_alone.html" should contain "Stay away"
+    And the file "regular/index.html" should contain "Regular"
     
   Scenario: Preview normal file
     Given the Server is running at "indexable-app"

data/features/dynamic_pages.feature

@@ -2,14 +2,17 @@ Feature: Dynamic Pages
   In order to use a single view to generate multiple output files
 
   Scenario: Checking built folder for content
-    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"
+    Given a successfully built app at "test-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | fake.html                                     |
+      | fake/one.html                                 |
+      | fake/two.html                                 |
+      | target_ignore.html                            |
+    Then the following files should not exist:
+      | should_be_ignored.html                        |
+      | should_be_ignored2.html                       |
+      | should_be_ignored3.html                       |
     
   Scenario: Preview basic proxy
     Given the Server is running at "test-app"