diff --git a/.gitmodules b/.gitmodules index 8190eb5f..4f5e8fa4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "middleman-more/lib/middleman-more/templates/smacss"] - path = middleman-more/lib/middleman-more/templates/smacss +[submodule "middleman-core/lib/middleman-more/templates/smacss"] + path = middleman-core/lib/middleman-more/templates/smacss url = git@github.com:nsteiner/middleman-smacss.git diff --git a/.yardopts b/.yardopts index a33aa843..8565fb5d 100644 --- a/.yardopts +++ b/.yardopts @@ -1,7 +1,6 @@ middleman-*/lib/**/*.rb --exclude middleman-core/lib/middleman-core/vendor/ --exclude middleman-core/lib/middleman-core/extensions/automatic_image_sizes/fastimage.rb ---exclude middleman-more/lib/middleman-more/extensions/minify_css/cssmin.rb --exclude middleman-core/lib/middleman-core/step_definitions --exclude middleman-core/lib/middleman-core/templates/default/ --exclude middleman-core/lib/middleman-core/templates/html5/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ad750c2..7bd8cce5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ master === +* Move more into core, autoloaded if gems are available. * DataStore may now be accessed like a hash with #[] and #has_key?. #880 * The i18n extension now supports providing localized templates as separate files, like index.es.html.haml. #816, #823 * The list of regular expressions for which files are ignored by the file watcher are now configurable. diff --git a/Gemfile b/Gemfile index 3f641560..b919a4db 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,8 @@ source 'https://rubygems.org' - # Build and doc tools -gem "rake", "~> 10.0.3" -gem "yard", "~> 0.8.0" +gem "rake", "~> 10.0.3", :require => false +gem "yard", "~> 0.8.0", :require => false # Test tools gem "cucumber", "~> 1.3.1" @@ -12,7 +11,7 @@ gem "aruba", "~> 0.5.1" gem "rspec", "~> 2.12" # Optional middleman dependencies, included for tests -gem "haml", "~> 4.0.0" # Make sure to use Haml 4 for tests +gem "haml", "~> 4.0.0", :require => false # Make sure to use Haml 4 for tests gem "sinatra", :require => false gem "slim", :require => false gem "liquid", :require => false @@ -30,6 +29,5 @@ end # Middleman itself gem "middleman-core", :path => "middleman-core" -gem "middleman-more", :path => "middleman-more" gem "middleman-sprockets", :github => "middleman/middleman-sprockets" gem "middleman", :path => "middleman" diff --git a/Rakefile b/Rakefile index 1801ea15..f0d64f2d 100644 --- a/Rakefile +++ b/Rakefile @@ -7,7 +7,7 @@ require File.expand_path("../middleman-core/lib/middleman-core/version.rb", __FI ROOT = File.expand_path(File.dirname(__FILE__)) GEM_NAME = 'middleman' -middleman_gems = %w(middleman-core middleman-more middleman) +middleman_gems = %w(middleman-core middleman) GEM_PATHS = middleman_gems.freeze def sh_rake(command) diff --git a/middleman-core/.cane b/middleman-core/.cane deleted file mode 100644 index e71c6aca..00000000 --- a/middleman-core/.cane +++ /dev/null @@ -1,2 +0,0 @@ ---exclusions-file .cane-exclusions.yml ---no-doc \ No newline at end of file diff --git a/middleman-core/.cane-exclusions.yml b/middleman-core/.cane-exclusions.yml deleted file mode 100644 index 95f72693..00000000 --- a/middleman-core/.cane-exclusions.yml +++ /dev/null @@ -1,5 +0,0 @@ -style: - - lib/middleman-core/vendor/hooks-0.2.0/lib/hooks/inheritable_attribute.rb - - lib/middleman-core/vendor/hooks-0.2.0/test/hooks_test.rb - - lib/middleman-core/vendor/hooks-0.2.0/test/inheritable_attribute_test.rb - - lib/middleman-core/vendor/hooks-0.2.0/lib/hooks.rb \ No newline at end of file diff --git a/middleman-more/features/asset_hash.feature b/middleman-core/features/asset_hash.feature similarity index 100% rename from middleman-more/features/asset_hash.feature rename to middleman-core/features/asset_hash.feature diff --git a/middleman-more/features/asset_host.feature b/middleman-core/features/asset_host.feature similarity index 100% rename from middleman-more/features/asset_host.feature rename to middleman-core/features/asset_host.feature diff --git a/middleman-more/features/automatic_image_sizes.feature b/middleman-core/features/automatic_image_sizes.feature similarity index 100% rename from middleman-more/features/automatic_image_sizes.feature rename to middleman-core/features/automatic_image_sizes.feature diff --git a/middleman-more/features/cache_buster.feature b/middleman-core/features/cache_buster.feature similarity index 100% rename from middleman-more/features/cache_buster.feature rename to middleman-core/features/cache_buster.feature diff --git a/middleman-more/features/coffee-script.feature b/middleman-core/features/coffee-script.feature similarity index 100% rename from middleman-more/features/coffee-script.feature rename to middleman-core/features/coffee-script.feature diff --git a/middleman-more/features/compass-sprites.feature b/middleman-core/features/compass-sprites.feature similarity index 100% rename from middleman-more/features/compass-sprites.feature rename to middleman-core/features/compass-sprites.feature diff --git a/middleman-more/features/content_for.feature b/middleman-core/features/content_for.feature similarity index 100% rename from middleman-more/features/content_for.feature rename to middleman-core/features/content_for.feature diff --git a/middleman-more/features/directory_index.feature b/middleman-core/features/directory_index.feature similarity index 100% rename from middleman-more/features/directory_index.feature rename to middleman-core/features/directory_index.feature diff --git a/middleman-more/features/fonts.feature b/middleman-core/features/fonts.feature similarity index 100% rename from middleman-more/features/fonts.feature rename to middleman-core/features/fonts.feature diff --git a/middleman-more/features/former_padrino_helpers.feature b/middleman-core/features/former_padrino_helpers.feature similarity index 100% rename from middleman-more/features/former_padrino_helpers.feature rename to middleman-core/features/former_padrino_helpers.feature diff --git a/middleman-more/features/gzip.feature b/middleman-core/features/gzip.feature similarity index 100% rename from middleman-more/features/gzip.feature rename to middleman-core/features/gzip.feature diff --git a/middleman-more/features/helpers_auto_javascript_include_tag.feature b/middleman-core/features/helpers_auto_javascript_include_tag.feature similarity index 100% rename from middleman-more/features/helpers_auto_javascript_include_tag.feature rename to middleman-core/features/helpers_auto_javascript_include_tag.feature diff --git a/middleman-more/features/helpers_auto_stylesheet_link_tag.feature b/middleman-core/features/helpers_auto_stylesheet_link_tag.feature similarity index 100% rename from middleman-more/features/helpers_auto_stylesheet_link_tag.feature rename to middleman-core/features/helpers_auto_stylesheet_link_tag.feature diff --git a/middleman-more/features/helpers_form_tag.feature b/middleman-core/features/helpers_form_tag.feature similarity index 100% rename from middleman-more/features/helpers_form_tag.feature rename to middleman-core/features/helpers_form_tag.feature diff --git a/middleman-more/features/helpers_link_to.feature b/middleman-core/features/helpers_link_to.feature similarity index 100% rename from middleman-more/features/helpers_link_to.feature rename to middleman-core/features/helpers_link_to.feature diff --git a/middleman-more/features/helpers_lorem.feature b/middleman-core/features/helpers_lorem.feature similarity index 100% rename from middleman-more/features/helpers_lorem.feature rename to middleman-core/features/helpers_lorem.feature diff --git a/middleman-more/features/helpers_page_classes.feature b/middleman-core/features/helpers_page_classes.feature similarity index 100% rename from middleman-more/features/helpers_page_classes.feature rename to middleman-core/features/helpers_page_classes.feature diff --git a/middleman-more/features/helpers_url_for.feature b/middleman-core/features/helpers_url_for.feature similarity index 100% rename from middleman-more/features/helpers_url_for.feature rename to middleman-core/features/helpers_url_for.feature diff --git a/middleman-more/features/i18n_builder.feature b/middleman-core/features/i18n_builder.feature similarity index 100% rename from middleman-more/features/i18n_builder.feature rename to middleman-core/features/i18n_builder.feature diff --git a/middleman-more/features/i18n_force_locale.feature b/middleman-core/features/i18n_force_locale.feature similarity index 100% rename from middleman-more/features/i18n_force_locale.feature rename to middleman-core/features/i18n_force_locale.feature diff --git a/middleman-more/features/i18n_preview.feature b/middleman-core/features/i18n_preview.feature similarity index 100% rename from middleman-more/features/i18n_preview.feature rename to middleman-core/features/i18n_preview.feature diff --git a/middleman-more/features/ignore_already_minified.feature b/middleman-core/features/ignore_already_minified.feature similarity index 100% rename from middleman-more/features/ignore_already_minified.feature rename to middleman-core/features/ignore_already_minified.feature diff --git a/middleman-more/features/liquid.feature b/middleman-core/features/liquid.feature similarity index 100% rename from middleman-more/features/liquid.feature rename to middleman-core/features/liquid.feature diff --git a/middleman-more/features/markdown.feature b/middleman-core/features/markdown.feature similarity index 100% rename from middleman-more/features/markdown.feature rename to middleman-core/features/markdown.feature diff --git a/middleman-more/features/markdown_redcarpet.feature b/middleman-core/features/markdown_redcarpet.feature similarity index 100% rename from middleman-more/features/markdown_redcarpet.feature rename to middleman-core/features/markdown_redcarpet.feature diff --git a/middleman-more/features/markdown_redcarpet_in_haml.feature b/middleman-core/features/markdown_redcarpet_in_haml.feature similarity index 100% rename from middleman-more/features/markdown_redcarpet_in_haml.feature rename to middleman-core/features/markdown_redcarpet_in_haml.feature diff --git a/middleman-more/features/minify_css.feature b/middleman-core/features/minify_css.feature similarity index 100% rename from middleman-more/features/minify_css.feature rename to middleman-core/features/minify_css.feature diff --git a/middleman-more/features/minify_javascript.feature b/middleman-core/features/minify_javascript.feature similarity index 100% rename from middleman-more/features/minify_javascript.feature rename to middleman-core/features/minify_javascript.feature diff --git a/middleman-more/features/clean_build.feature b/middleman-core/features/more-clean_build.feature similarity index 100% rename from middleman-more/features/clean_build.feature rename to middleman-core/features/more-clean_build.feature diff --git a/middleman-more/features/extensionless_text_files.feature b/middleman-core/features/more-extensionless_text_files.feature similarity index 85% rename from middleman-more/features/extensionless_text_files.feature rename to middleman-core/features/more-extensionless_text_files.feature index f5bc4921..c1550be4 100644 --- a/middleman-more/features/extensionless_text_files.feature +++ b/middleman-core/features/more-extensionless_text_files.feature @@ -1,7 +1,7 @@ Feature: Text Files Without Extensions Should Build and Preview Scenario: Building Text Files with directory indexes - Given a successfully built app at "extensionless-text-files-app" + Given a successfully built app at "more-extensionless-text-files-app" When I cd to "build" Then the following files should exist: | CNAME | @@ -13,7 +13,7 @@ Feature: Text Files Without Extensions Should Build and Preview | README/index.html | Scenario: Previewing Text Files - Given the Server is running at "extensionless-text-files-app" + Given the Server is running at "more-extensionless-text-files-app" When I go to "/CNAME" Then I should see "test.github.com" When I go to "/LICENSE" diff --git a/middleman-more/features/frontmatter_page_settings.feature b/middleman-core/features/more-frontmatter_page_settings.feature similarity index 87% rename from middleman-more/features/frontmatter_page_settings.feature rename to middleman-core/features/more-frontmatter_page_settings.feature index f198ea3b..2bb289c5 100644 --- a/middleman-more/features/frontmatter_page_settings.feature +++ b/middleman-core/features/more-frontmatter_page_settings.feature @@ -1,6 +1,6 @@ Feature: Setting page settings through frontmatter Scenario: Setting layout, ignoring, and disabling directory indexes through frontmatter (build) - Given a successfully built app at "frontmatter-settings-app" + Given a successfully built app at "more-frontmatter-settings-app" Then the following files should exist: | build/proxied/index.html | | build/no_index.html | @@ -11,7 +11,7 @@ Feature: Setting page settings through frontmatter Scenario: Setting layout, ignoring, and disabling directory indexes through frontmatter (preview) - Given the Server is running at "frontmatter-settings-app" + Given the Server is running at "more-frontmatter-settings-app" # When I go to "/proxied/" # Then I should not see "File Not Found" When I go to "/no_index.html" @@ -27,7 +27,7 @@ Feature: Setting page settings through frontmatter Then I should see "File Not Found" Scenario: Changing frontmatter in preview server - Given the Server is running at "frontmatter-settings-app" + Given the Server is running at "more-frontmatter-settings-app" When I go to "/ignored/index.html" Then I should see "File Not Found" And the file "source/ignored.html.erb" has the contents diff --git a/middleman-more/features/ignore.feature b/middleman-core/features/more-ignore.feature similarity index 86% rename from middleman-more/features/ignore.feature rename to middleman-core/features/more-ignore.feature index b4d920ac..74eeaa71 100644 --- a/middleman-more/features/ignore.feature +++ b/middleman-core/features/more-ignore.feature @@ -1,13 +1,13 @@ Feature: Ignoring paths Scenario: Ignore with directory indexes (source file, build) - Given a fixture app "ignore-app" + Given a fixture app "more-ignore-app" And a file named "config.rb" with: """ activate :directory_indexes ignore 'about.html.erb' ignore 'plain.html' """ - And a successfully built app at "ignore-app" + And a successfully built app at "more-ignore-app" Then the following files should exist: | build/index.html | And the following files should not exist: @@ -15,7 +15,7 @@ Feature: Ignoring paths | build/plain/index.html | Scenario: Ignore with directory indexes (source file, server) - Given a fixture app "ignore-app" + Given a fixture app "more-ignore-app" And a file named "config.rb" with: """ activate :directory_indexes @@ -31,14 +31,14 @@ Feature: Ignoring paths Then I should see "File Not Found" Scenario: Ignore with directory indexes (output path splat, build) - Given a fixture app "ignore-app" + Given a fixture app "more-ignore-app" And a file named "config.rb" with: """ activate :directory_indexes ignore 'about*' ignore 'plain*' """ - And a successfully built app at "ignore-app" + And a successfully built app at "more-ignore-app" Then the following files should exist: | build/index.html | And the following files should not exist: @@ -46,7 +46,7 @@ Feature: Ignoring paths | build/plain/index.html | Scenario: Ignore with directory indexes (output path splat, server) - Given a fixture app "ignore-app" + Given a fixture app "more-ignore-app" And a file named "config.rb" with: """ activate :directory_indexes diff --git a/middleman-more/features/implied_extensions.feature b/middleman-core/features/more-implied_extensions.feature similarity index 88% rename from middleman-more/features/implied_extensions.feature rename to middleman-core/features/more-implied_extensions.feature index bef95668..4af75759 100644 --- a/middleman-more/features/implied_extensions.feature +++ b/middleman-core/features/more-implied_extensions.feature @@ -1,7 +1,7 @@ Feature: More default extensions Scenario: Default extensions preview - Given the Server is running at "implied-extensions-app" + Given the Server is running at "more-implied-extensions-app" When I go to "/test.html" Then I should see "Hello" When I go to "/test2.html" @@ -20,8 +20,8 @@ Feature: More default extensions Then I should see "color" Scenario: Default extensions build - Given a fixture app "implied-extensions-app" - And a successfully built app at "implied-extensions-app" + Given a fixture app "more-implied-extensions-app" + And a successfully built app at "more-implied-extensions-app" When I cd to "build" Then the following files should exist: | test.html | diff --git a/middleman-more/features/instance_vars.feature b/middleman-core/features/more-instance_vars.feature similarity index 77% rename from middleman-more/features/instance_vars.feature rename to middleman-core/features/more-instance_vars.feature index 63e5261f..87fc3b0d 100644 --- a/middleman-more/features/instance_vars.feature +++ b/middleman-core/features/more-instance_vars.feature @@ -2,17 +2,17 @@ Feature: Instance Vars In order to share data with layouts and partials via instance variables Scenario: Setting an instance var in a template should be visible in its layout - Given the Server is running at "instance-vars-app" + Given the Server is running at "more-instance-vars-app" When I go to "/instance-var-set.html" Then I should see "Var is 100" Scenario: Setting an instance var in a template should be visible in a partial - Given the Server is running at "instance-vars-app" + Given the Server is running at "more-instance-vars-app" When I go to "/instance-var-set.html" Then I should see "My var is here!" Scenario: Setting an instance var in one file should not be visible in another - Given the Server is running at "instance-vars-app" + Given the Server is running at "more-instance-vars-app" When I go to "/instance-var-set.html" When I go to "/no-instance-var.html" Then I should see "No var..." diff --git a/middleman-more/features/sitemap_traversal.feature b/middleman-core/features/more-sitemap_traversal.feature similarity index 86% rename from middleman-more/features/sitemap_traversal.feature rename to middleman-core/features/more-sitemap_traversal.feature index d6e94637..224c2b8a 100644 --- a/middleman-more/features/sitemap_traversal.feature +++ b/middleman-core/features/more-sitemap_traversal.feature @@ -1,7 +1,7 @@ -Feature: Step through sitemap as a tree +Feature: Step through sitemap as a tree (more) Scenario: Root - Given the Server is running at "traversal-app" + Given the Server is running at "more-traversal-app" When I go to "/index.html" Then I should see "Path: index.html" Then I should not see "Parent: index.html" @@ -10,7 +10,7 @@ Feature: Step through sitemap as a tree Then I should not see "Child: proxied.html" Scenario: Directories have children and a parent - Given the Server is running at "traversal-app" + Given the Server is running at "more-traversal-app" When I go to "/sub/index.html" Then I should see "Path: sub/index.html" Then I should see "Parent: index.html" @@ -22,7 +22,7 @@ Feature: Step through sitemap as a tree Then I should see "Sibling: root.html" Scenario: Directory accessed without index.html - Given the Server is running at "traversal-app" + Given the Server is running at "more-traversal-app" When I go to "/sub/" Then I should see "Path: sub/index.html" Then I should see "Parent: index.html" @@ -34,7 +34,7 @@ Feature: Step through sitemap as a tree Then I should see "Sibling: root.html" Scenario: Page has siblings, parent, and source file - Given the Server is running at "traversal-app" + Given the Server is running at "more-traversal-app" When I go to "/sub/sibling/" Then I should see "Parent: sub/index.html" Then I should see "Sibling: sub/fake.html" @@ -44,7 +44,7 @@ Feature: Step through sitemap as a tree Then I should see "Source: source/sub/sibling.html.erb" Scenario: Proxied page has siblings, parent, and source file - Given the Server is running at "traversal-app" + Given the Server is running at "more-traversal-app" When I go to "/sub/fake/" Then I should see "Path: sub/fake.html" Then I should see "Parent: sub/index.html" @@ -55,13 +55,13 @@ Feature: Step through sitemap as a tree Then I should see "Source: source/proxied.html.erb" Scenario: Child pages have data - Given the Server is running at "traversal-app" + Given the Server is running at "more-traversal-app" When I go to "/directory-indexed" Then I should see "Title of Sibling One" Then I should see "Title of Sibling Two" Scenario: When directory_index extension is active, child pages are found in named directory - Given the Server is running at "traversal-app" + Given the Server is running at "more-traversal-app" When I go to "/directory-indexed" Then I should see "Path: directory-indexed.html" Then I should see "Parent: index.html" diff --git a/middleman-more/features/wildcard_page_helper.feature b/middleman-core/features/more-wildcard_page_helper.feature similarity index 100% rename from middleman-more/features/wildcard_page_helper.feature rename to middleman-core/features/more-wildcard_page_helper.feature diff --git a/middleman-more/features/nested_layouts.feature b/middleman-core/features/nested_layouts.feature similarity index 100% rename from middleman-more/features/nested_layouts.feature rename to middleman-core/features/nested_layouts.feature diff --git a/middleman-more/features/partials.feature b/middleman-core/features/partials.feature similarity index 100% rename from middleman-more/features/partials.feature rename to middleman-core/features/partials.feature diff --git a/middleman-more/features/partials_dir.feature b/middleman-core/features/partials_dir.feature similarity index 100% rename from middleman-more/features/partials_dir.feature rename to middleman-core/features/partials_dir.feature diff --git a/middleman-more/features/relative_assets.feature b/middleman-core/features/relative_assets.feature similarity index 100% rename from middleman-more/features/relative_assets.feature rename to middleman-core/features/relative_assets.feature diff --git a/middleman-more/features/sass-assets-paths.feature b/middleman-core/features/sass-assets-paths.feature similarity index 100% rename from middleman-more/features/sass-assets-paths.feature rename to middleman-core/features/sass-assets-paths.feature diff --git a/middleman-more/features/sass_cache_path.feature b/middleman-core/features/sass_cache_path.feature similarity index 92% rename from middleman-more/features/sass_cache_path.feature rename to middleman-core/features/sass_cache_path.feature index 846dba25..e29cf226 100644 --- a/middleman-more/features/sass_cache_path.feature +++ b/middleman-core/features/sass_cache_path.feature @@ -19,4 +19,4 @@ Feature: SASS .sass-cache custom location When I go to "/stylesheets/plain.css" Then I should see "html, body, div, span, applet, object, iframe," - Then a directory named "/tmp/middleman-more-custom-sass_cache_path" should exist + Then a directory named "/tmp/middleman-core-custom-sass_cache_path" should exist diff --git a/middleman-more/features/sass_partials.feature b/middleman-core/features/sass_partials.feature similarity index 90% rename from middleman-more/features/sass_partials.feature rename to middleman-core/features/sass_partials.feature index 0778e336..d6bce56a 100644 --- a/middleman-more/features/sass_partials.feature +++ b/middleman-core/features/sass_partials.feature @@ -1,6 +1,6 @@ Feature: Sass Updates and Partials Scenario: The preview server should update stylesheets when Sass changes - Given the Server is running at "preview-app" + Given the Server is running at "more-preview-app" And the file "source/stylesheets/plain.css.sass" has the contents """ red @@ -17,7 +17,7 @@ Feature: Sass Updates and Partials Then I should see "color: blue;" Scenario: The preview server should update stylesheets when Sass partials change - Given the Server is running at "preview-app" + Given the Server is running at "more-preview-app" And the file "source/stylesheets/main.css.sass" has the contents """ @import partial.sass @@ -50,5 +50,5 @@ Feature: Sass Updates and Partials And I should see "font-size: 18px" Scenario: Sass partials should work when building - Given a successfully built app at "preview-app" + Given a successfully built app at "more-preview-app" Then the file "build/stylesheets/main.css" should contain "font-size: 18px" diff --git a/middleman-more/features/scss-support.feature b/middleman-core/features/scss-support.feature similarity index 100% rename from middleman-more/features/scss-support.feature rename to middleman-core/features/scss-support.feature diff --git a/middleman-more/features/slim.feature b/middleman-core/features/slim.feature similarity index 100% rename from middleman-more/features/slim.feature rename to middleman-core/features/slim.feature diff --git a/middleman-more/features/stylus.feature b/middleman-core/features/stylus.feature similarity index 100% rename from middleman-more/features/stylus.feature rename to middleman-core/features/stylus.feature diff --git a/middleman-more/features/twitter-bootstrap-compile.feature b/middleman-core/features/twitter-bootstrap-compile.feature similarity index 100% rename from middleman-more/features/twitter-bootstrap-compile.feature rename to middleman-core/features/twitter-bootstrap-compile.feature diff --git a/middleman-more/fixtures/asset-hash-app/config.rb b/middleman-core/fixtures/asset-hash-app/config.rb similarity index 100% rename from middleman-more/fixtures/asset-hash-app/config.rb rename to middleman-core/fixtures/asset-hash-app/config.rb diff --git a/middleman-more/fixtures/asset-hash-app/lib/middleware.rb b/middleman-core/fixtures/asset-hash-app/lib/middleware.rb similarity index 100% rename from middleman-more/fixtures/asset-hash-app/lib/middleware.rb rename to middleman-core/fixtures/asset-hash-app/lib/middleware.rb diff --git a/middleman-more/fixtures/asset-hash-app/source/apple-touch-icon.png b/middleman-core/fixtures/asset-hash-app/source/apple-touch-icon.png similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/apple-touch-icon.png rename to middleman-core/fixtures/asset-hash-app/source/apple-touch-icon.png diff --git a/middleman-more/fixtures/asset-hash-app/source/favicon.ico b/middleman-core/fixtures/asset-hash-app/source/favicon.ico similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/favicon.ico rename to middleman-core/fixtures/asset-hash-app/source/favicon.ico diff --git a/middleman-more/fixtures/asset-hash-app/source/images/100px.gif b/middleman-core/fixtures/asset-hash-app/source/images/100px.gif similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/images/100px.gif rename to middleman-core/fixtures/asset-hash-app/source/images/100px.gif diff --git a/middleman-more/fixtures/asset-hash-app/source/images/100px.jpg b/middleman-core/fixtures/asset-hash-app/source/images/100px.jpg similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/images/100px.jpg rename to middleman-core/fixtures/asset-hash-app/source/images/100px.jpg diff --git a/middleman-more/fixtures/asset-hash-app/source/images/100px.png b/middleman-core/fixtures/asset-hash-app/source/images/100px.png similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/images/100px.png rename to middleman-core/fixtures/asset-hash-app/source/images/100px.png diff --git a/middleman-more/fixtures/asset-hash-app/source/index.html.erb b/middleman-core/fixtures/asset-hash-app/source/index.html.erb similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/index.html.erb rename to middleman-core/fixtures/asset-hash-app/source/index.html.erb diff --git a/middleman-more/fixtures/asset-hash-app/source/javascripts/application.js b/middleman-core/fixtures/asset-hash-app/source/javascripts/application.js similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/javascripts/application.js rename to middleman-core/fixtures/asset-hash-app/source/javascripts/application.js diff --git a/middleman-more/fixtures/asset-hash-app/source/layout.erb b/middleman-core/fixtures/asset-hash-app/source/layout.erb similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/layout.erb rename to middleman-core/fixtures/asset-hash-app/source/layout.erb diff --git a/middleman-more/fixtures/asset-hash-app/source/other.html.erb b/middleman-core/fixtures/asset-hash-app/source/other.html.erb similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/other.html.erb rename to middleman-core/fixtures/asset-hash-app/source/other.html.erb diff --git a/middleman-more/fixtures/asset-hash-app/source/partials.html.erb b/middleman-core/fixtures/asset-hash-app/source/partials.html.erb similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/partials.html.erb rename to middleman-core/fixtures/asset-hash-app/source/partials.html.erb diff --git a/middleman-more/fixtures/asset-hash-app/source/stylesheets/_partial.sass b/middleman-core/fixtures/asset-hash-app/source/stylesheets/_partial.sass similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/stylesheets/_partial.sass rename to middleman-core/fixtures/asset-hash-app/source/stylesheets/_partial.sass diff --git a/middleman-more/fixtures/asset-hash-app/source/stylesheets/site.css.scss b/middleman-core/fixtures/asset-hash-app/source/stylesheets/site.css.scss similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/stylesheets/site.css.scss rename to middleman-core/fixtures/asset-hash-app/source/stylesheets/site.css.scss diff --git a/middleman-more/fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass b/middleman-core/fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass rename to middleman-core/fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass diff --git a/middleman-more/fixtures/asset-hash-app/source/subdir/index.html.erb b/middleman-core/fixtures/asset-hash-app/source/subdir/index.html.erb similarity index 100% rename from middleman-more/fixtures/asset-hash-app/source/subdir/index.html.erb rename to middleman-core/fixtures/asset-hash-app/source/subdir/index.html.erb diff --git a/middleman-more/fixtures/asset-hash-host-app/config.rb b/middleman-core/fixtures/asset-hash-host-app/config.rb similarity index 100% rename from middleman-more/fixtures/asset-hash-host-app/config.rb rename to middleman-core/fixtures/asset-hash-host-app/config.rb diff --git a/middleman-more/fixtures/asset-hash-host-app/source/images/100px.gif b/middleman-core/fixtures/asset-hash-host-app/source/images/100px.gif similarity index 100% rename from middleman-more/fixtures/asset-hash-host-app/source/images/100px.gif rename to middleman-core/fixtures/asset-hash-host-app/source/images/100px.gif diff --git a/middleman-more/fixtures/asset-hash-host-app/source/images/100px.jpg b/middleman-core/fixtures/asset-hash-host-app/source/images/100px.jpg similarity index 100% rename from middleman-more/fixtures/asset-hash-host-app/source/images/100px.jpg rename to middleman-core/fixtures/asset-hash-host-app/source/images/100px.jpg diff --git a/middleman-more/fixtures/asset-hash-host-app/source/images/100px.png b/middleman-core/fixtures/asset-hash-host-app/source/images/100px.png similarity index 100% rename from middleman-more/fixtures/asset-hash-host-app/source/images/100px.png rename to middleman-core/fixtures/asset-hash-host-app/source/images/100px.png diff --git a/middleman-more/fixtures/asset-hash-host-app/source/index.html.erb b/middleman-core/fixtures/asset-hash-host-app/source/index.html.erb similarity index 100% rename from middleman-more/fixtures/asset-hash-host-app/source/index.html.erb rename to middleman-core/fixtures/asset-hash-host-app/source/index.html.erb diff --git a/middleman-more/fixtures/asset-hash-host-app/source/layout.erb b/middleman-core/fixtures/asset-hash-host-app/source/layout.erb similarity index 100% rename from middleman-more/fixtures/asset-hash-host-app/source/layout.erb rename to middleman-core/fixtures/asset-hash-host-app/source/layout.erb diff --git a/middleman-more/fixtures/asset-hash-host-app/source/other.html.erb b/middleman-core/fixtures/asset-hash-host-app/source/other.html.erb similarity index 100% rename from middleman-more/fixtures/asset-hash-host-app/source/other.html.erb rename to middleman-core/fixtures/asset-hash-host-app/source/other.html.erb diff --git a/middleman-more/fixtures/asset-hash-host-app/source/stylesheets/site.css.scss b/middleman-core/fixtures/asset-hash-host-app/source/stylesheets/site.css.scss similarity index 100% rename from middleman-more/fixtures/asset-hash-host-app/source/stylesheets/site.css.scss rename to middleman-core/fixtures/asset-hash-host-app/source/stylesheets/site.css.scss diff --git a/middleman-more/fixtures/asset-hash-host-app/source/subdir/index.html.erb b/middleman-core/fixtures/asset-hash-host-app/source/subdir/index.html.erb similarity index 100% rename from middleman-more/fixtures/asset-hash-host-app/source/subdir/index.html.erb rename to middleman-core/fixtures/asset-hash-host-app/source/subdir/index.html.erb diff --git a/middleman-more/fixtures/asset-host-app/config.rb b/middleman-core/fixtures/asset-host-app/config.rb similarity index 100% rename from middleman-more/fixtures/asset-host-app/config.rb rename to middleman-core/fixtures/asset-host-app/config.rb diff --git a/middleman-more/fixtures/asset-host-app/source/.htaccess b/middleman-core/fixtures/asset-host-app/source/.htaccess similarity index 100% rename from middleman-more/fixtures/asset-host-app/source/.htaccess rename to middleman-core/fixtures/asset-host-app/source/.htaccess diff --git a/middleman-more/fixtures/asset-host-app/source/asset_host.html.erb b/middleman-core/fixtures/asset-host-app/source/asset_host.html.erb similarity index 100% rename from middleman-more/fixtures/asset-host-app/source/asset_host.html.erb rename to middleman-core/fixtures/asset-host-app/source/asset_host.html.erb diff --git a/middleman-more/fixtures/asset-host-app/source/images/blank.gif b/middleman-core/fixtures/asset-host-app/source/images/blank.gif similarity index 100% rename from middleman-more/fixtures/asset-host-app/source/images/blank.gif rename to middleman-core/fixtures/asset-host-app/source/images/blank.gif diff --git a/middleman-more/fixtures/asset-host-app/source/stylesheets/asset_host.css.sass b/middleman-core/fixtures/asset-host-app/source/stylesheets/asset_host.css.sass similarity index 100% rename from middleman-more/fixtures/asset-host-app/source/stylesheets/asset_host.css.sass rename to middleman-core/fixtures/asset-host-app/source/stylesheets/asset_host.css.sass diff --git a/middleman-more/fixtures/auto-css-app/config.rb b/middleman-core/fixtures/auto-css-app/config.rb similarity index 100% rename from middleman-more/fixtures/auto-css-app/config.rb rename to middleman-core/fixtures/auto-css-app/config.rb diff --git a/middleman-more/fixtures/auto-css-app/source/auto-css.html.erb b/middleman-core/fixtures/auto-css-app/source/auto-css.html.erb similarity index 100% rename from middleman-more/fixtures/auto-css-app/source/auto-css.html.erb rename to middleman-core/fixtures/auto-css-app/source/auto-css.html.erb diff --git a/middleman-more/fixtures/auto-css-app/source/auto-css/auto-css.html.erb b/middleman-core/fixtures/auto-css-app/source/auto-css/auto-css.html.erb similarity index 100% rename from middleman-more/fixtures/auto-css-app/source/auto-css/auto-css.html.erb rename to middleman-core/fixtures/auto-css-app/source/auto-css/auto-css.html.erb diff --git a/middleman-more/fixtures/auto-css-app/source/auto-css/index.html.erb b/middleman-core/fixtures/auto-css-app/source/auto-css/index.html.erb similarity index 100% rename from middleman-more/fixtures/auto-css-app/source/auto-css/index.html.erb rename to middleman-core/fixtures/auto-css-app/source/auto-css/index.html.erb diff --git a/middleman-more/fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb b/middleman-core/fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb similarity index 100% rename from middleman-more/fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb rename to middleman-core/fixtures/auto-css-app/source/auto-css/sub/auto-css.html.erb diff --git a/middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css.css b/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css.css similarity index 100% rename from middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css.css rename to middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css.css diff --git a/middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css b/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css similarity index 100% rename from middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css rename to middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/auto-css.css diff --git a/middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/index.css b/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/index.css similarity index 100% rename from middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/index.css rename to middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/index.css diff --git a/middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css b/middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css similarity index 100% rename from middleman-more/fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css rename to middleman-core/fixtures/auto-css-app/source/stylesheets/auto-css/sub/auto-css.css diff --git a/middleman-more/fixtures/auto-js-app/config.rb b/middleman-core/fixtures/auto-js-app/config.rb similarity index 100% rename from middleman-more/fixtures/auto-js-app/config.rb rename to middleman-core/fixtures/auto-js-app/config.rb diff --git a/middleman-more/fixtures/auto-js-app/source/auto-js.html.erb b/middleman-core/fixtures/auto-js-app/source/auto-js.html.erb similarity index 100% rename from middleman-more/fixtures/auto-js-app/source/auto-js.html.erb rename to middleman-core/fixtures/auto-js-app/source/auto-js.html.erb diff --git a/middleman-more/fixtures/auto-js-app/source/auto-js/auto-js.html.erb b/middleman-core/fixtures/auto-js-app/source/auto-js/auto-js.html.erb similarity index 100% rename from middleman-more/fixtures/auto-js-app/source/auto-js/auto-js.html.erb rename to middleman-core/fixtures/auto-js-app/source/auto-js/auto-js.html.erb diff --git a/middleman-more/fixtures/auto-js-app/source/auto-js/index.html.erb b/middleman-core/fixtures/auto-js-app/source/auto-js/index.html.erb similarity index 100% rename from middleman-more/fixtures/auto-js-app/source/auto-js/index.html.erb rename to middleman-core/fixtures/auto-js-app/source/auto-js/index.html.erb diff --git a/middleman-more/fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb b/middleman-core/fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb similarity index 100% rename from middleman-more/fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb rename to middleman-core/fixtures/auto-js-app/source/auto-js/sub/auto-js.html.erb diff --git a/middleman-more/fixtures/auto-js-app/source/javascripts/auto-js.js b/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js.js similarity index 100% rename from middleman-more/fixtures/auto-js-app/source/javascripts/auto-js.js rename to middleman-core/fixtures/auto-js-app/source/javascripts/auto-js.js diff --git a/middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js b/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js similarity index 100% rename from middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js rename to middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/auto-js.js diff --git a/middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/index.js b/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/index.js similarity index 100% rename from middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/index.js rename to middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/index.js diff --git a/middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js b/middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js similarity index 100% rename from middleman-more/fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js rename to middleman-core/fixtures/auto-js-app/source/javascripts/auto-js/sub/auto-js.js diff --git a/middleman-more/fixtures/automatic-image-size-app/config.rb b/middleman-core/fixtures/automatic-image-size-app/config.rb similarity index 100% rename from middleman-more/fixtures/automatic-image-size-app/config.rb rename to middleman-core/fixtures/automatic-image-size-app/config.rb diff --git a/middleman-more/fixtures/automatic-image-size-app/source/auto-image-sizes.html.erb b/middleman-core/fixtures/automatic-image-size-app/source/auto-image-sizes.html.erb similarity index 100% rename from middleman-more/fixtures/automatic-image-size-app/source/auto-image-sizes.html.erb rename to middleman-core/fixtures/automatic-image-size-app/source/auto-image-sizes.html.erb diff --git a/middleman-more/fixtures/automatic-image-size-app/source/images/blank.gif b/middleman-core/fixtures/automatic-image-size-app/source/images/blank.gif similarity index 100% rename from middleman-more/fixtures/automatic-image-size-app/source/images/blank.gif rename to middleman-core/fixtures/automatic-image-size-app/source/images/blank.gif diff --git a/middleman-more/fixtures/cache-buster-app/config.rb b/middleman-core/fixtures/cache-buster-app/config.rb similarity index 100% rename from middleman-more/fixtures/cache-buster-app/config.rb rename to middleman-core/fixtures/cache-buster-app/config.rb diff --git a/middleman-more/fixtures/cache-buster-app/source/cache-buster.html.erb b/middleman-core/fixtures/cache-buster-app/source/cache-buster.html.erb similarity index 100% rename from middleman-more/fixtures/cache-buster-app/source/cache-buster.html.erb rename to middleman-core/fixtures/cache-buster-app/source/cache-buster.html.erb diff --git a/middleman-more/fixtures/cache-buster-app/source/images/blank.gif b/middleman-core/fixtures/cache-buster-app/source/images/blank.gif similarity index 100% rename from middleman-more/fixtures/cache-buster-app/source/images/blank.gif rename to middleman-core/fixtures/cache-buster-app/source/images/blank.gif diff --git a/middleman-more/fixtures/cache-buster-app/source/stylesheets/relative_assets.css.sass b/middleman-core/fixtures/cache-buster-app/source/stylesheets/relative_assets.css.sass similarity index 100% rename from middleman-more/fixtures/cache-buster-app/source/stylesheets/relative_assets.css.sass rename to middleman-core/fixtures/cache-buster-app/source/stylesheets/relative_assets.css.sass diff --git a/middleman-more/fixtures/cache-buster-app/source/stylesheets/site.css.sass b/middleman-core/fixtures/cache-buster-app/source/stylesheets/site.css.sass similarity index 100% rename from middleman-more/fixtures/cache-buster-app/source/stylesheets/site.css.sass rename to middleman-core/fixtures/cache-buster-app/source/stylesheets/site.css.sass diff --git a/middleman-more/fixtures/clean-dir-app/config.rb b/middleman-core/fixtures/clean-dir-app/config.rb similarity index 100% rename from middleman-more/fixtures/clean-dir-app/config.rb rename to middleman-core/fixtures/clean-dir-app/config.rb diff --git a/middleman-more/fixtures/clean-dir-app/source/about.html b/middleman-core/fixtures/clean-dir-app/source/about.html similarity index 100% rename from middleman-more/fixtures/clean-dir-app/source/about.html rename to middleman-core/fixtures/clean-dir-app/source/about.html diff --git a/middleman-more/fixtures/coffeescript-app/config.rb b/middleman-core/fixtures/coffeescript-app/config.rb similarity index 100% rename from middleman-more/fixtures/coffeescript-app/config.rb rename to middleman-core/fixtures/coffeescript-app/config.rb diff --git a/middleman-more/fixtures/coffeescript-app/source/inline-coffeescript.html.haml b/middleman-core/fixtures/coffeescript-app/source/inline-coffeescript.html.haml similarity index 100% rename from middleman-more/fixtures/coffeescript-app/source/inline-coffeescript.html.haml rename to middleman-core/fixtures/coffeescript-app/source/inline-coffeescript.html.haml diff --git a/middleman-more/fixtures/coffeescript-app/source/javascripts/broken-coffee.js.coffee b/middleman-core/fixtures/coffeescript-app/source/javascripts/broken-coffee.js.coffee similarity index 100% rename from middleman-more/fixtures/coffeescript-app/source/javascripts/broken-coffee.js.coffee rename to middleman-core/fixtures/coffeescript-app/source/javascripts/broken-coffee.js.coffee diff --git a/middleman-more/fixtures/coffeescript-app/source/javascripts/coffee_test.js.coffee b/middleman-core/fixtures/coffeescript-app/source/javascripts/coffee_test.js.coffee similarity index 100% rename from middleman-more/fixtures/coffeescript-app/source/javascripts/coffee_test.js.coffee rename to middleman-core/fixtures/coffeescript-app/source/javascripts/coffee_test.js.coffee diff --git a/middleman-more/fixtures/compass-sprites-app/config.rb b/middleman-core/fixtures/compass-sprites-app/config.rb similarity index 100% rename from middleman-more/fixtures/compass-sprites-app/config.rb rename to middleman-core/fixtures/compass-sprites-app/config.rb diff --git a/middleman-more/fixtures/compass-sprites-app/source/images/icon/arrow_down.png b/middleman-core/fixtures/compass-sprites-app/source/images/icon/arrow_down.png similarity index 100% rename from middleman-more/fixtures/compass-sprites-app/source/images/icon/arrow_down.png rename to middleman-core/fixtures/compass-sprites-app/source/images/icon/arrow_down.png diff --git a/middleman-more/fixtures/compass-sprites-app/source/images/icon/arrow_left.png b/middleman-core/fixtures/compass-sprites-app/source/images/icon/arrow_left.png similarity index 100% rename from middleman-more/fixtures/compass-sprites-app/source/images/icon/arrow_left.png rename to middleman-core/fixtures/compass-sprites-app/source/images/icon/arrow_left.png diff --git a/middleman-more/fixtures/compass-sprites-app/source/images/icon/arrow_right.png b/middleman-core/fixtures/compass-sprites-app/source/images/icon/arrow_right.png similarity index 100% rename from middleman-more/fixtures/compass-sprites-app/source/images/icon/arrow_right.png rename to middleman-core/fixtures/compass-sprites-app/source/images/icon/arrow_right.png diff --git a/middleman-more/fixtures/compass-sprites-app/source/images/icon/arrow_up.png b/middleman-core/fixtures/compass-sprites-app/source/images/icon/arrow_up.png similarity index 100% rename from middleman-more/fixtures/compass-sprites-app/source/images/icon/arrow_up.png rename to middleman-core/fixtures/compass-sprites-app/source/images/icon/arrow_up.png diff --git a/middleman-more/fixtures/compass-sprites-app/source/stylesheets/site.css.scss b/middleman-core/fixtures/compass-sprites-app/source/stylesheets/site.css.scss similarity index 100% rename from middleman-more/fixtures/compass-sprites-app/source/stylesheets/site.css.scss rename to middleman-core/fixtures/compass-sprites-app/source/stylesheets/site.css.scss diff --git a/middleman-more/fixtures/content-for-app/config.rb b/middleman-core/fixtures/content-for-app/config.rb similarity index 100% rename from middleman-more/fixtures/content-for-app/config.rb rename to middleman-core/fixtures/content-for-app/config.rb diff --git a/middleman-more/fixtures/content-for-app/source/content_for_erb.html.erb b/middleman-core/fixtures/content-for-app/source/content_for_erb.html.erb similarity index 100% rename from middleman-more/fixtures/content-for-app/source/content_for_erb.html.erb rename to middleman-core/fixtures/content-for-app/source/content_for_erb.html.erb diff --git a/middleman-more/fixtures/content-for-app/source/content_for_haml.html.haml b/middleman-core/fixtures/content-for-app/source/content_for_haml.html.haml similarity index 100% rename from middleman-more/fixtures/content-for-app/source/content_for_haml.html.haml rename to middleman-core/fixtures/content-for-app/source/content_for_haml.html.haml diff --git a/middleman-more/fixtures/content-for-app/source/content_for_slim.html.slim b/middleman-core/fixtures/content-for-app/source/content_for_slim.html.slim similarity index 100% rename from middleman-more/fixtures/content-for-app/source/content_for_slim.html.slim rename to middleman-core/fixtures/content-for-app/source/content_for_slim.html.slim diff --git a/middleman-more/fixtures/content-for-app/source/layouts/content_for.erb b/middleman-core/fixtures/content-for-app/source/layouts/content_for.erb similarity index 100% rename from middleman-more/fixtures/content-for-app/source/layouts/content_for.erb rename to middleman-core/fixtures/content-for-app/source/layouts/content_for.erb diff --git a/middleman-more/fixtures/default-partials-dir-app/source/_partial.html.erb b/middleman-core/fixtures/default-partials-dir-app/source/_partial.html.erb similarity index 100% rename from middleman-more/fixtures/default-partials-dir-app/source/_partial.html.erb rename to middleman-core/fixtures/default-partials-dir-app/source/_partial.html.erb diff --git a/middleman-more/fixtures/default-partials-dir-app/source/index.html.erb b/middleman-core/fixtures/default-partials-dir-app/source/index.html.erb similarity index 100% rename from middleman-more/fixtures/default-partials-dir-app/source/index.html.erb rename to middleman-core/fixtures/default-partials-dir-app/source/index.html.erb diff --git a/middleman-core/fixtures/different-engine-layout/source/index.html.str b/middleman-core/fixtures/different-engine-layout/source/index.html.str new file mode 100755 index 00000000..f47aba51 --- /dev/null +++ b/middleman-core/fixtures/different-engine-layout/source/index.html.str @@ -0,0 +1 @@ +

Welcome

\ No newline at end of file diff --git a/middleman-more/fixtures/different-engine-partial/config.rb b/middleman-core/fixtures/different-engine-partial/config.rb similarity index 100% rename from middleman-more/fixtures/different-engine-partial/config.rb rename to middleman-core/fixtures/different-engine-partial/config.rb diff --git a/middleman-more/fixtures/different-engine-partial/source/index.html.erb b/middleman-core/fixtures/different-engine-partial/source/index.html.erb similarity index 100% rename from middleman-more/fixtures/different-engine-partial/source/index.html.erb rename to middleman-core/fixtures/different-engine-partial/source/index.html.erb diff --git a/middleman-more/fixtures/different-engine-partial/source/layouts/layout.erb b/middleman-core/fixtures/different-engine-partial/source/layouts/layout.erb similarity index 100% rename from middleman-more/fixtures/different-engine-partial/source/layouts/layout.erb rename to middleman-core/fixtures/different-engine-partial/source/layouts/layout.erb diff --git a/middleman-more/fixtures/different-engine-partial/source/shared/_footer.str b/middleman-core/fixtures/different-engine-partial/source/shared/_footer.str similarity index 100% rename from middleman-more/fixtures/different-engine-partial/source/shared/_footer.str rename to middleman-core/fixtures/different-engine-partial/source/shared/_footer.str diff --git a/middleman-more/fixtures/different-engine-partial/source/shared/_header.erb b/middleman-core/fixtures/different-engine-partial/source/shared/_header.erb similarity index 100% rename from middleman-more/fixtures/different-engine-partial/source/shared/_header.erb rename to middleman-core/fixtures/different-engine-partial/source/shared/_header.erb diff --git a/middleman-more/fixtures/fonts-app/config.rb b/middleman-core/fixtures/fonts-app/config.rb similarity index 100% rename from middleman-more/fixtures/fonts-app/config.rb rename to middleman-core/fixtures/fonts-app/config.rb diff --git a/middleman-more/fixtures/fonts-app/source/fonts/StMarie-Thin.otf b/middleman-core/fixtures/fonts-app/source/fonts/StMarie-Thin.otf similarity index 100% rename from middleman-more/fixtures/fonts-app/source/fonts/StMarie-Thin.otf rename to middleman-core/fixtures/fonts-app/source/fonts/StMarie-Thin.otf diff --git a/middleman-more/fixtures/fonts-app/source/fonts/blank/blank.otf b/middleman-core/fixtures/fonts-app/source/fonts/blank/blank.otf similarity index 100% rename from middleman-more/fixtures/fonts-app/source/fonts/blank/blank.otf rename to middleman-core/fixtures/fonts-app/source/fonts/blank/blank.otf diff --git a/middleman-more/fixtures/fonts-app/source/stylesheets/fonts.css.sass b/middleman-core/fixtures/fonts-app/source/stylesheets/fonts.css.sass similarity index 100% rename from middleman-more/fixtures/fonts-app/source/stylesheets/fonts.css.sass rename to middleman-core/fixtures/fonts-app/source/stylesheets/fonts.css.sass diff --git a/middleman-more/fixtures/gzip-app/config.rb b/middleman-core/fixtures/gzip-app/config.rb similarity index 100% rename from middleman-more/fixtures/gzip-app/config.rb rename to middleman-core/fixtures/gzip-app/config.rb diff --git a/middleman-more/fixtures/gzip-app/source/index.html b/middleman-core/fixtures/gzip-app/source/index.html similarity index 100% rename from middleman-more/fixtures/gzip-app/source/index.html rename to middleman-core/fixtures/gzip-app/source/index.html diff --git a/middleman-more/fixtures/gzip-app/source/javascripts/test.js b/middleman-core/fixtures/gzip-app/source/javascripts/test.js similarity index 100% rename from middleman-more/fixtures/gzip-app/source/javascripts/test.js rename to middleman-core/fixtures/gzip-app/source/javascripts/test.js diff --git a/middleman-more/fixtures/gzip-app/source/stylesheets/test.css b/middleman-core/fixtures/gzip-app/source/stylesheets/test.css similarity index 100% rename from middleman-more/fixtures/gzip-app/source/stylesheets/test.css rename to middleman-core/fixtures/gzip-app/source/stylesheets/test.css diff --git a/middleman-more/fixtures/i18n-alt-root-app/locales/en.yml b/middleman-core/fixtures/i18n-alt-root-app/locales/en.yml similarity index 100% rename from middleman-more/fixtures/i18n-alt-root-app/locales/en.yml rename to middleman-core/fixtures/i18n-alt-root-app/locales/en.yml diff --git a/middleman-more/fixtures/i18n-alt-root-app/locales/es.yml b/middleman-core/fixtures/i18n-alt-root-app/locales/es.yml similarity index 100% rename from middleman-more/fixtures/i18n-alt-root-app/locales/es.yml rename to middleman-core/fixtures/i18n-alt-root-app/locales/es.yml diff --git a/middleman-more/fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb b/middleman-core/fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb similarity index 100% rename from middleman-more/fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb rename to middleman-core/fixtures/i18n-alt-root-app/source/lang_data/hello.html.erb diff --git a/middleman-more/fixtures/i18n-alt-root-app/source/lang_data/index.html.erb b/middleman-core/fixtures/i18n-alt-root-app/source/lang_data/index.html.erb similarity index 100% rename from middleman-more/fixtures/i18n-alt-root-app/source/lang_data/index.html.erb rename to middleman-core/fixtures/i18n-alt-root-app/source/lang_data/index.html.erb diff --git a/middleman-more/fixtures/i18n-alt-root-app/source/layout.erb b/middleman-core/fixtures/i18n-alt-root-app/source/layout.erb similarity index 100% rename from middleman-more/fixtures/i18n-alt-root-app/source/layout.erb rename to middleman-core/fixtures/i18n-alt-root-app/source/layout.erb diff --git a/middleman-more/fixtures/i18n-default-app/locales/en.yml b/middleman-core/fixtures/i18n-default-app/locales/en.yml similarity index 100% rename from middleman-more/fixtures/i18n-default-app/locales/en.yml rename to middleman-core/fixtures/i18n-default-app/locales/en.yml diff --git a/middleman-more/fixtures/i18n-default-app/locales/es.yml b/middleman-core/fixtures/i18n-default-app/locales/es.yml similarity index 100% rename from middleman-more/fixtures/i18n-default-app/locales/es.yml rename to middleman-core/fixtures/i18n-default-app/locales/es.yml diff --git a/middleman-more/fixtures/i18n-default-app/source/localizable/index.html.erb b/middleman-core/fixtures/i18n-default-app/source/localizable/index.html.erb similarity index 100% rename from middleman-more/fixtures/i18n-default-app/source/localizable/index.html.erb rename to middleman-core/fixtures/i18n-default-app/source/localizable/index.html.erb diff --git a/middleman-more/fixtures/i18n-force-locale/config.rb b/middleman-core/fixtures/i18n-force-locale/config.rb similarity index 100% rename from middleman-more/fixtures/i18n-force-locale/config.rb rename to middleman-core/fixtures/i18n-force-locale/config.rb diff --git a/middleman-more/fixtures/i18n-force-locale/locales/en.yml b/middleman-core/fixtures/i18n-force-locale/locales/en.yml similarity index 100% rename from middleman-more/fixtures/i18n-force-locale/locales/en.yml rename to middleman-core/fixtures/i18n-force-locale/locales/en.yml diff --git a/middleman-more/fixtures/i18n-force-locale/locales/es.yml b/middleman-core/fixtures/i18n-force-locale/locales/es.yml similarity index 100% rename from middleman-more/fixtures/i18n-force-locale/locales/es.yml rename to middleman-core/fixtures/i18n-force-locale/locales/es.yml diff --git a/middleman-more/fixtures/i18n-force-locale/locales/fr.yml b/middleman-core/fixtures/i18n-force-locale/locales/fr.yml similarity index 100% rename from middleman-more/fixtures/i18n-force-locale/locales/fr.yml rename to middleman-core/fixtures/i18n-force-locale/locales/fr.yml diff --git a/middleman-more/fixtures/i18n-force-locale/source/index.haml b/middleman-core/fixtures/i18n-force-locale/source/index.haml similarity index 100% rename from middleman-more/fixtures/i18n-force-locale/source/index.haml rename to middleman-core/fixtures/i18n-force-locale/source/index.haml diff --git a/middleman-more/fixtures/i18n-test-app/locales/en.yml b/middleman-core/fixtures/i18n-test-app/locales/en.yml similarity index 100% rename from middleman-more/fixtures/i18n-test-app/locales/en.yml rename to middleman-core/fixtures/i18n-test-app/locales/en.yml diff --git a/middleman-more/fixtures/i18n-test-app/locales/es.yml b/middleman-core/fixtures/i18n-test-app/locales/es.yml similarity index 100% rename from middleman-more/fixtures/i18n-test-app/locales/es.yml rename to middleman-core/fixtures/i18n-test-app/locales/es.yml diff --git a/middleman-more/fixtures/i18n-test-app/source/CNAME b/middleman-core/fixtures/i18n-test-app/source/CNAME similarity index 100% rename from middleman-more/fixtures/i18n-test-app/source/CNAME rename to middleman-core/fixtures/i18n-test-app/source/CNAME diff --git a/middleman-more/fixtures/i18n-test-app/source/layout.erb b/middleman-core/fixtures/i18n-test-app/source/layout.erb similarity index 100% rename from middleman-more/fixtures/i18n-test-app/source/layout.erb rename to middleman-core/fixtures/i18n-test-app/source/layout.erb diff --git a/middleman-more/fixtures/i18n-test-app/source/localizable/hello.html.erb b/middleman-core/fixtures/i18n-test-app/source/localizable/hello.html.erb similarity index 100% rename from middleman-more/fixtures/i18n-test-app/source/localizable/hello.html.erb rename to middleman-core/fixtures/i18n-test-app/source/localizable/hello.html.erb diff --git a/middleman-more/fixtures/i18n-test-app/source/localizable/index.html.erb b/middleman-core/fixtures/i18n-test-app/source/localizable/index.html.erb similarity index 100% rename from middleman-more/fixtures/i18n-test-app/source/localizable/index.html.erb rename to middleman-core/fixtures/i18n-test-app/source/localizable/index.html.erb diff --git a/middleman-more/fixtures/i18n-test-app/source/morning.en.html.erb b/middleman-core/fixtures/i18n-test-app/source/morning.en.html.erb similarity index 100% rename from middleman-more/fixtures/i18n-test-app/source/morning.en.html.erb rename to middleman-core/fixtures/i18n-test-app/source/morning.en.html.erb diff --git a/middleman-more/fixtures/i18n-test-app/source/morning.es.html.erb b/middleman-core/fixtures/i18n-test-app/source/morning.es.html.erb similarity index 100% rename from middleman-more/fixtures/i18n-test-app/source/morning.es.html.erb rename to middleman-core/fixtures/i18n-test-app/source/morning.es.html.erb diff --git a/middleman-more/fixtures/i18n-test-app/source/password.txt b/middleman-core/fixtures/i18n-test-app/source/password.txt similarity index 100% rename from middleman-more/fixtures/i18n-test-app/source/password.txt rename to middleman-core/fixtures/i18n-test-app/source/password.txt diff --git a/middleman-more/fixtures/i18n-test-app/source/stylesheets/site.css b/middleman-core/fixtures/i18n-test-app/source/stylesheets/site.css similarity index 100% rename from middleman-more/fixtures/i18n-test-app/source/stylesheets/site.css rename to middleman-core/fixtures/i18n-test-app/source/stylesheets/site.css diff --git a/middleman-core/fixtures/indexable-app/config.rb b/middleman-core/fixtures/indexable-app/config.rb index e69de29b..54b79b5c 100644 --- a/middleman-core/fixtures/indexable-app/config.rb +++ b/middleman-core/fixtures/indexable-app/config.rb @@ -0,0 +1,4 @@ +activate :directory_indexes +page "/leave_me_alone.html", :directory_index => false + +page "/wildcard*", :directory_index => false diff --git a/middleman-more/fixtures/indexable-app/source/.htpasswd b/middleman-core/fixtures/indexable-app/source/.htpasswd similarity index 100% rename from middleman-more/fixtures/indexable-app/source/.htpasswd rename to middleman-core/fixtures/indexable-app/source/.htpasswd diff --git a/middleman-more/fixtures/implied-extensions-app/config.rb b/middleman-core/fixtures/liquid-app/config.rb similarity index 100% rename from middleman-more/fixtures/implied-extensions-app/config.rb rename to middleman-core/fixtures/liquid-app/config.rb diff --git a/middleman-more/fixtures/liquid-app/data/test.yml b/middleman-core/fixtures/liquid-app/data/test.yml similarity index 100% rename from middleman-more/fixtures/liquid-app/data/test.yml rename to middleman-core/fixtures/liquid-app/data/test.yml diff --git a/middleman-more/fixtures/liquid-app/data/test2.json b/middleman-core/fixtures/liquid-app/data/test2.json similarity index 100% rename from middleman-more/fixtures/liquid-app/data/test2.json rename to middleman-core/fixtures/liquid-app/data/test2.json diff --git a/middleman-more/fixtures/liquid-app/source/_liquid_partial.liquid b/middleman-core/fixtures/liquid-app/source/_liquid_partial.liquid similarity index 100% rename from middleman-more/fixtures/liquid-app/source/_liquid_partial.liquid rename to middleman-core/fixtures/liquid-app/source/_liquid_partial.liquid diff --git a/middleman-more/fixtures/liquid-app/source/data2.html.liquid b/middleman-core/fixtures/liquid-app/source/data2.html.liquid similarity index 100% rename from middleman-more/fixtures/liquid-app/source/data2.html.liquid rename to middleman-core/fixtures/liquid-app/source/data2.html.liquid diff --git a/middleman-more/fixtures/liquid-app/source/liquid_master.html.liquid b/middleman-core/fixtures/liquid-app/source/liquid_master.html.liquid similarity index 100% rename from middleman-more/fixtures/liquid-app/source/liquid_master.html.liquid rename to middleman-core/fixtures/liquid-app/source/liquid_master.html.liquid diff --git a/middleman-more/fixtures/lorem-app/config.rb b/middleman-core/fixtures/lorem-app/config.rb similarity index 100% rename from middleman-more/fixtures/lorem-app/config.rb rename to middleman-core/fixtures/lorem-app/config.rb diff --git a/middleman-more/fixtures/lorem-app/source/lorem.html.erb b/middleman-core/fixtures/lorem-app/source/lorem.html.erb similarity index 100% rename from middleman-more/fixtures/lorem-app/source/lorem.html.erb rename to middleman-core/fixtures/lorem-app/source/lorem.html.erb diff --git a/middleman-more/fixtures/markdown-app/config.rb b/middleman-core/fixtures/markdown-app/config.rb similarity index 100% rename from middleman-more/fixtures/markdown-app/config.rb rename to middleman-core/fixtures/markdown-app/config.rb diff --git a/middleman-more/fixtures/markdown-app/source/autolink.html.markdown b/middleman-core/fixtures/markdown-app/source/autolink.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-app/source/autolink.html.markdown rename to middleman-core/fixtures/markdown-app/source/autolink.html.markdown diff --git a/middleman-more/fixtures/markdown-app/source/fenced_code_blocks.html.markdown b/middleman-core/fixtures/markdown-app/source/fenced_code_blocks.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-app/source/fenced_code_blocks.html.markdown rename to middleman-core/fixtures/markdown-app/source/fenced_code_blocks.html.markdown diff --git a/middleman-more/fixtures/markdown-app/source/hard_wrap.html.markdown b/middleman-core/fixtures/markdown-app/source/hard_wrap.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-app/source/hard_wrap.html.markdown rename to middleman-core/fixtures/markdown-app/source/hard_wrap.html.markdown diff --git a/middleman-more/fixtures/markdown-app/source/images/blank.gif b/middleman-core/fixtures/markdown-app/source/images/blank.gif similarity index 100% rename from middleman-more/fixtures/markdown-app/source/images/blank.gif rename to middleman-core/fixtures/markdown-app/source/images/blank.gif diff --git a/middleman-more/fixtures/markdown-app/source/index.html.markdown b/middleman-core/fixtures/markdown-app/source/index.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-app/source/index.html.markdown rename to middleman-core/fixtures/markdown-app/source/index.html.markdown diff --git a/middleman-more/fixtures/markdown-app/source/no_intra_emphasis.html.markdown b/middleman-core/fixtures/markdown-app/source/no_intra_emphasis.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-app/source/no_intra_emphasis.html.markdown rename to middleman-core/fixtures/markdown-app/source/no_intra_emphasis.html.markdown diff --git a/middleman-more/fixtures/markdown-app/source/smarty_pants.html.markdown b/middleman-core/fixtures/markdown-app/source/smarty_pants.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-app/source/smarty_pants.html.markdown rename to middleman-core/fixtures/markdown-app/source/smarty_pants.html.markdown diff --git a/middleman-more/fixtures/markdown-app/source/space_after_headers.html.markdown b/middleman-core/fixtures/markdown-app/source/space_after_headers.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-app/source/space_after_headers.html.markdown rename to middleman-core/fixtures/markdown-app/source/space_after_headers.html.markdown diff --git a/middleman-more/fixtures/markdown-app/source/strikethrough.html.markdown b/middleman-core/fixtures/markdown-app/source/strikethrough.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-app/source/strikethrough.html.markdown rename to middleman-core/fixtures/markdown-app/source/strikethrough.html.markdown diff --git a/middleman-more/fixtures/markdown-app/source/superscript.html.markdown b/middleman-core/fixtures/markdown-app/source/superscript.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-app/source/superscript.html.markdown rename to middleman-core/fixtures/markdown-app/source/superscript.html.markdown diff --git a/middleman-more/fixtures/markdown-app/source/tables.html.markdown b/middleman-core/fixtures/markdown-app/source/tables.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-app/source/tables.html.markdown rename to middleman-core/fixtures/markdown-app/source/tables.html.markdown diff --git a/middleman-more/fixtures/markdown-app/source/with_toc_data.html.markdown b/middleman-core/fixtures/markdown-app/source/with_toc_data.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-app/source/with_toc_data.html.markdown rename to middleman-core/fixtures/markdown-app/source/with_toc_data.html.markdown diff --git a/middleman-more/fixtures/markdown-frontmatter-options-app/config.rb b/middleman-core/fixtures/markdown-frontmatter-options-app/config.rb similarity index 100% rename from middleman-more/fixtures/markdown-frontmatter-options-app/config.rb rename to middleman-core/fixtures/markdown-frontmatter-options-app/config.rb diff --git a/middleman-more/fixtures/markdown-frontmatter-options-app/source/smarty_pants-default.html.markdown b/middleman-core/fixtures/markdown-frontmatter-options-app/source/smarty_pants-default.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-frontmatter-options-app/source/smarty_pants-default.html.markdown rename to middleman-core/fixtures/markdown-frontmatter-options-app/source/smarty_pants-default.html.markdown diff --git a/middleman-more/fixtures/markdown-frontmatter-options-app/source/smarty_pants-off.html.markdown b/middleman-core/fixtures/markdown-frontmatter-options-app/source/smarty_pants-off.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-frontmatter-options-app/source/smarty_pants-off.html.markdown rename to middleman-core/fixtures/markdown-frontmatter-options-app/source/smarty_pants-off.html.markdown diff --git a/middleman-more/fixtures/markdown-frontmatter-options-app/source/smarty_pants-on.html.markdown b/middleman-core/fixtures/markdown-frontmatter-options-app/source/smarty_pants-on.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-frontmatter-options-app/source/smarty_pants-on.html.markdown rename to middleman-core/fixtures/markdown-frontmatter-options-app/source/smarty_pants-on.html.markdown diff --git a/middleman-more/fixtures/markdown-frontmatter-options-app/source/tables-default.html.markdown b/middleman-core/fixtures/markdown-frontmatter-options-app/source/tables-default.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-frontmatter-options-app/source/tables-default.html.markdown rename to middleman-core/fixtures/markdown-frontmatter-options-app/source/tables-default.html.markdown diff --git a/middleman-more/fixtures/markdown-frontmatter-options-app/source/tables-off.html.markdown b/middleman-core/fixtures/markdown-frontmatter-options-app/source/tables-off.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-frontmatter-options-app/source/tables-off.html.markdown rename to middleman-core/fixtures/markdown-frontmatter-options-app/source/tables-off.html.markdown diff --git a/middleman-more/fixtures/markdown-frontmatter-options-app/source/tables-on.html.markdown b/middleman-core/fixtures/markdown-frontmatter-options-app/source/tables-on.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-frontmatter-options-app/source/tables-on.html.markdown rename to middleman-core/fixtures/markdown-frontmatter-options-app/source/tables-on.html.markdown diff --git a/middleman-more/fixtures/instance-vars-app/config.rb b/middleman-core/fixtures/markdown-in-haml-app/config.rb similarity index 100% rename from middleman-more/fixtures/instance-vars-app/config.rb rename to middleman-core/fixtures/markdown-in-haml-app/config.rb diff --git a/middleman-more/fixtures/markdown-in-haml-app/source/images/blank.gif b/middleman-core/fixtures/markdown-in-haml-app/source/images/blank.gif similarity index 100% rename from middleman-more/fixtures/markdown-in-haml-app/source/images/blank.gif rename to middleman-core/fixtures/markdown-in-haml-app/source/images/blank.gif diff --git a/middleman-more/fixtures/markdown-in-haml-app/source/link_target.html.markdown b/middleman-core/fixtures/markdown-in-haml-app/source/link_target.html.markdown similarity index 100% rename from middleman-more/fixtures/markdown-in-haml-app/source/link_target.html.markdown rename to middleman-core/fixtures/markdown-in-haml-app/source/link_target.html.markdown diff --git a/middleman-more/fixtures/minify-css-app/source/inline-css.html.haml b/middleman-core/fixtures/minify-css-app/source/inline-css.html.haml similarity index 100% rename from middleman-more/fixtures/minify-css-app/source/inline-css.html.haml rename to middleman-core/fixtures/minify-css-app/source/inline-css.html.haml diff --git a/middleman-more/fixtures/minify-css-app/source/more-css/site.css b/middleman-core/fixtures/minify-css-app/source/more-css/site.css similarity index 100% rename from middleman-more/fixtures/minify-css-app/source/more-css/site.css rename to middleman-core/fixtures/minify-css-app/source/more-css/site.css diff --git a/middleman-more/fixtures/minify-css-app/source/stylesheets/report.css b/middleman-core/fixtures/minify-css-app/source/stylesheets/report.css similarity index 100% rename from middleman-more/fixtures/minify-css-app/source/stylesheets/report.css rename to middleman-core/fixtures/minify-css-app/source/stylesheets/report.css diff --git a/middleman-more/fixtures/minify-css-app/source/stylesheets/site.css.sass b/middleman-core/fixtures/minify-css-app/source/stylesheets/site.css.sass similarity index 100% rename from middleman-more/fixtures/minify-css-app/source/stylesheets/site.css.sass rename to middleman-core/fixtures/minify-css-app/source/stylesheets/site.css.sass diff --git a/middleman-more/fixtures/liquid-app/config.rb b/middleman-core/fixtures/minify-js-app/config.rb similarity index 100% rename from middleman-more/fixtures/liquid-app/config.rb rename to middleman-core/fixtures/minify-js-app/config.rb diff --git a/middleman-more/fixtures/minify-js-app/source/inline-coffeescript.html.haml b/middleman-core/fixtures/minify-js-app/source/inline-coffeescript.html.haml similarity index 100% rename from middleman-more/fixtures/minify-js-app/source/inline-coffeescript.html.haml rename to middleman-core/fixtures/minify-js-app/source/inline-coffeescript.html.haml diff --git a/middleman-more/fixtures/minify-js-app/source/inline-js.html.haml b/middleman-core/fixtures/minify-js-app/source/inline-js.html.haml similarity index 100% rename from middleman-more/fixtures/minify-js-app/source/inline-js.html.haml rename to middleman-core/fixtures/minify-js-app/source/inline-js.html.haml diff --git a/middleman-more/fixtures/minify-js-app/source/javascripts/coffee_test.js.coffee b/middleman-core/fixtures/minify-js-app/source/javascripts/coffee_test.js.coffee similarity index 100% rename from middleman-more/fixtures/minify-js-app/source/javascripts/coffee_test.js.coffee rename to middleman-core/fixtures/minify-js-app/source/javascripts/coffee_test.js.coffee diff --git a/middleman-more/fixtures/minify-js-app/source/javascripts/js_test.js b/middleman-core/fixtures/minify-js-app/source/javascripts/js_test.js similarity index 100% rename from middleman-more/fixtures/minify-js-app/source/javascripts/js_test.js rename to middleman-core/fixtures/minify-js-app/source/javascripts/js_test.js diff --git a/middleman-more/fixtures/minify-js-app/source/more-js/other.js b/middleman-core/fixtures/minify-js-app/source/more-js/other.js similarity index 100% rename from middleman-more/fixtures/minify-js-app/source/more-js/other.js rename to middleman-core/fixtures/minify-js-app/source/more-js/other.js diff --git a/middleman-more/fixtures/extensionless-text-files-app/config.rb b/middleman-core/fixtures/more-extensionless-text-files-app/config.rb similarity index 100% rename from middleman-more/fixtures/extensionless-text-files-app/config.rb rename to middleman-core/fixtures/more-extensionless-text-files-app/config.rb diff --git a/middleman-more/fixtures/extensionless-text-files-app/source/CNAME b/middleman-core/fixtures/more-extensionless-text-files-app/source/CNAME similarity index 100% rename from middleman-more/fixtures/extensionless-text-files-app/source/CNAME rename to middleman-core/fixtures/more-extensionless-text-files-app/source/CNAME diff --git a/middleman-more/fixtures/extensionless-text-files-app/source/LICENSE b/middleman-core/fixtures/more-extensionless-text-files-app/source/LICENSE similarity index 100% rename from middleman-more/fixtures/extensionless-text-files-app/source/LICENSE rename to middleman-core/fixtures/more-extensionless-text-files-app/source/LICENSE diff --git a/middleman-more/fixtures/extensionless-text-files-app/source/README b/middleman-core/fixtures/more-extensionless-text-files-app/source/README similarity index 100% rename from middleman-more/fixtures/extensionless-text-files-app/source/README rename to middleman-core/fixtures/more-extensionless-text-files-app/source/README diff --git a/middleman-more/fixtures/extensionless-text-files-app/source/index.html b/middleman-core/fixtures/more-extensionless-text-files-app/source/index.html similarity index 100% rename from middleman-more/fixtures/extensionless-text-files-app/source/index.html rename to middleman-core/fixtures/more-extensionless-text-files-app/source/index.html diff --git a/middleman-more/fixtures/frontmatter-settings-app/config.rb b/middleman-core/fixtures/more-frontmatter-settings-app/config.rb similarity index 100% rename from middleman-more/fixtures/frontmatter-settings-app/config.rb rename to middleman-core/fixtures/more-frontmatter-settings-app/config.rb diff --git a/middleman-more/fixtures/frontmatter-settings-app/source/alternate_layout.html.erb b/middleman-core/fixtures/more-frontmatter-settings-app/source/alternate_layout.html.erb similarity index 100% rename from middleman-more/fixtures/frontmatter-settings-app/source/alternate_layout.html.erb rename to middleman-core/fixtures/more-frontmatter-settings-app/source/alternate_layout.html.erb diff --git a/middleman-more/fixtures/frontmatter-settings-app/source/ignored.html.erb b/middleman-core/fixtures/more-frontmatter-settings-app/source/ignored.html.erb similarity index 100% rename from middleman-more/fixtures/frontmatter-settings-app/source/ignored.html.erb rename to middleman-core/fixtures/more-frontmatter-settings-app/source/ignored.html.erb diff --git a/middleman-more/fixtures/frontmatter-settings-app/source/layouts/alternate.erb b/middleman-core/fixtures/more-frontmatter-settings-app/source/layouts/alternate.erb similarity index 100% rename from middleman-more/fixtures/frontmatter-settings-app/source/layouts/alternate.erb rename to middleman-core/fixtures/more-frontmatter-settings-app/source/layouts/alternate.erb diff --git a/middleman-more/fixtures/frontmatter-settings-app/source/no_index.html.erb b/middleman-core/fixtures/more-frontmatter-settings-app/source/no_index.html.erb similarity index 100% rename from middleman-more/fixtures/frontmatter-settings-app/source/no_index.html.erb rename to middleman-core/fixtures/more-frontmatter-settings-app/source/no_index.html.erb diff --git a/middleman-more/fixtures/ignore-app/source/about.html.erb b/middleman-core/fixtures/more-ignore-app/source/about.html.erb similarity index 100% rename from middleman-more/fixtures/ignore-app/source/about.html.erb rename to middleman-core/fixtures/more-ignore-app/source/about.html.erb diff --git a/middleman-more/fixtures/ignore-app/source/images/icon/messages.png b/middleman-core/fixtures/more-ignore-app/source/images/icon/messages.png similarity index 100% rename from middleman-more/fixtures/ignore-app/source/images/icon/messages.png rename to middleman-core/fixtures/more-ignore-app/source/images/icon/messages.png diff --git a/middleman-more/fixtures/ignore-app/source/images/pic.png b/middleman-core/fixtures/more-ignore-app/source/images/pic.png similarity index 100% rename from middleman-more/fixtures/ignore-app/source/images/pic.png rename to middleman-core/fixtures/more-ignore-app/source/images/pic.png diff --git a/middleman-more/fixtures/ignore-app/source/images/portrait.jpg b/middleman-core/fixtures/more-ignore-app/source/images/portrait.jpg similarity index 100% rename from middleman-more/fixtures/ignore-app/source/images/portrait.jpg rename to middleman-core/fixtures/more-ignore-app/source/images/portrait.jpg diff --git a/middleman-more/fixtures/ignore-app/source/index.html.erb b/middleman-core/fixtures/more-ignore-app/source/index.html.erb similarity index 100% rename from middleman-more/fixtures/ignore-app/source/index.html.erb rename to middleman-core/fixtures/more-ignore-app/source/index.html.erb diff --git a/middleman-more/fixtures/ignore-app/source/plain.html b/middleman-core/fixtures/more-ignore-app/source/plain.html similarity index 100% rename from middleman-more/fixtures/ignore-app/source/plain.html rename to middleman-core/fixtures/more-ignore-app/source/plain.html diff --git a/middleman-more/fixtures/ignore-app/source/reports/another.html b/middleman-core/fixtures/more-ignore-app/source/reports/another.html similarity index 100% rename from middleman-more/fixtures/ignore-app/source/reports/another.html rename to middleman-core/fixtures/more-ignore-app/source/reports/another.html diff --git a/middleman-more/fixtures/ignore-app/source/reports/index.html b/middleman-core/fixtures/more-ignore-app/source/reports/index.html similarity index 100% rename from middleman-more/fixtures/ignore-app/source/reports/index.html rename to middleman-core/fixtures/more-ignore-app/source/reports/index.html diff --git a/middleman-more/fixtures/markdown-in-haml-app/config.rb b/middleman-core/fixtures/more-implied-extensions-app/config.rb similarity index 100% rename from middleman-more/fixtures/markdown-in-haml-app/config.rb rename to middleman-core/fixtures/more-implied-extensions-app/config.rb diff --git a/middleman-more/fixtures/implied-extensions-app/source/javascripts/app.coffee b/middleman-core/fixtures/more-implied-extensions-app/source/javascripts/app.coffee similarity index 100% rename from middleman-more/fixtures/implied-extensions-app/source/javascripts/app.coffee rename to middleman-core/fixtures/more-implied-extensions-app/source/javascripts/app.coffee diff --git a/middleman-more/fixtures/implied-extensions-app/source/stylesheets/style.scss b/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style.scss similarity index 100% rename from middleman-more/fixtures/implied-extensions-app/source/stylesheets/style.scss rename to middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style.scss diff --git a/middleman-more/fixtures/implied-extensions-app/source/stylesheets/style2.sass b/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style2.sass similarity index 100% rename from middleman-more/fixtures/implied-extensions-app/source/stylesheets/style2.sass rename to middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style2.sass diff --git a/middleman-more/fixtures/implied-extensions-app/source/stylesheets/style3.less b/middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style3.less similarity index 100% rename from middleman-more/fixtures/implied-extensions-app/source/stylesheets/style3.less rename to middleman-core/fixtures/more-implied-extensions-app/source/stylesheets/style3.less diff --git a/middleman-more/fixtures/implied-extensions-app/source/test.haml b/middleman-core/fixtures/more-implied-extensions-app/source/test.haml similarity index 100% rename from middleman-more/fixtures/implied-extensions-app/source/test.haml rename to middleman-core/fixtures/more-implied-extensions-app/source/test.haml diff --git a/middleman-more/fixtures/implied-extensions-app/source/test2.markdown b/middleman-core/fixtures/more-implied-extensions-app/source/test2.markdown similarity index 100% rename from middleman-more/fixtures/implied-extensions-app/source/test2.markdown rename to middleman-core/fixtures/more-implied-extensions-app/source/test2.markdown diff --git a/middleman-more/fixtures/implied-extensions-app/source/test3.slim b/middleman-core/fixtures/more-implied-extensions-app/source/test3.slim similarity index 100% rename from middleman-more/fixtures/implied-extensions-app/source/test3.slim rename to middleman-core/fixtures/more-implied-extensions-app/source/test3.slim diff --git a/middleman-more/fixtures/implied-extensions-app/source/test4.liquid b/middleman-core/fixtures/more-implied-extensions-app/source/test4.liquid similarity index 100% rename from middleman-more/fixtures/implied-extensions-app/source/test4.liquid rename to middleman-core/fixtures/more-implied-extensions-app/source/test4.liquid diff --git a/middleman-more/fixtures/minify-js-app/config.rb b/middleman-core/fixtures/more-instance-vars-app/config.rb similarity index 100% rename from middleman-more/fixtures/minify-js-app/config.rb rename to middleman-core/fixtures/more-instance-vars-app/config.rb diff --git a/middleman-more/fixtures/instance-vars-app/source/_vartial.erb b/middleman-core/fixtures/more-instance-vars-app/source/_vartial.erb similarity index 100% rename from middleman-more/fixtures/instance-vars-app/source/_vartial.erb rename to middleman-core/fixtures/more-instance-vars-app/source/_vartial.erb diff --git a/middleman-more/fixtures/instance-vars-app/source/instance-var-set.html.erb b/middleman-core/fixtures/more-instance-vars-app/source/instance-var-set.html.erb similarity index 100% rename from middleman-more/fixtures/instance-vars-app/source/instance-var-set.html.erb rename to middleman-core/fixtures/more-instance-vars-app/source/instance-var-set.html.erb diff --git a/middleman-more/fixtures/instance-vars-app/source/layout.erb b/middleman-core/fixtures/more-instance-vars-app/source/layout.erb similarity index 100% rename from middleman-more/fixtures/instance-vars-app/source/layout.erb rename to middleman-core/fixtures/more-instance-vars-app/source/layout.erb diff --git a/middleman-more/fixtures/instance-vars-app/source/no-instance-var.html.erb b/middleman-core/fixtures/more-instance-vars-app/source/no-instance-var.html.erb similarity index 100% rename from middleman-more/fixtures/instance-vars-app/source/no-instance-var.html.erb rename to middleman-core/fixtures/more-instance-vars-app/source/no-instance-var.html.erb diff --git a/middleman-more/fixtures/padrino-helpers-app/config.rb b/middleman-core/fixtures/more-preview-app/config.rb similarity index 100% rename from middleman-more/fixtures/padrino-helpers-app/config.rb rename to middleman-core/fixtures/more-preview-app/config.rb diff --git a/middleman-more/fixtures/preview-app/source/content.html.erb b/middleman-core/fixtures/more-preview-app/source/content.html.erb similarity index 100% rename from middleman-more/fixtures/preview-app/source/content.html.erb rename to middleman-core/fixtures/more-preview-app/source/content.html.erb diff --git a/middleman-more/fixtures/preview-app/source/layout.erb b/middleman-core/fixtures/more-preview-app/source/layout.erb similarity index 100% rename from middleman-more/fixtures/preview-app/source/layout.erb rename to middleman-core/fixtures/more-preview-app/source/layout.erb diff --git a/middleman-more/fixtures/preview-app/source/stylesheets/_partial.sass b/middleman-core/fixtures/more-preview-app/source/stylesheets/_partial.sass similarity index 100% rename from middleman-more/fixtures/preview-app/source/stylesheets/_partial.sass rename to middleman-core/fixtures/more-preview-app/source/stylesheets/_partial.sass diff --git a/middleman-more/fixtures/preview-app/source/stylesheets/_partial2.css.sass b/middleman-core/fixtures/more-preview-app/source/stylesheets/_partial2.css.sass similarity index 100% rename from middleman-more/fixtures/preview-app/source/stylesheets/_partial2.css.sass rename to middleman-core/fixtures/more-preview-app/source/stylesheets/_partial2.css.sass diff --git a/middleman-more/fixtures/preview-app/source/stylesheets/main.css.sass b/middleman-core/fixtures/more-preview-app/source/stylesheets/main.css.sass similarity index 100% rename from middleman-more/fixtures/preview-app/source/stylesheets/main.css.sass rename to middleman-core/fixtures/more-preview-app/source/stylesheets/main.css.sass diff --git a/middleman-more/fixtures/preview-app/source/stylesheets/main2.css.sass b/middleman-core/fixtures/more-preview-app/source/stylesheets/main2.css.sass similarity index 100% rename from middleman-more/fixtures/preview-app/source/stylesheets/main2.css.sass rename to middleman-core/fixtures/more-preview-app/source/stylesheets/main2.css.sass diff --git a/middleman-more/fixtures/preview-app/source/stylesheets/plain.css.sass b/middleman-core/fixtures/more-preview-app/source/stylesheets/plain.css.sass similarity index 100% rename from middleman-more/fixtures/preview-app/source/stylesheets/plain.css.sass rename to middleman-core/fixtures/more-preview-app/source/stylesheets/plain.css.sass diff --git a/middleman-more/fixtures/traversal-app/config.rb b/middleman-core/fixtures/more-traversal-app/config.rb similarity index 100% rename from middleman-more/fixtures/traversal-app/config.rb rename to middleman-core/fixtures/more-traversal-app/config.rb diff --git a/middleman-more/fixtures/traversal-app/source/directory-indexed.html.erb b/middleman-core/fixtures/more-traversal-app/source/directory-indexed.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/directory-indexed.html.erb rename to middleman-core/fixtures/more-traversal-app/source/directory-indexed.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/directory-indexed/sibling.html.erb b/middleman-core/fixtures/more-traversal-app/source/directory-indexed/sibling.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/directory-indexed/sibling.html.erb rename to middleman-core/fixtures/more-traversal-app/source/directory-indexed/sibling.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/directory-indexed/sibling2.html.erb b/middleman-core/fixtures/more-traversal-app/source/directory-indexed/sibling2.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/directory-indexed/sibling2.html.erb rename to middleman-core/fixtures/more-traversal-app/source/directory-indexed/sibling2.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/directory-indexed/sub2/index.html.erb b/middleman-core/fixtures/more-traversal-app/source/directory-indexed/sub2/index.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/directory-indexed/sub2/index.html.erb rename to middleman-core/fixtures/more-traversal-app/source/directory-indexed/sub2/index.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/directory-indexed/sub3/deep.html.erb b/middleman-core/fixtures/more-traversal-app/source/directory-indexed/sub3/deep.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/directory-indexed/sub3/deep.html.erb rename to middleman-core/fixtures/more-traversal-app/source/directory-indexed/sub3/deep.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/index.html.erb b/middleman-core/fixtures/more-traversal-app/source/index.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/index.html.erb rename to middleman-core/fixtures/more-traversal-app/source/index.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/layout.erb b/middleman-core/fixtures/more-traversal-app/source/layout.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/layout.erb rename to middleman-core/fixtures/more-traversal-app/source/layout.erb diff --git a/middleman-more/fixtures/traversal-app/source/proxied.html.erb b/middleman-core/fixtures/more-traversal-app/source/proxied.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/proxied.html.erb rename to middleman-core/fixtures/more-traversal-app/source/proxied.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/root.html.erb b/middleman-core/fixtures/more-traversal-app/source/root.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/root.html.erb rename to middleman-core/fixtures/more-traversal-app/source/root.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/sub/index.html.erb b/middleman-core/fixtures/more-traversal-app/source/sub/index.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/sub/index.html.erb rename to middleman-core/fixtures/more-traversal-app/source/sub/index.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/sub/sibling.html.erb b/middleman-core/fixtures/more-traversal-app/source/sub/sibling.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/sub/sibling.html.erb rename to middleman-core/fixtures/more-traversal-app/source/sub/sibling.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/sub/sibling2.html.erb b/middleman-core/fixtures/more-traversal-app/source/sub/sibling2.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/sub/sibling2.html.erb rename to middleman-core/fixtures/more-traversal-app/source/sub/sibling2.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/sub/sub2/index.html.erb b/middleman-core/fixtures/more-traversal-app/source/sub/sub2/index.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/sub/sub2/index.html.erb rename to middleman-core/fixtures/more-traversal-app/source/sub/sub2/index.html.erb diff --git a/middleman-more/fixtures/traversal-app/source/sub/sub3/deep.html.erb b/middleman-core/fixtures/more-traversal-app/source/sub/sub3/deep.html.erb similarity index 100% rename from middleman-more/fixtures/traversal-app/source/sub/sub3/deep.html.erb rename to middleman-core/fixtures/more-traversal-app/source/sub/sub3/deep.html.erb diff --git a/middleman-more/fixtures/nested-layout-app/config.rb b/middleman-core/fixtures/nested-layout-app/config.rb similarity index 100% rename from middleman-more/fixtures/nested-layout-app/config.rb rename to middleman-core/fixtures/nested-layout-app/config.rb diff --git a/middleman-more/fixtures/nested-layout-app/source/another.html.markdown b/middleman-core/fixtures/nested-layout-app/source/another.html.markdown similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/another.html.markdown rename to middleman-core/fixtures/nested-layout-app/source/another.html.markdown diff --git a/middleman-more/fixtures/nested-layout-app/source/data-one.html.erb b/middleman-core/fixtures/nested-layout-app/source/data-one.html.erb similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/data-one.html.erb rename to middleman-core/fixtures/nested-layout-app/source/data-one.html.erb diff --git a/middleman-more/fixtures/nested-layout-app/source/data-two.html.erb b/middleman-core/fixtures/nested-layout-app/source/data-two.html.erb similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/data-two.html.erb rename to middleman-core/fixtures/nested-layout-app/source/data-two.html.erb diff --git a/middleman-more/fixtures/nested-layout-app/source/haml-test.html.markdown b/middleman-core/fixtures/nested-layout-app/source/haml-test.html.markdown similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/haml-test.html.markdown rename to middleman-core/fixtures/nested-layout-app/source/haml-test.html.markdown diff --git a/middleman-more/fixtures/nested-layout-app/source/index.html.erb b/middleman-core/fixtures/nested-layout-app/source/index.html.erb similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/index.html.erb rename to middleman-core/fixtures/nested-layout-app/source/index.html.erb diff --git a/middleman-more/fixtures/nested-layout-app/source/layouts/inner.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/layouts/inner.erb rename to middleman-core/fixtures/nested-layout-app/source/layouts/inner.erb diff --git a/middleman-more/fixtures/nested-layout-app/source/layouts/inner_haml.haml b/middleman-core/fixtures/nested-layout-app/source/layouts/inner_haml.haml similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/layouts/inner_haml.haml rename to middleman-core/fixtures/nested-layout-app/source/layouts/inner_haml.haml diff --git a/middleman-more/fixtures/nested-layout-app/source/layouts/inner_slim.slim b/middleman-core/fixtures/nested-layout-app/source/layouts/inner_slim.slim similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/layouts/inner_slim.slim rename to middleman-core/fixtures/nested-layout-app/source/layouts/inner_slim.slim diff --git a/middleman-more/fixtures/nested-layout-app/source/layouts/master.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/master.erb similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/layouts/master.erb rename to middleman-core/fixtures/nested-layout-app/source/layouts/master.erb diff --git a/middleman-more/fixtures/nested-layout-app/source/layouts/master_haml.haml b/middleman-core/fixtures/nested-layout-app/source/layouts/master_haml.haml similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/layouts/master_haml.haml rename to middleman-core/fixtures/nested-layout-app/source/layouts/master_haml.haml diff --git a/middleman-more/fixtures/nested-layout-app/source/layouts/master_slim.slim b/middleman-core/fixtures/nested-layout-app/source/layouts/master_slim.slim similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/layouts/master_slim.slim rename to middleman-core/fixtures/nested-layout-app/source/layouts/master_slim.slim diff --git a/middleman-more/fixtures/nested-layout-app/source/layouts/outer.erb b/middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/layouts/outer.erb rename to middleman-core/fixtures/nested-layout-app/source/layouts/outer.erb diff --git a/middleman-more/fixtures/nested-layout-app/source/layouts/outer_haml.haml b/middleman-core/fixtures/nested-layout-app/source/layouts/outer_haml.haml similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/layouts/outer_haml.haml rename to middleman-core/fixtures/nested-layout-app/source/layouts/outer_haml.haml diff --git a/middleman-more/fixtures/nested-layout-app/source/layouts/outer_slim.slim b/middleman-core/fixtures/nested-layout-app/source/layouts/outer_slim.slim similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/layouts/outer_slim.slim rename to middleman-core/fixtures/nested-layout-app/source/layouts/outer_slim.slim diff --git a/middleman-more/fixtures/nested-layout-app/source/slim-test.html.markdown b/middleman-core/fixtures/nested-layout-app/source/slim-test.html.markdown similarity index 100% rename from middleman-more/fixtures/nested-layout-app/source/slim-test.html.markdown rename to middleman-core/fixtures/nested-layout-app/source/slim-test.html.markdown diff --git a/middleman-more/fixtures/partials-app/config.rb b/middleman-core/fixtures/padrino-helpers-app/config.rb similarity index 100% rename from middleman-more/fixtures/partials-app/config.rb rename to middleman-core/fixtures/padrino-helpers-app/config.rb diff --git a/middleman-more/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb b/middleman-core/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb similarity index 100% rename from middleman-more/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb rename to middleman-core/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb diff --git a/middleman-more/fixtures/page-classes-app/config.rb b/middleman-core/fixtures/page-classes-app/config.rb similarity index 100% rename from middleman-more/fixtures/page-classes-app/config.rb rename to middleman-core/fixtures/page-classes-app/config.rb diff --git a/middleman-more/fixtures/page-classes-app/source/page-classes.html.erb b/middleman-core/fixtures/page-classes-app/source/page-classes.html.erb similarity index 100% rename from middleman-more/fixtures/page-classes-app/source/page-classes.html.erb rename to middleman-core/fixtures/page-classes-app/source/page-classes.html.erb diff --git a/middleman-more/fixtures/page-classes-app/source/sub1/page-classes.html.erb b/middleman-core/fixtures/page-classes-app/source/sub1/page-classes.html.erb similarity index 100% rename from middleman-more/fixtures/page-classes-app/source/sub1/page-classes.html.erb rename to middleman-core/fixtures/page-classes-app/source/sub1/page-classes.html.erb diff --git a/middleman-more/fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb b/middleman-core/fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb similarity index 100% rename from middleman-more/fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb rename to middleman-core/fixtures/page-classes-app/source/sub1/sub2/page-classes.html.erb diff --git a/middleman-more/fixtures/preview-app/config.rb b/middleman-core/fixtures/partials-app/config.rb similarity index 100% rename from middleman-more/fixtures/preview-app/config.rb rename to middleman-core/fixtures/partials-app/config.rb diff --git a/middleman-more/fixtures/partials-app/source/_locals.erb b/middleman-core/fixtures/partials-app/source/_locals.erb similarity index 100% rename from middleman-more/fixtures/partials-app/source/_locals.erb rename to middleman-core/fixtures/partials-app/source/_locals.erb diff --git a/middleman-more/fixtures/partials-app/source/_main.erb b/middleman-core/fixtures/partials-app/source/_main.erb similarity index 100% rename from middleman-more/fixtures/partials-app/source/_main.erb rename to middleman-core/fixtures/partials-app/source/_main.erb diff --git a/middleman-more/fixtures/partials-app/source/_main.str b/middleman-core/fixtures/partials-app/source/_main.str similarity index 100% rename from middleman-more/fixtures/partials-app/source/_main.str rename to middleman-core/fixtures/partials-app/source/_main.str diff --git a/middleman-more/fixtures/partials-app/source/index.html.erb b/middleman-core/fixtures/partials-app/source/index.html.erb similarity index 100% rename from middleman-more/fixtures/partials-app/source/index.html.erb rename to middleman-core/fixtures/partials-app/source/index.html.erb diff --git a/middleman-more/fixtures/partials-app/source/locals.html.erb b/middleman-core/fixtures/partials-app/source/locals.html.erb similarity index 100% rename from middleman-more/fixtures/partials-app/source/locals.html.erb rename to middleman-core/fixtures/partials-app/source/locals.html.erb diff --git a/middleman-more/fixtures/partials-app/source/second.html.str b/middleman-core/fixtures/partials-app/source/second.html.str similarity index 100% rename from middleman-more/fixtures/partials-app/source/second.html.str rename to middleman-core/fixtures/partials-app/source/second.html.str diff --git a/middleman-more/fixtures/partials-app/source/shared/_footer.erb b/middleman-core/fixtures/partials-app/source/shared/_footer.erb similarity index 100% rename from middleman-more/fixtures/partials-app/source/shared/_footer.erb rename to middleman-core/fixtures/partials-app/source/shared/_footer.erb diff --git a/middleman-more/fixtures/partials-app/source/shared/_header.erb b/middleman-core/fixtures/partials-app/source/shared/_header.erb similarity index 100% rename from middleman-more/fixtures/partials-app/source/shared/_header.erb rename to middleman-core/fixtures/partials-app/source/shared/_header.erb diff --git a/middleman-more/fixtures/partials-app/source/shared/snippet.erb b/middleman-core/fixtures/partials-app/source/shared/snippet.erb similarity index 100% rename from middleman-more/fixtures/partials-app/source/shared/snippet.erb rename to middleman-core/fixtures/partials-app/source/shared/snippet.erb diff --git a/middleman-more/fixtures/partials-app/source/sub/_local.erb b/middleman-core/fixtures/partials-app/source/sub/_local.erb similarity index 100% rename from middleman-more/fixtures/partials-app/source/sub/_local.erb rename to middleman-core/fixtures/partials-app/source/sub/_local.erb diff --git a/middleman-more/fixtures/partials-app/source/sub/index.html.erb b/middleman-core/fixtures/partials-app/source/sub/index.html.erb similarity index 100% rename from middleman-more/fixtures/partials-app/source/sub/index.html.erb rename to middleman-core/fixtures/partials-app/source/sub/index.html.erb diff --git a/middleman-more/fixtures/partials-app/source/using_snippet.html.erb b/middleman-core/fixtures/partials-app/source/using_snippet.html.erb similarity index 100% rename from middleman-more/fixtures/partials-app/source/using_snippet.html.erb rename to middleman-core/fixtures/partials-app/source/using_snippet.html.erb diff --git a/middleman-more/fixtures/partials-dir-app/source/index.html.erb b/middleman-core/fixtures/partials-dir-app/source/index.html.erb similarity index 100% rename from middleman-more/fixtures/partials-dir-app/source/index.html.erb rename to middleman-core/fixtures/partials-dir-app/source/index.html.erb diff --git a/middleman-more/fixtures/partials-dir-app/source/nested/partials/_partial.html.erb b/middleman-core/fixtures/partials-dir-app/source/nested/partials/_partial.html.erb similarity index 100% rename from middleman-more/fixtures/partials-dir-app/source/nested/partials/_partial.html.erb rename to middleman-core/fixtures/partials-dir-app/source/nested/partials/_partial.html.erb diff --git a/middleman-more/fixtures/partials-dir-app/source/partials/_partial.html.erb b/middleman-core/fixtures/partials-dir-app/source/partials/_partial.html.erb similarity index 100% rename from middleman-more/fixtures/partials-dir-app/source/partials/_partial.html.erb rename to middleman-core/fixtures/partials-dir-app/source/partials/_partial.html.erb diff --git a/middleman-more/fixtures/indexable-app/source/.htaccess b/middleman-core/fixtures/passthrough-app/source/.htaccess similarity index 100% rename from middleman-more/fixtures/indexable-app/source/.htaccess rename to middleman-core/fixtures/passthrough-app/source/.htaccess diff --git a/middleman-more/fixtures/passthrough-app/source/inline-coffeescript.html.haml b/middleman-core/fixtures/passthrough-app/source/inline-coffeescript.html.haml similarity index 100% rename from middleman-more/fixtures/passthrough-app/source/inline-coffeescript.html.haml rename to middleman-core/fixtures/passthrough-app/source/inline-coffeescript.html.haml diff --git a/middleman-more/fixtures/passthrough-app/source/inline-css.html.haml b/middleman-core/fixtures/passthrough-app/source/inline-css.html.haml similarity index 100% rename from middleman-more/fixtures/passthrough-app/source/inline-css.html.haml rename to middleman-core/fixtures/passthrough-app/source/inline-css.html.haml diff --git a/middleman-more/fixtures/passthrough-app/source/inline-js.html.haml b/middleman-core/fixtures/passthrough-app/source/inline-js.html.haml similarity index 100% rename from middleman-more/fixtures/passthrough-app/source/inline-js.html.haml rename to middleman-core/fixtures/passthrough-app/source/inline-js.html.haml diff --git a/middleman-more/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee b/middleman-core/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee similarity index 100% rename from middleman-more/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee rename to middleman-core/fixtures/passthrough-app/source/javascripts/coffee_test.js.coffee diff --git a/middleman-more/fixtures/passthrough-app/source/javascripts/js_test.js b/middleman-core/fixtures/passthrough-app/source/javascripts/js_test.js similarity index 100% rename from middleman-more/fixtures/passthrough-app/source/javascripts/js_test.js rename to middleman-core/fixtures/passthrough-app/source/javascripts/js_test.js diff --git a/middleman-more/fixtures/passthrough-app/source/stylesheets/site.css.sass b/middleman-core/fixtures/passthrough-app/source/stylesheets/site.css.sass similarity index 100% rename from middleman-more/fixtures/passthrough-app/source/stylesheets/site.css.sass rename to middleman-core/fixtures/passthrough-app/source/stylesheets/site.css.sass diff --git a/middleman-more/fixtures/relative-app/config.rb b/middleman-core/fixtures/relative-app/config.rb similarity index 100% rename from middleman-more/fixtures/relative-app/config.rb rename to middleman-core/fixtures/relative-app/config.rb diff --git a/middleman-more/fixtures/relative-app/source/images/blank.gif b/middleman-core/fixtures/relative-app/source/images/blank.gif similarity index 100% rename from middleman-more/fixtures/relative-app/source/images/blank.gif rename to middleman-core/fixtures/relative-app/source/images/blank.gif diff --git a/middleman-more/fixtures/relative-app/source/stylesheets/relative_assets.css.sass b/middleman-core/fixtures/relative-app/source/stylesheets/relative_assets.css.sass similarity index 100% rename from middleman-more/fixtures/relative-app/source/stylesheets/relative_assets.css.sass rename to middleman-core/fixtures/relative-app/source/stylesheets/relative_assets.css.sass diff --git a/middleman-more/fixtures/relative-assets-app/config.rb b/middleman-core/fixtures/relative-assets-app/config.rb similarity index 100% rename from middleman-more/fixtures/relative-assets-app/config.rb rename to middleman-core/fixtures/relative-assets-app/config.rb diff --git a/middleman-more/fixtures/relative-assets-app/source/images/blank.gif b/middleman-core/fixtures/relative-assets-app/source/images/blank.gif similarity index 100% rename from middleman-more/fixtures/relative-assets-app/source/images/blank.gif rename to middleman-core/fixtures/relative-assets-app/source/images/blank.gif diff --git a/middleman-more/fixtures/relative-assets-app/source/img/blank.gif b/middleman-core/fixtures/relative-assets-app/source/img/blank.gif similarity index 100% rename from middleman-more/fixtures/relative-assets-app/source/img/blank.gif rename to middleman-core/fixtures/relative-assets-app/source/img/blank.gif diff --git a/middleman-more/fixtures/relative-assets-app/source/relative_image.html.erb b/middleman-core/fixtures/relative-assets-app/source/relative_image.html.erb similarity index 100% rename from middleman-more/fixtures/relative-assets-app/source/relative_image.html.erb rename to middleman-core/fixtures/relative-assets-app/source/relative_image.html.erb diff --git a/middleman-more/fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass b/middleman-core/fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass similarity index 100% rename from middleman-more/fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass rename to middleman-core/fixtures/relative-assets-app/source/stylesheets/relative_assets.css.sass diff --git a/middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass b/middleman-core/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass similarity index 100% rename from middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass rename to middleman-core/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset-sass.sass diff --git a/middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.scss b/middleman-core/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.scss similarity index 100% rename from middleman-more/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.scss rename to middleman-core/fixtures/sass-assets-path-app/assets/stylesheets/_shared-asset.scss diff --git a/middleman-more/fixtures/sass-assets-path-app/config.rb b/middleman-core/fixtures/sass-assets-path-app/config.rb similarity index 100% rename from middleman-more/fixtures/sass-assets-path-app/config.rb rename to middleman-core/fixtures/sass-assets-path-app/config.rb diff --git a/middleman-more/fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass b/middleman-core/fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass similarity index 100% rename from middleman-more/fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass rename to middleman-core/fixtures/sass-assets-path-app/my-vendor/stylesheets/_partial.sass diff --git a/middleman-more/fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass b/middleman-core/fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass similarity index 100% rename from middleman-more/fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass rename to middleman-core/fixtures/sass-assets-path-app/source/stylesheets/plain.css.sass diff --git a/middleman-more/fixtures/sass-cache-path-custom-app/config.rb b/middleman-core/fixtures/sass-cache-path-custom-app/config.rb similarity index 100% rename from middleman-more/fixtures/sass-cache-path-custom-app/config.rb rename to middleman-core/fixtures/sass-cache-path-custom-app/config.rb diff --git a/middleman-more/fixtures/sass-cache-path-custom-app/source/stylesheets/plain.css.sass b/middleman-core/fixtures/sass-cache-path-custom-app/source/stylesheets/plain.css.sass similarity index 100% rename from middleman-more/fixtures/sass-cache-path-custom-app/source/stylesheets/plain.css.sass rename to middleman-core/fixtures/sass-cache-path-custom-app/source/stylesheets/plain.css.sass diff --git a/middleman-more/fixtures/sass-cache-path-default-app/config.rb b/middleman-core/fixtures/sass-cache-path-default-app/config.rb similarity index 100% rename from middleman-more/fixtures/sass-cache-path-default-app/config.rb rename to middleman-core/fixtures/sass-cache-path-default-app/config.rb diff --git a/middleman-more/fixtures/sass-cache-path-default-app/source/stylesheets/plain.css.sass b/middleman-core/fixtures/sass-cache-path-default-app/source/stylesheets/plain.css.sass similarity index 100% rename from middleman-more/fixtures/sass-cache-path-default-app/source/stylesheets/plain.css.sass rename to middleman-core/fixtures/sass-cache-path-default-app/source/stylesheets/plain.css.sass diff --git a/middleman-more/fixtures/scss-app/config.rb b/middleman-core/fixtures/scss-app/config.rb similarity index 100% rename from middleman-more/fixtures/scss-app/config.rb rename to middleman-core/fixtures/scss-app/config.rb diff --git a/middleman-more/fixtures/scss-app/source/stylesheets/layout.css.sass b/middleman-core/fixtures/scss-app/source/stylesheets/layout.css.sass similarity index 100% rename from middleman-more/fixtures/scss-app/source/stylesheets/layout.css.sass rename to middleman-core/fixtures/scss-app/source/stylesheets/layout.css.sass diff --git a/middleman-more/fixtures/scss-app/source/stylesheets/site_scss.css.scss b/middleman-core/fixtures/scss-app/source/stylesheets/site_scss.css.scss similarity index 100% rename from middleman-more/fixtures/scss-app/source/stylesheets/site_scss.css.scss rename to middleman-core/fixtures/scss-app/source/stylesheets/site_scss.css.scss diff --git a/middleman-more/fixtures/stylus-preview-app/config.rb b/middleman-core/fixtures/stylus-preview-app/config.rb similarity index 100% rename from middleman-more/fixtures/stylus-preview-app/config.rb rename to middleman-core/fixtures/stylus-preview-app/config.rb diff --git a/middleman-more/fixtures/stylus-preview-app/source/content.html.erb b/middleman-core/fixtures/stylus-preview-app/source/content.html.erb similarity index 100% rename from middleman-more/fixtures/stylus-preview-app/source/content.html.erb rename to middleman-core/fixtures/stylus-preview-app/source/content.html.erb diff --git a/middleman-more/fixtures/stylus-preview-app/source/layout.erb b/middleman-core/fixtures/stylus-preview-app/source/layout.erb similarity index 100% rename from middleman-more/fixtures/stylus-preview-app/source/layout.erb rename to middleman-core/fixtures/stylus-preview-app/source/layout.erb diff --git a/middleman-more/fixtures/stylus-preview-app/source/stylesheets/_partial.styl b/middleman-core/fixtures/stylus-preview-app/source/stylesheets/_partial.styl similarity index 100% rename from middleman-more/fixtures/stylus-preview-app/source/stylesheets/_partial.styl rename to middleman-core/fixtures/stylus-preview-app/source/stylesheets/_partial.styl diff --git a/middleman-more/fixtures/stylus-preview-app/source/stylesheets/_partial2.css.styl b/middleman-core/fixtures/stylus-preview-app/source/stylesheets/_partial2.css.styl similarity index 100% rename from middleman-more/fixtures/stylus-preview-app/source/stylesheets/_partial2.css.styl rename to middleman-core/fixtures/stylus-preview-app/source/stylesheets/_partial2.css.styl diff --git a/middleman-more/fixtures/stylus-preview-app/source/stylesheets/main.css.styl b/middleman-core/fixtures/stylus-preview-app/source/stylesheets/main.css.styl similarity index 100% rename from middleman-more/fixtures/stylus-preview-app/source/stylesheets/main.css.styl rename to middleman-core/fixtures/stylus-preview-app/source/stylesheets/main.css.styl diff --git a/middleman-more/fixtures/stylus-preview-app/source/stylesheets/main2.css.styl b/middleman-core/fixtures/stylus-preview-app/source/stylesheets/main2.css.styl similarity index 100% rename from middleman-more/fixtures/stylus-preview-app/source/stylesheets/main2.css.styl rename to middleman-core/fixtures/stylus-preview-app/source/stylesheets/main2.css.styl diff --git a/middleman-more/fixtures/stylus-preview-app/source/stylesheets/plain.css.styl b/middleman-core/fixtures/stylus-preview-app/source/stylesheets/plain.css.styl similarity index 100% rename from middleman-more/fixtures/stylus-preview-app/source/stylesheets/plain.css.styl rename to middleman-core/fixtures/stylus-preview-app/source/stylesheets/plain.css.styl diff --git a/middleman-more/fixtures/twitter-bootstrap-app/config.rb b/middleman-core/fixtures/twitter-bootstrap-app/config.rb similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/config.rb rename to middleman-core/fixtures/twitter-bootstrap-app/config.rb diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.gitignore b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.gitignore similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.gitignore rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.gitignore diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.travis.yml b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.travis.yml similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.travis.yml rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/.travis.yml diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/LICENSE b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/LICENSE similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/LICENSE rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/LICENSE diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/README.md b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/README.md similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/README.md rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/README.md diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings-white.png b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings-white.png similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings-white.png rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings-white.png diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings.png b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings.png similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings.png rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/img/glyphicons-halflings.png diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/.jshintrc b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/.jshintrc similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/.jshintrc rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/.jshintrc diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/README.md b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/README.md similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/README.md rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/README.md diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-alert.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-alert.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-alert.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-alert.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-button.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-button.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-button.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-button.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-carousel.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-carousel.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-carousel.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-carousel.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-collapse.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-collapse.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-collapse.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-collapse.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-dropdown.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-dropdown.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-dropdown.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-dropdown.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-modal.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-modal.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-modal.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-modal.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-popover.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-popover.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-popover.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-popover.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-scrollspy.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-scrollspy.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-scrollspy.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-scrollspy.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tab.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tab.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tab.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tab.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tooltip.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tooltip.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tooltip.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-tooltip.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-transition.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-transition.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-transition.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-transition.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-typeahead.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-typeahead.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-typeahead.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/bootstrap-typeahead.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/index.html b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/index.html similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/index.html rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/index.html diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/phantom.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/phantom.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/phantom.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/phantom.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/server.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/server.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/server.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/server.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-alert.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-alert.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-alert.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-alert.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-button.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-button.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-button.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-button.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-carousel.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-carousel.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-carousel.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-carousel.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-collapse.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-collapse.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-collapse.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-collapse.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-dropdown.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-dropdown.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-dropdown.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-dropdown.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-modal.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-modal.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-modal.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-modal.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-phantom.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-phantom.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-phantom.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-phantom.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-popover.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-popover.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-popover.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-popover.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-scrollspy.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-scrollspy.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-scrollspy.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-scrollspy.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tab.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tab.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tab.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tab.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tooltip.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tooltip.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tooltip.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-tooltip.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-transition.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-transition.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-transition.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-transition.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-typeahead.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-typeahead.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-typeahead.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/unit/bootstrap-typeahead.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/jquery.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/jquery.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/jquery.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/jquery.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/qunit.css b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/qunit.css similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/qunit.css rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/qunit.css diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/qunit.js b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/qunit.js similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/qunit.js rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/js/tests/vendor/qunit.js diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_accordion.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_accordion.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_accordion.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_accordion.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_alerts.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_alerts.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_alerts.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_alerts.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_breadcrumbs.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_breadcrumbs.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_breadcrumbs.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_breadcrumbs.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_button-groups.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_button-groups.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_button-groups.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_button-groups.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_buttons.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_buttons.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_buttons.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_buttons.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_carousel.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_carousel.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_carousel.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_carousel.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_close.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_close.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_close.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_close.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_code.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_code.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_code.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_code.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_component-animations.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_component-animations.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_component-animations.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_component-animations.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_dropdowns.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_dropdowns.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_dropdowns.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_dropdowns.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_forms.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_forms.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_forms.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_forms.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_grid.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_grid.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_grid.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_grid.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_hero-unit.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_hero-unit.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_hero-unit.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_hero-unit.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_labels-badges.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_labels-badges.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_labels-badges.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_labels-badges.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_layouts.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_layouts.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_layouts.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_layouts.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_mixins.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_mixins.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_mixins.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_mixins.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_modals.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_modals.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_modals.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_modals.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_navbar.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_navbar.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_navbar.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_navbar.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_navs.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_navs.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_navs.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_navs.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_pager.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_pager.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_pager.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_pager.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_pagination.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_pagination.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_pagination.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_pagination.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_popovers.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_popovers.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_popovers.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_popovers.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_progress-bars.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_progress-bars.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_progress-bars.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_progress-bars.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_reset.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_reset.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_reset.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_reset.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-1200px-min.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-1200px-min.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-1200px-min.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-1200px-min.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-767px-max.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-767px-max.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-767px-max.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-767px-max.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-768px-979px.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-768px-979px.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-768px-979px.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-768px-979px.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-navbar.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-navbar.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-navbar.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-navbar.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-utilities.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-utilities.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-utilities.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_responsive-utilities.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_scaffolding.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_scaffolding.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_scaffolding.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_scaffolding.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_sprites.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_sprites.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_sprites.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_sprites.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_tables.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_tables.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_tables.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_tables.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_thumbnails.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_thumbnails.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_thumbnails.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_thumbnails.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_tooltip.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_tooltip.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_tooltip.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_tooltip.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_type.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_type.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_type.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_type.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_utilities.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_utilities.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_utilities.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_utilities.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_variables.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_variables.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_variables.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_variables.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_wells.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_wells.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_wells.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/_wells.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/bootstrap.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/bootstrap.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/bootstrap.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/bootstrap.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/responsive.less b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/responsive.less similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/responsive.less rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/responsive.less diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/css-tests.css b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/css-tests.css similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/css-tests.css rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/css-tests.css diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/css-tests.html b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/css-tests.html similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/css-tests.html rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/css-tests.html diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/forms.html b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/forms.html similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/forms.html rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/forms.html diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/navbar.html b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/navbar.html similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/navbar.html rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/less/tests/navbar.html diff --git a/middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/package.json b/middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/package.json similarity index 100% rename from middleman-more/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/package.json rename to middleman-core/fixtures/twitter-bootstrap-app/source/twitter-bootstrap-ebc6935/package.json diff --git a/middleman-more/fixtures/wildcard-directory-index-app/config.rb b/middleman-core/fixtures/wildcard-directory-index-app/config.rb similarity index 100% rename from middleman-more/fixtures/wildcard-directory-index-app/config.rb rename to middleman-core/fixtures/wildcard-directory-index-app/config.rb diff --git a/middleman-more/fixtures/wildcard-directory-index-app/source/admin/index.html.erb b/middleman-core/fixtures/wildcard-directory-index-app/source/admin/index.html.erb similarity index 100% rename from middleman-more/fixtures/wildcard-directory-index-app/source/admin/index.html.erb rename to middleman-core/fixtures/wildcard-directory-index-app/source/admin/index.html.erb diff --git a/middleman-more/fixtures/wildcard-directory-index-app/source/admin/page.html.erb b/middleman-core/fixtures/wildcard-directory-index-app/source/admin/page.html.erb similarity index 100% rename from middleman-more/fixtures/wildcard-directory-index-app/source/admin/page.html.erb rename to middleman-core/fixtures/wildcard-directory-index-app/source/admin/page.html.erb diff --git a/middleman-more/fixtures/wildcard-directory-index-app/source/index.html.erb b/middleman-core/fixtures/wildcard-directory-index-app/source/index.html.erb similarity index 100% rename from middleman-more/fixtures/wildcard-directory-index-app/source/index.html.erb rename to middleman-core/fixtures/wildcard-directory-index-app/source/index.html.erb diff --git a/middleman-more/fixtures/wildcard-directory-index-app/source/layouts/admin.erb b/middleman-core/fixtures/wildcard-directory-index-app/source/layouts/admin.erb similarity index 100% rename from middleman-more/fixtures/wildcard-directory-index-app/source/layouts/admin.erb rename to middleman-core/fixtures/wildcard-directory-index-app/source/layouts/admin.erb diff --git a/middleman-more/fixtures/wildcard-directory-index-app/source/layouts/layout.erb b/middleman-core/fixtures/wildcard-directory-index-app/source/layouts/layout.erb similarity index 100% rename from middleman-more/fixtures/wildcard-directory-index-app/source/layouts/layout.erb rename to middleman-core/fixtures/wildcard-directory-index-app/source/layouts/layout.erb diff --git a/middleman-core/lib/middleman-core.rb b/middleman-core/lib/middleman-core.rb index ba89ce8b..a1088d89 100644 --- a/middleman-core/lib/middleman-core.rb +++ b/middleman-core/lib/middleman-core.rb @@ -14,3 +14,4 @@ require "middleman-core/version" require "middleman-core/util" require "middleman-core/extensions" require "middleman-core/application" +require "middleman-more" diff --git a/middleman-core/lib/middleman-core/extensions.rb b/middleman-core/lib/middleman-core/extensions.rb index c52fabc7..1347f228 100644 --- a/middleman-core/lib/middleman-core/extensions.rb +++ b/middleman-core/lib/middleman-core/extensions.rb @@ -62,11 +62,6 @@ module Middleman def load_extensions_in_path require "rubygems" - begin - require "middleman-more" - rescue LoadError - end - extensions = rubygems_latest_specs.select do |spec| spec_has_file?(spec, EXTENSION_FILE) end diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb index bfcb488e..ac34da5c 100644 --- a/middleman-core/lib/middleman-core/version.rb +++ b/middleman-core/lib/middleman-core/version.rb @@ -1,5 +1,5 @@ module Middleman # Current Version # @return [String] - VERSION = '3.1.0.beta.3' unless const_defined?(:VERSION) + VERSION = '3.1.0.beta.4' unless const_defined?(:VERSION) end diff --git a/middleman-more/lib/middleman-more.rb b/middleman-core/lib/middleman-more.rb similarity index 88% rename from middleman-more/lib/middleman-more.rb rename to middleman-core/lib/middleman-more.rb index e324671f..cab776d8 100644 --- a/middleman-more/lib/middleman-more.rb +++ b/middleman-core/lib/middleman-more.rb @@ -1,9 +1,3 @@ -require "middleman-core" - -# Setup our load paths -libdir = File.expand_path(File.dirname(__FILE__)) -$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir) - module Middleman module More @@ -19,9 +13,13 @@ module Middleman require "middleman-core/templates" require "middleman-more/templates/smacss" - # Setup default helpers - require "middleman-more/core_extensions/default_helpers" - Middleman::CoreExtensions::DefaultHelpers.new(app) + begin + # Setup default helpers + require 'padrino-helpers' + require "middleman-more/core_extensions/default_helpers" + Middleman::CoreExtensions::DefaultHelpers.new(app) + rescue LoadError + end require "i18n" app.after_configuration do @@ -37,8 +35,12 @@ module Middleman Middleman::CoreExtensions::Internationalization.register(:i18n) # Compass framework - require "middleman-more/core_extensions/compass" - Middleman::CoreExtensions::Compass.new(app) + begin + require "compass" + require "middleman-more/core_extensions/compass" + Middleman::CoreExtensions::Compass.new(app) + rescue LoadError + end ### # Setup Optional Extensions @@ -49,6 +51,17 @@ module Middleman require "middleman-more/extensions/cache_buster" Middleman::Extensions::CacheBuster.register + # RelativeAssets allow any asset path in dynamic templates to be either + # relative to the root of the project or use an absolute URL. + require "middleman-more/extensions/relative_assets" + Middleman::Extensions::RelativeAssets.register + + # AssetHost allows you to setup multiple domains to host your static + # assets. Calls to asset paths in dynamic templates will then rotate + # through each of the asset servers to better spread the load. + require "middleman-more/extensions/asset_host" + Middleman::Extensions::AssetHost.register + # MinifyCss compresses CSS require "middleman-more/extensions/minify_css" Middleman::Extensions::MinifyCss.register @@ -57,11 +70,6 @@ module Middleman require "middleman-more/extensions/minify_javascript" Middleman::Extensions::MinifyJavascript.register - # RelativeAssets allow any asset path in dynamic templates to be either - # relative to the root of the project or use an absolute URL. - require "middleman-more/extensions/relative_assets" - Middleman::Extensions::RelativeAssets.register - # GZIP assets and pages during build require "middleman-more/extensions/gzip" Middleman::Extensions::Gzip.register @@ -71,12 +79,6 @@ module Middleman require "middleman-more/extensions/asset_hash" Middleman::Extensions::AssetHash.register - # AssetHost allows you to setup multiple domains to host your static - # assets. Calls to asset paths in dynamic templates will then rotate - # through each of the asset servers to better spread the load. - require "middleman-more/extensions/asset_host" - Middleman::Extensions::AssetHost.register - # Provide Apache-style index.html files for directories require "middleman-more/extensions/directory_indexes" Middleman::Extensions::DirectoryIndexes.register diff --git a/middleman-more/lib/middleman-more/core_extensions/compass.rb b/middleman-core/lib/middleman-more/core_extensions/compass.rb similarity index 100% rename from middleman-more/lib/middleman-more/core_extensions/compass.rb rename to middleman-core/lib/middleman-more/core_extensions/compass.rb diff --git a/middleman-more/lib/middleman-more/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb similarity index 100% rename from middleman-more/lib/middleman-more/core_extensions/default_helpers.rb rename to middleman-core/lib/middleman-more/core_extensions/default_helpers.rb diff --git a/middleman-more/lib/middleman-more/core_extensions/i18n.rb b/middleman-core/lib/middleman-more/core_extensions/i18n.rb similarity index 100% rename from middleman-more/lib/middleman-more/core_extensions/i18n.rb rename to middleman-core/lib/middleman-more/core_extensions/i18n.rb diff --git a/middleman-more/lib/middleman-more/extensions/asset_hash.rb b/middleman-core/lib/middleman-more/extensions/asset_hash.rb similarity index 100% rename from middleman-more/lib/middleman-more/extensions/asset_hash.rb rename to middleman-core/lib/middleman-more/extensions/asset_hash.rb diff --git a/middleman-more/lib/middleman-more/extensions/asset_host.rb b/middleman-core/lib/middleman-more/extensions/asset_host.rb similarity index 96% rename from middleman-more/lib/middleman-more/extensions/asset_host.rb rename to middleman-core/lib/middleman-more/extensions/asset_host.rb index f6eff8d8..7f27ecc0 100644 --- a/middleman-more/lib/middleman-more/extensions/asset_host.rb +++ b/middleman-core/lib/middleman-more/extensions/asset_host.rb @@ -19,7 +19,7 @@ class Middleman::Extensions::AssetHost < ::Middleman::Extension end end end - end + end if app.respond_to?(:compass_config) end def host diff --git a/middleman-more/lib/middleman-more/extensions/automatic_image_sizes.rb b/middleman-core/lib/middleman-more/extensions/automatic_image_sizes.rb similarity index 100% rename from middleman-more/lib/middleman-more/extensions/automatic_image_sizes.rb rename to middleman-core/lib/middleman-more/extensions/automatic_image_sizes.rb diff --git a/middleman-more/lib/middleman-more/extensions/automatic_image_sizes/fastimage.rb b/middleman-core/lib/middleman-more/extensions/automatic_image_sizes/fastimage.rb similarity index 100% rename from middleman-more/lib/middleman-more/extensions/automatic_image_sizes/fastimage.rb rename to middleman-core/lib/middleman-more/extensions/automatic_image_sizes/fastimage.rb diff --git a/middleman-more/lib/middleman-more/extensions/cache_buster.rb b/middleman-core/lib/middleman-more/extensions/cache_buster.rb similarity index 97% rename from middleman-more/lib/middleman-more/extensions/cache_buster.rb rename to middleman-core/lib/middleman-more/extensions/cache_buster.rb index a252fd5c..f527b33c 100644 --- a/middleman-more/lib/middleman-more/extensions/cache_buster.rb +++ b/middleman-core/lib/middleman-more/extensions/cache_buster.rb @@ -15,7 +15,7 @@ class Middleman::Extensions::CacheBuster < ::Middleman::Extension logger.warn "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}" end end - end + end if app.respond_to?(:compass_config) end helpers do diff --git a/middleman-more/lib/middleman-more/extensions/directory_indexes.rb b/middleman-core/lib/middleman-more/extensions/directory_indexes.rb similarity index 100% rename from middleman-more/lib/middleman-more/extensions/directory_indexes.rb rename to middleman-core/lib/middleman-more/extensions/directory_indexes.rb diff --git a/middleman-more/lib/middleman-more/extensions/gzip.rb b/middleman-core/lib/middleman-more/extensions/gzip.rb similarity index 100% rename from middleman-more/lib/middleman-more/extensions/gzip.rb rename to middleman-core/lib/middleman-more/extensions/gzip.rb diff --git a/middleman-more/lib/middleman-more/extensions/lorem.rb b/middleman-core/lib/middleman-more/extensions/lorem.rb similarity index 100% rename from middleman-more/lib/middleman-more/extensions/lorem.rb rename to middleman-core/lib/middleman-more/extensions/lorem.rb diff --git a/middleman-more/lib/middleman-more/extensions/minify_css.rb b/middleman-core/lib/middleman-more/extensions/minify_css.rb similarity index 100% rename from middleman-more/lib/middleman-more/extensions/minify_css.rb rename to middleman-core/lib/middleman-more/extensions/minify_css.rb diff --git a/middleman-more/lib/middleman-more/extensions/minify_javascript.rb b/middleman-core/lib/middleman-more/extensions/minify_javascript.rb similarity index 100% rename from middleman-more/lib/middleman-more/extensions/minify_javascript.rb rename to middleman-core/lib/middleman-more/extensions/minify_javascript.rb diff --git a/middleman-more/lib/middleman-more/extensions/relative_assets.rb b/middleman-core/lib/middleman-more/extensions/relative_assets.rb similarity index 94% rename from middleman-more/lib/middleman-more/extensions/relative_assets.rb rename to middleman-core/lib/middleman-more/extensions/relative_assets.rb index 20583d03..2679727f 100644 --- a/middleman-more/lib/middleman-more/extensions/relative_assets.rb +++ b/middleman-core/lib/middleman-more/extensions/relative_assets.rb @@ -7,7 +7,7 @@ class Middleman::Extensions::RelativeAssets < ::Middleman::Extension # After compass is setup, make it use the registered cache buster app.compass_config do |config| config.relative_assets = true - end + end if app.respond_to?(:compass_config) end helpers do diff --git a/middleman-more/lib/middleman-more/templates/smacss.rb b/middleman-core/lib/middleman-more/templates/smacss.rb similarity index 100% rename from middleman-more/lib/middleman-more/templates/smacss.rb rename to middleman-core/lib/middleman-more/templates/smacss.rb diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/_footer.haml b/middleman-core/lib/middleman-more/templates/smacss/source/_footer.haml similarity index 100% rename from middleman-more/lib/middleman-more/templates/smacss/source/_footer.haml rename to middleman-core/lib/middleman-more/templates/smacss/source/_footer.haml diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/index.html.haml b/middleman-core/lib/middleman-more/templates/smacss/source/index.html.haml similarity index 100% rename from middleman-more/lib/middleman-more/templates/smacss/source/index.html.haml rename to middleman-core/lib/middleman-more/templates/smacss/source/index.html.haml diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/layouts/layout.haml b/middleman-core/lib/middleman-more/templates/smacss/source/layouts/layout.haml similarity index 100% rename from middleman-more/lib/middleman-more/templates/smacss/source/layouts/layout.haml rename to middleman-core/lib/middleman-more/templates/smacss/source/layouts/layout.haml diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/base/README.markdown b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/README.markdown similarity index 100% rename from middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/base/README.markdown rename to middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/README.markdown diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/base/base.scss b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/base.scss similarity index 100% rename from middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/base/base.scss rename to middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/base.scss diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/base/normalize.scss b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/normalize.scss similarity index 100% rename from middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/base/normalize.scss rename to middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/base/normalize.scss diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/layout/README.markdown b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/layout/README.markdown similarity index 100% rename from middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/layout/README.markdown rename to middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/layout/README.markdown diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/modules/README.markdown b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/modules/README.markdown similarity index 100% rename from middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/modules/README.markdown rename to middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/modules/README.markdown diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/states/README.markdown b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/states/README.markdown similarity index 100% rename from middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/states/README.markdown rename to middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/states/README.markdown diff --git a/middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss b/middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss similarity index 100% rename from middleman-more/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss rename to middleman-core/lib/middleman-more/templates/smacss/source/stylesheets/style.css.scss diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index e6a44e48..888189e0 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -33,4 +33,7 @@ Gem::Specification.new do |s| # Watcher s.add_dependency("listen", ["~> 1.0.2"]) + + # i18n + s.add_dependency("i18n", ["~> 0.6.1"]) end diff --git a/middleman-more/.cane b/middleman-more/.cane deleted file mode 100644 index e71c6aca..00000000 --- a/middleman-more/.cane +++ /dev/null @@ -1,2 +0,0 @@ ---exclusions-file .cane-exclusions.yml ---no-doc \ No newline at end of file diff --git a/middleman-more/.cane-exclusions.yml b/middleman-more/.cane-exclusions.yml deleted file mode 100644 index 81bbc5d1..00000000 --- a/middleman-more/.cane-exclusions.yml +++ /dev/null @@ -1,3 +0,0 @@ -style: - - lib/middleman-more/extensions/minify_css/rainpress.rb - - lib/middleman-more/extensions/automatic_image_sizes/fastimage.rb \ No newline at end of file diff --git a/middleman-more/.gemtest b/middleman-more/.gemtest deleted file mode 100644 index e69de29b..00000000 diff --git a/middleman-more/Rakefile b/middleman-more/Rakefile deleted file mode 100644 index e7ccf7ee..00000000 --- a/middleman-more/Rakefile +++ /dev/null @@ -1,6 +0,0 @@ -# coding:utf-8 -RAKE_ROOT = __FILE__ - -require 'rubygems' -GEM_NAME = "middleman-more" -require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper') \ No newline at end of file diff --git a/middleman-more/features/support/env.rb b/middleman-more/features/support/env.rb deleted file mode 100644 index a4bdac57..00000000 --- a/middleman-more/features/support/env.rb +++ /dev/null @@ -1,10 +0,0 @@ -ENV["TEST"] = "true" -ENV["AUTOLOAD_SPROCKETS"] = "false" - -PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__))) - -core_root = File.expand_path("../../../../middleman-core/lib/middleman-core", __FILE__) - -require core_root -require File.join(core_root, "step_definitions") -require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-more') diff --git a/middleman-more/fixtures/indexable-app/config.rb b/middleman-more/fixtures/indexable-app/config.rb deleted file mode 100644 index 54b79b5c..00000000 --- a/middleman-more/fixtures/indexable-app/config.rb +++ /dev/null @@ -1,4 +0,0 @@ -activate :directory_indexes -page "/leave_me_alone.html", :directory_index => false - -page "/wildcard*", :directory_index => false diff --git a/middleman-more/fixtures/indexable-app/source/a_folder/needs_index.html b/middleman-more/fixtures/indexable-app/source/a_folder/needs_index.html deleted file mode 100644 index 1eeec11b..00000000 --- a/middleman-more/fixtures/indexable-app/source/a_folder/needs_index.html +++ /dev/null @@ -1 +0,0 @@ -Indexable \ No newline at end of file diff --git a/middleman-more/fixtures/indexable-app/source/leave_me_alone.html b/middleman-more/fixtures/indexable-app/source/leave_me_alone.html deleted file mode 100644 index 163cebf8..00000000 --- a/middleman-more/fixtures/indexable-app/source/leave_me_alone.html +++ /dev/null @@ -1 +0,0 @@ -Stay away \ No newline at end of file diff --git a/middleman-more/fixtures/indexable-app/source/needs_index.html b/middleman-more/fixtures/indexable-app/source/needs_index.html deleted file mode 100644 index 1eeec11b..00000000 --- a/middleman-more/fixtures/indexable-app/source/needs_index.html +++ /dev/null @@ -1 +0,0 @@ -Indexable \ No newline at end of file diff --git a/middleman-more/fixtures/indexable-app/source/regular/index.html b/middleman-more/fixtures/indexable-app/source/regular/index.html deleted file mode 100644 index ea9503c0..00000000 --- a/middleman-more/fixtures/indexable-app/source/regular/index.html +++ /dev/null @@ -1 +0,0 @@ -Regular \ No newline at end of file diff --git a/middleman-more/fixtures/indexable-app/source/wildcard_leave_me_alone.html b/middleman-more/fixtures/indexable-app/source/wildcard_leave_me_alone.html deleted file mode 100644 index 5ff5317a..00000000 --- a/middleman-more/fixtures/indexable-app/source/wildcard_leave_me_alone.html +++ /dev/null @@ -1 +0,0 @@ -Stay away, wildcards! diff --git a/middleman-more/fixtures/passthrough-app/source/.htaccess b/middleman-more/fixtures/passthrough-app/source/.htaccess deleted file mode 100644 index 875bc5c4..00000000 --- a/middleman-more/fixtures/passthrough-app/source/.htaccess +++ /dev/null @@ -1 +0,0 @@ -# I'm an htaccess file! \ No newline at end of file diff --git a/middleman-more/lib/middleman_extension.rb b/middleman-more/lib/middleman_extension.rb deleted file mode 100644 index 08087602..00000000 --- a/middleman-more/lib/middleman_extension.rb +++ /dev/null @@ -1 +0,0 @@ -require "middleman-more" diff --git a/middleman-more/middleman-more.gemspec b/middleman-more/middleman-more.gemspec deleted file mode 100644 index de2b5d73..00000000 --- a/middleman-more/middleman-more.gemspec +++ /dev/null @@ -1,29 +0,0 @@ -# -*- encoding: utf-8 -*- -require File.expand_path("../../middleman-core/lib/middleman-core/version.rb", __FILE__) - -Gem::Specification.new do |s| - s.name = "middleman-more" - s.version = Middleman::VERSION - s.platform = Gem::Platform::RUBY - s.license = "MIT" - s.authors = ["Thomas Reynolds", "Ben Hollis"] - s.email = ["me@tdreyno.com", "ben@benhollis.net"] - s.homepage = "http://middlemanapp.com" - s.summary = "Hand-crafted frontend development" - s.description = "A static site generator. Provides 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." - - s.files = `git ls-files -z`.split("\0") - s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0") - s.require_paths = ["lib"] - - s.add_dependency("middleman-core", Middleman::VERSION) - s.add_dependency("uglifier", ["~> 2.0.1"]) - s.add_dependency("haml", [">= 3.1.6"]) - s.add_dependency("sass", [">= 3.1.20"]) - s.add_dependency("compass", [">= 0.12.2"]) - s.add_dependency("coffee-script", ["~> 2.2.0"]) - s.add_dependency("execjs", ["~> 1.4.0"]) - s.add_dependency("kramdown", ["~> 1.0.0"]) - s.add_dependency("i18n", ["~> 0.6.1"]) - s.add_dependency("padrino-helpers", ["0.10.7"]) -end \ No newline at end of file diff --git a/middleman-more/spec/middleman-more/future_spec.rb b/middleman-more/spec/middleman-more/future_spec.rb deleted file mode 100644 index e69de29b..00000000 diff --git a/middleman-more/spec/spec_helper.rb b/middleman-more/spec/spec_helper.rb deleted file mode 100644 index e69de29b..00000000 diff --git a/middleman/lib/middleman.rb b/middleman/lib/middleman.rb index f33e9a75..a3f88737 100644 --- a/middleman/lib/middleman.rb +++ b/middleman/lib/middleman.rb @@ -1,6 +1,4 @@ -# Depends on both libraries require "middleman-core" -require "middleman-more" # Make the VERSION string available require "middleman-core/version" diff --git a/middleman/middleman.gemspec b/middleman/middleman.gemspec index 3b64a1b9..64023cc3 100644 --- a/middleman/middleman.gemspec +++ b/middleman/middleman.gemspec @@ -18,7 +18,13 @@ Gem::Specification.new do |s| s.require_paths = ["lib"] s.add_dependency("middleman-core", Middleman::VERSION) - s.add_dependency("middleman-more", Middleman::VERSION) s.add_dependency("middleman-sprockets", ">= 3.0.10") + s.add_dependency("haml", [">= 3.1.6"]) + s.add_dependency("sass", [">= 3.1.20"]) + s.add_dependency("compass", [">= 0.12.2"]) + s.add_dependency("uglifier", ["~> 2.0.1"]) + s.add_dependency("coffee-script", ["~> 2.2.0"]) + s.add_dependency("execjs", ["~> 1.4.0"]) + s.add_dependency("kramdown", ["~> 1.0.0"]) + s.add_dependency("padrino-helpers", ["0.10.7"]) end -