From 5b8c7a249444ea1be43062a1b5d8be0773d1ebce Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Thu, 23 May 2013 15:59:26 -0700 Subject: [PATCH] move vendored gems into shared root --- .yardopts | 2 +- Gemfile | 3 +++ Rakefile | 18 ++++++++++++------ .../lib/middleman-core/application.rb | 2 +- .../core_extensions/default_helpers.rb | 4 ++-- .../extensions/automatic_image_sizes.rb | 2 +- .../fastimage.rb | 0 .../hooks-0.2.0/CHANGES.textile | 0 .../hooks-0.2.0/Gemfile | 0 .../hooks-0.2.0/README.rdoc | 0 .../hooks-0.2.0/Rakefile | 0 .../hooks-0.2.0/hooks.gemspec | 0 .../hooks-0.2.0/lib/hooks.rb | 0 .../lib/hooks/inheritable_attribute.rb | 0 .../hooks-0.2.0/test/hooks_test.rb | 0 .../test/inheritable_attribute_test.rb | 0 .../hooks-0.2.0/test/test_helper.rb | 0 .../padrino-core-0.10.7/.document | 0 .../padrino-core-0.10.7/.gitignore | 0 .../padrino-core-0.10.7/.yardopts | 0 .../padrino-core-0.10.7/LICENSE.txt | 0 .../padrino-core-0.10.7/README.rdoc | 0 .../padrino-core-0.10.7/Rakefile | 0 .../padrino-core-0.10.7/bin/padrino | 0 .../padrino-core-0.10.7/lib/padrino-core.rb | 0 .../lib/padrino-core/application.rb | 0 .../lib/padrino-core/application/rendering.rb | 0 .../lib/padrino-core/application/routing.rb | 0 .../application/showexceptions.rb | 0 .../lib/padrino-core/caller.rb | 0 .../lib/padrino-core/cli/adapter.rb | 0 .../lib/padrino-core/cli/base.rb | 0 .../lib/padrino-core/cli/console.rb | 0 .../lib/padrino-core/cli/rake.rb | 0 .../lib/padrino-core/cli/rake_tasks.rb | 0 .../lib/padrino-core/command.rb | 0 .../lib/padrino-core/images/404.png | Bin .../lib/padrino-core/images/500.png | Bin .../lib/padrino-core/loader.rb | 0 .../lib/padrino-core/locale/cs.yml | 0 .../lib/padrino-core/locale/da.yml | 0 .../lib/padrino-core/locale/de.yml | 0 .../lib/padrino-core/locale/en.yml | 0 .../lib/padrino-core/locale/es.yml | 0 .../lib/padrino-core/locale/fr.yml | 0 .../lib/padrino-core/locale/hu.yml | 0 .../lib/padrino-core/locale/it.yml | 0 .../lib/padrino-core/locale/ja.yml | 0 .../lib/padrino-core/locale/lv.yml | 0 .../lib/padrino-core/locale/nl.yml | 0 .../lib/padrino-core/locale/no.yml | 0 .../lib/padrino-core/locale/pl.yml | 0 .../lib/padrino-core/locale/pt_br.yml | 0 .../lib/padrino-core/locale/ro.yml | 0 .../lib/padrino-core/locale/ru.yml | 0 .../lib/padrino-core/locale/sv.yml | 0 .../lib/padrino-core/locale/tr.yml | 0 .../lib/padrino-core/locale/uk.yml | 0 .../lib/padrino-core/locale/zh_cn.yml | 0 .../lib/padrino-core/locale/zh_tw.yml | 0 .../lib/padrino-core/logger.rb | 0 .../lib/padrino-core/mounter.rb | 0 .../lib/padrino-core/reloader.rb | 0 .../lib/padrino-core/router.rb | 0 .../lib/padrino-core/server.rb | 0 .../lib/padrino-core/support_lite.rb | 0 .../lib/padrino-core/tasks.rb | 0 .../lib/padrino-core/version.rb | 0 .../padrino-core-0.10.7/padrino-core.gemspec | 0 .../test/fixtures/apps/.components | 0 .../test/fixtures/apps/.gitignore | 0 .../test/fixtures/apps/complex.rb | 0 .../test/fixtures/apps/simple.rb | 0 .../test/fixtures/dependencies/a.rb | 0 .../test/fixtures/dependencies/b.rb | 0 .../test/fixtures/dependencies/c.rb | 0 .../test/fixtures/dependencies/circular/e.rb | 0 .../test/fixtures/dependencies/circular/f.rb | 0 .../test/fixtures/dependencies/circular/g.rb | 0 .../test/fixtures/dependencies/d.rb | 0 .../padrino-core-0.10.7/test/helper.rb | 0 .../padrino-core-0.10.7/test/mini_shoulda.rb | 0 .../test/test_application.rb | 0 .../padrino-core-0.10.7/test/test_core.rb | 0 .../test/test_dependencies.rb | 0 .../padrino-core-0.10.7/test/test_filters.rb | 0 .../padrino-core-0.10.7/test/test_locale.rb | 0 .../padrino-core-0.10.7/test/test_logger.rb | 0 .../padrino-core-0.10.7/test/test_mounter.rb | 0 .../test/test_reloader_complex.rb | 0 .../test/test_reloader_simple.rb | 0 .../test/test_rendering.rb | 0 .../test/test_restful_routing.rb | 0 .../padrino-core-0.10.7/test/test_router.rb | 0 .../padrino-core-0.10.7/test/test_routing.rb | 0 .../padrino-helpers-0.10.7/.document | 0 .../padrino-helpers-0.10.7/.gitignore | 0 .../padrino-helpers-0.10.7/.yardopts | 0 .../padrino-helpers-0.10.7/LICENSE.txt | 0 .../padrino-helpers-0.10.7/README.rdoc | 0 .../padrino-helpers-0.10.7/Rakefile | 0 .../lib/padrino-helpers.rb | 0 .../lib/padrino-helpers/asset_tag_helpers.rb | 0 .../form_builder/abstract_form_builder.rb | 0 .../form_builder/standard_form_builder.rb | 0 .../lib/padrino-helpers/form_helpers.rb | 0 .../lib/padrino-helpers/format_helpers.rb | 0 .../lib/padrino-helpers/locale/cs.yml | 0 .../lib/padrino-helpers/locale/da.yml | 0 .../lib/padrino-helpers/locale/de.yml | 0 .../lib/padrino-helpers/locale/en.yml | 0 .../lib/padrino-helpers/locale/es.yml | 0 .../lib/padrino-helpers/locale/fr.yml | 0 .../lib/padrino-helpers/locale/hu.yml | 0 .../lib/padrino-helpers/locale/it.yml | 0 .../lib/padrino-helpers/locale/ja.yml | 0 .../lib/padrino-helpers/locale/lv.yml | 0 .../lib/padrino-helpers/locale/nl.yml | 0 .../lib/padrino-helpers/locale/no.yml | 0 .../lib/padrino-helpers/locale/pl.yml | 0 .../lib/padrino-helpers/locale/pt_br.yml | 0 .../lib/padrino-helpers/locale/ro.yml | 0 .../lib/padrino-helpers/locale/ru.yml | 0 .../lib/padrino-helpers/locale/sv.yml | 0 .../lib/padrino-helpers/locale/tr.yml | 0 .../lib/padrino-helpers/locale/uk.yml | 0 .../lib/padrino-helpers/locale/zh_cn.yml | 0 .../lib/padrino-helpers/locale/zh_tw.yml | 0 .../lib/padrino-helpers/number_helpers.rb | 0 .../lib/padrino-helpers/output_helpers.rb | 0 .../output_helpers/abstract_handler.rb | 0 .../output_helpers/erb_handler.rb | 0 .../output_helpers/haml_handler.rb | 0 .../output_helpers/slim_handler.rb | 0 .../lib/padrino-helpers/render_helpers.rb | 0 .../lib/padrino-helpers/tag_helpers.rb | 0 .../padrino-helpers/translation_helpers.rb | 0 .../padrino-helpers.gemspec | 0 .../test/fixtures/markup_app/app.rb | 0 .../markup_app/views/capture_concat.erb | 0 .../markup_app/views/capture_concat.haml | 0 .../markup_app/views/capture_concat.slim | 0 .../fixtures/markup_app/views/content_for.erb | 0 .../markup_app/views/content_for.haml | 0 .../markup_app/views/content_for.slim | 0 .../fixtures/markup_app/views/content_tag.erb | 0 .../markup_app/views/content_tag.haml | 0 .../markup_app/views/content_tag.slim | 0 .../markup_app/views/current_engine.erb | 0 .../markup_app/views/current_engine.haml | 0 .../markup_app/views/current_engine.slim | 0 .../fixtures/markup_app/views/fields_for.erb | 0 .../fixtures/markup_app/views/fields_for.haml | 0 .../fixtures/markup_app/views/fields_for.slim | 0 .../fixtures/markup_app/views/form_for.erb | 0 .../fixtures/markup_app/views/form_for.haml | 0 .../fixtures/markup_app/views/form_for.slim | 0 .../fixtures/markup_app/views/form_tag.erb | 0 .../fixtures/markup_app/views/form_tag.haml | 0 .../fixtures/markup_app/views/form_tag.slim | 0 .../fixtures/markup_app/views/link_to.erb | 0 .../fixtures/markup_app/views/link_to.haml | 0 .../fixtures/markup_app/views/link_to.slim | 0 .../fixtures/markup_app/views/mail_to.erb | 0 .../fixtures/markup_app/views/mail_to.haml | 0 .../fixtures/markup_app/views/mail_to.slim | 0 .../fixtures/markup_app/views/meta_tag.erb | 0 .../fixtures/markup_app/views/meta_tag.haml | 0 .../fixtures/markup_app/views/meta_tag.slim | 0 .../markup_app/views/partials/_erb.erb | 0 .../markup_app/views/partials/_haml.haml | 0 .../markup_app/views/partials/_slim.slim | 0 .../markup_app/views/simple_partial.erb | 0 .../markup_app/views/simple_partial.haml | 0 .../markup_app/views/simple_partial.slim | 0 .../test/fixtures/render_app/app.rb | 0 .../render_app/views/current_engine.haml | 0 .../render_app/views/current_engines/_erb.erb | 0 .../views/current_engines/_haml.haml | 0 .../views/current_engines/_slim.slim | 0 .../fixtures/render_app/views/erb/test.erb | 0 .../render_app/views/explicit_engine.haml | 0 .../fixtures/render_app/views/haml/test.haml | 0 .../render_app/views/template/_user.haml | 0 .../views/template/haml_template.haml | 0 .../views/template/some_template.haml | 0 .../padrino-helpers-0.10.7/test/helper.rb | 0 .../test/test_asset_tag_helpers.rb | 0 .../test/test_form_builder.rb | 0 .../test/test_form_helpers.rb | 0 .../test/test_format_helpers.rb | 0 .../test/test_locale.rb | 0 .../test/test_number_helpers.rb | 0 .../test/test_output_helpers.rb | 0 .../test/test_render_helpers.rb | 0 .../test/test_tag_helpers.rb | 0 196 files changed, 20 insertions(+), 11 deletions(-) rename middleman-core/lib/{middleman-more/extensions/automatic_image_sizes => vendored-middleman-deps}/fastimage.rb (100%) rename middleman-core/lib/{middleman-core/vendor => vendored-middleman-deps}/hooks-0.2.0/CHANGES.textile (100%) rename middleman-core/lib/{middleman-core/vendor => vendored-middleman-deps}/hooks-0.2.0/Gemfile (100%) rename middleman-core/lib/{middleman-core/vendor => vendored-middleman-deps}/hooks-0.2.0/README.rdoc (100%) rename middleman-core/lib/{middleman-core/vendor => vendored-middleman-deps}/hooks-0.2.0/Rakefile (100%) rename middleman-core/lib/{middleman-core/vendor => vendored-middleman-deps}/hooks-0.2.0/hooks.gemspec (100%) rename middleman-core/lib/{middleman-core/vendor => vendored-middleman-deps}/hooks-0.2.0/lib/hooks.rb (100%) rename middleman-core/lib/{middleman-core/vendor => vendored-middleman-deps}/hooks-0.2.0/lib/hooks/inheritable_attribute.rb (100%) rename middleman-core/lib/{middleman-core/vendor => vendored-middleman-deps}/hooks-0.2.0/test/hooks_test.rb (100%) rename middleman-core/lib/{middleman-core/vendor => vendored-middleman-deps}/hooks-0.2.0/test/inheritable_attribute_test.rb (100%) rename middleman-core/lib/{middleman-core/vendor => vendored-middleman-deps}/hooks-0.2.0/test/test_helper.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/.document (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/.gitignore (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/.yardopts (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/LICENSE.txt (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/README.rdoc (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/Rakefile (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/bin/padrino (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/application.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/application/rendering.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/application/routing.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/application/showexceptions.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/caller.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/cli/adapter.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/cli/base.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/cli/console.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/cli/rake.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/cli/rake_tasks.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/command.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/images/404.png (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/images/500.png (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/loader.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/cs.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/da.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/de.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/en.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/es.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/fr.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/hu.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/it.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/ja.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/lv.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/nl.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/no.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/pl.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/pt_br.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/ro.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/ru.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/sv.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/tr.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/uk.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/zh_cn.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/locale/zh_tw.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/logger.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/mounter.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/reloader.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/router.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/server.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/support_lite.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/tasks.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/lib/padrino-core/version.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/padrino-core.gemspec (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/fixtures/apps/.components (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/fixtures/apps/.gitignore (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/fixtures/apps/complex.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/fixtures/apps/simple.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/fixtures/dependencies/a.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/fixtures/dependencies/b.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/fixtures/dependencies/c.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/fixtures/dependencies/circular/e.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/fixtures/dependencies/circular/f.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/fixtures/dependencies/circular/g.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/fixtures/dependencies/d.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/helper.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/mini_shoulda.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_application.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_core.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_dependencies.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_filters.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_locale.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_logger.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_mounter.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_reloader_complex.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_reloader_simple.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_rendering.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_restful_routing.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_router.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-core-0.10.7/test/test_routing.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/.document (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/.gitignore (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/.yardopts (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/LICENSE.txt (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/README.rdoc (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/Rakefile (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/asset_tag_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/form_builder/abstract_form_builder.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/form_builder/standard_form_builder.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/form_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/format_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/cs.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/da.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/de.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/en.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/es.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/fr.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/hu.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/it.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ja.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/lv.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/nl.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/no.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/pl.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/pt_br.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ro.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ru.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/sv.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/tr.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/uk.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/zh_cn.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/locale/zh_tw.yml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/number_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/abstract_handler.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/erb_handler.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/haml_handler.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/slim_handler.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/render_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/tag_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/lib/padrino-helpers/translation_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/padrino-helpers.gemspec (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/app.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_erb.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_haml.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_slim.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/render_app/app.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engine.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_erb.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_haml.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_slim.slim (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/render_app/views/erb/test.erb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/render_app/views/explicit_engine.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/render_app/views/haml/test.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/_user.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/haml_template.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/some_template.haml (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/helper.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/test_asset_tag_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/test_form_builder.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/test_form_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/test_format_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/test_locale.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/test_number_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/test_output_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/test_render_helpers.rb (100%) rename middleman-core/lib/{middleman-more/vendor => vendored-middleman-deps}/padrino-helpers-0.10.7/test/test_tag_helpers.rb (100%) diff --git a/.yardopts b/.yardopts index 8565fb5d..a8fed6b1 100644 --- a/.yardopts +++ b/.yardopts @@ -1,5 +1,5 @@ middleman-*/lib/**/*.rb ---exclude middleman-core/lib/middleman-core/vendor/ +--exclude middleman-core/lib/vendored-middleman-deps/ --exclude middleman-core/lib/middleman-core/extensions/automatic_image_sizes/fastimage.rb --exclude middleman-core/lib/middleman-core/step_definitions --exclude middleman-core/lib/middleman-core/templates/default/ diff --git a/Gemfile b/Gemfile index 3cbd26a0..90fac6b2 100644 --- a/Gemfile +++ b/Gemfile @@ -27,6 +27,9 @@ platforms :jruby do gem "therubyrhino" end +# Code Quality +gem "cane", :platforms => [:mri_19, :mri_20], :require => false + # Middleman itself gem "middleman-core", :path => "middleman-core" gem "middleman-more", :path => "middleman-more" diff --git a/Rakefile b/Rakefile index 32972d68..bec43d2b 100644 --- a/Rakefile +++ b/Rakefile @@ -94,12 +94,18 @@ task :spec do end end -# desc "Rune cane for all middleman gems" -# task :cane do -# GEM_PATHS.each do |g| -# sh "cd #{File.join(ROOT, g)} && #{Gem.ruby} -S cane" -# end -# end +begin + require 'cane/rake_task' + + desc "Run cane to check quality metrics" + Cane::RakeTask.new(:quality) do |cane| + cane.no_style = true + cane.no_doc = true + cane.abc_glob = "middleman*/lib/middleman*/**/*.rb" + end +rescue LoadError + # warn "cane not available, quality task not provided." +end desc "Run tests for all middleman gems" task :default => :test diff --git a/middleman-core/lib/middleman-core/application.rb b/middleman-core/lib/middleman-core/application.rb index a033a5d8..a966e3f3 100644 --- a/middleman-core/lib/middleman-core/application.rb +++ b/middleman-core/lib/middleman-core/application.rb @@ -10,7 +10,7 @@ require "active_support/core_ext/integer/inflections" require "active_support/core_ext/float/rounding" # Simple callback library -require "middleman-core/vendor/hooks-0.2.0/lib/hooks" +require "vendored-middleman-deps/hooks-0.2.0/lib/hooks" require "middleman-core/sitemap" diff --git a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb index 096558c8..f9069f68 100644 --- a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb +++ b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb @@ -4,8 +4,8 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension super require 'active_support/core_ext/object/to_query' - require 'middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/support_lite' - require 'middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers' + require 'vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/support_lite' + require 'vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers' app.helpers ::Padrino::Helpers::OutputHelpers app.helpers ::Padrino::Helpers::TagHelpers diff --git a/middleman-core/lib/middleman-more/extensions/automatic_image_sizes.rb b/middleman-core/lib/middleman-more/extensions/automatic_image_sizes.rb index 93a2f58c..22d75061 100644 --- a/middleman-core/lib/middleman-more/extensions/automatic_image_sizes.rb +++ b/middleman-core/lib/middleman-more/extensions/automatic_image_sizes.rb @@ -5,7 +5,7 @@ class Middleman::Extensions::AutomaticImageSizes < ::Middleman::Extension super # Include 3rd-party fastimage library - require "middleman-more/extensions/automatic_image_sizes/fastimage" + require "vendored-middleman-deps/fastimage" end helpers do diff --git a/middleman-core/lib/middleman-more/extensions/automatic_image_sizes/fastimage.rb b/middleman-core/lib/vendored-middleman-deps/fastimage.rb similarity index 100% rename from middleman-core/lib/middleman-more/extensions/automatic_image_sizes/fastimage.rb rename to middleman-core/lib/vendored-middleman-deps/fastimage.rb diff --git a/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/CHANGES.textile b/middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/CHANGES.textile similarity index 100% rename from middleman-core/lib/middleman-core/vendor/hooks-0.2.0/CHANGES.textile rename to middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/CHANGES.textile diff --git a/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/Gemfile b/middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/Gemfile similarity index 100% rename from middleman-core/lib/middleman-core/vendor/hooks-0.2.0/Gemfile rename to middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/Gemfile diff --git a/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/README.rdoc b/middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/README.rdoc similarity index 100% rename from middleman-core/lib/middleman-core/vendor/hooks-0.2.0/README.rdoc rename to middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/README.rdoc diff --git a/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/Rakefile b/middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/Rakefile similarity index 100% rename from middleman-core/lib/middleman-core/vendor/hooks-0.2.0/Rakefile rename to middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/Rakefile diff --git a/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/hooks.gemspec b/middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/hooks.gemspec similarity index 100% rename from middleman-core/lib/middleman-core/vendor/hooks-0.2.0/hooks.gemspec rename to middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/hooks.gemspec diff --git a/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/lib/hooks.rb b/middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/lib/hooks.rb similarity index 100% rename from middleman-core/lib/middleman-core/vendor/hooks-0.2.0/lib/hooks.rb rename to middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/lib/hooks.rb diff --git a/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/lib/hooks/inheritable_attribute.rb b/middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/lib/hooks/inheritable_attribute.rb similarity index 100% rename from middleman-core/lib/middleman-core/vendor/hooks-0.2.0/lib/hooks/inheritable_attribute.rb rename to middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/lib/hooks/inheritable_attribute.rb diff --git a/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/hooks_test.rb b/middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/test/hooks_test.rb similarity index 100% rename from middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/hooks_test.rb rename to middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/test/hooks_test.rb diff --git a/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/inheritable_attribute_test.rb b/middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/test/inheritable_attribute_test.rb similarity index 100% rename from middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/inheritable_attribute_test.rb rename to middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/test/inheritable_attribute_test.rb diff --git a/middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/test_helper.rb b/middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/test/test_helper.rb similarity index 100% rename from middleman-core/lib/middleman-core/vendor/hooks-0.2.0/test/test_helper.rb rename to middleman-core/lib/vendored-middleman-deps/hooks-0.2.0/test/test_helper.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/.document b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/.document similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/.document rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/.document diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/.gitignore b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/.gitignore similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/.gitignore rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/.gitignore diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/.yardopts b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/.yardopts similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/.yardopts rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/.yardopts diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/LICENSE.txt b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/LICENSE.txt similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/LICENSE.txt rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/LICENSE.txt diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/README.rdoc b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/README.rdoc similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/README.rdoc rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/README.rdoc diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/Rakefile b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/Rakefile similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/Rakefile rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/Rakefile diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/bin/padrino b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/bin/padrino similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/bin/padrino rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/bin/padrino diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/application.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/application.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/application.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/application.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/application/rendering.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/application/rendering.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/application/rendering.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/application/rendering.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/application/routing.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/application/routing.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/application/routing.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/application/routing.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/application/showexceptions.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/application/showexceptions.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/application/showexceptions.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/application/showexceptions.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/caller.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/caller.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/caller.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/caller.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/cli/adapter.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/cli/adapter.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/cli/adapter.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/cli/adapter.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/cli/base.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/cli/base.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/cli/base.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/cli/base.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/cli/console.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/cli/console.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/cli/console.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/cli/console.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/cli/rake.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/cli/rake.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/cli/rake.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/cli/rake.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/cli/rake_tasks.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/cli/rake_tasks.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/cli/rake_tasks.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/cli/rake_tasks.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/command.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/command.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/command.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/command.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/images/404.png b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/images/404.png similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/images/404.png rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/images/404.png diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/images/500.png b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/images/500.png similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/images/500.png rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/images/500.png diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/loader.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/loader.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/loader.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/loader.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/cs.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/cs.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/cs.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/cs.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/da.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/da.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/da.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/da.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/de.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/de.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/de.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/de.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/en.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/en.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/en.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/en.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/es.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/es.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/es.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/es.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/fr.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/fr.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/fr.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/fr.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/hu.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/hu.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/hu.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/hu.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/it.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/it.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/it.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/it.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/ja.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/ja.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/ja.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/ja.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/lv.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/lv.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/lv.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/lv.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/nl.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/nl.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/nl.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/nl.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/no.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/no.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/no.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/no.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/pl.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/pl.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/pl.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/pl.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/pt_br.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/pt_br.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/pt_br.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/pt_br.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/ro.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/ro.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/ro.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/ro.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/ru.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/ru.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/ru.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/ru.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/sv.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/sv.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/sv.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/sv.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/tr.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/tr.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/tr.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/tr.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/uk.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/uk.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/uk.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/uk.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/zh_cn.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/zh_cn.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/zh_cn.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/zh_cn.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/zh_tw.yml b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/zh_tw.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/locale/zh_tw.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/locale/zh_tw.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/logger.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/logger.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/logger.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/logger.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/mounter.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/mounter.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/mounter.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/mounter.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/reloader.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/reloader.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/reloader.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/reloader.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/router.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/router.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/router.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/router.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/server.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/server.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/server.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/server.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/support_lite.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/support_lite.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/support_lite.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/support_lite.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/tasks.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/tasks.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/tasks.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/tasks.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/version.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/version.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/lib/padrino-core/version.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/version.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/padrino-core.gemspec b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/padrino-core.gemspec similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/padrino-core.gemspec rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/padrino-core.gemspec diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/apps/.components b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/apps/.components similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/apps/.components rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/apps/.components diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/apps/.gitignore b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/apps/.gitignore similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/apps/.gitignore rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/apps/.gitignore diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/apps/complex.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/apps/complex.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/apps/complex.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/apps/complex.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/apps/simple.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/apps/simple.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/apps/simple.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/apps/simple.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/a.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/a.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/a.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/a.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/b.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/b.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/b.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/b.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/c.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/c.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/c.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/c.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/circular/e.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/circular/e.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/circular/e.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/circular/e.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/circular/f.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/circular/f.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/circular/f.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/circular/f.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/circular/g.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/circular/g.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/circular/g.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/circular/g.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/d.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/d.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/fixtures/dependencies/d.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/fixtures/dependencies/d.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/helper.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/helper.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/helper.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/helper.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/mini_shoulda.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/mini_shoulda.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/mini_shoulda.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/mini_shoulda.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_application.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_application.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_application.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_application.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_core.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_core.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_core.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_core.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_dependencies.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_dependencies.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_dependencies.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_dependencies.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_filters.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_filters.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_filters.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_filters.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_locale.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_locale.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_locale.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_locale.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_logger.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_logger.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_logger.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_logger.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_mounter.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_mounter.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_mounter.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_mounter.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_reloader_complex.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_reloader_complex.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_reloader_complex.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_reloader_complex.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_reloader_simple.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_reloader_simple.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_reloader_simple.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_reloader_simple.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_rendering.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_rendering.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_rendering.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_rendering.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_restful_routing.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_restful_routing.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_restful_routing.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_restful_routing.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_router.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_router.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_router.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_router.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_routing.rb b/middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_routing.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-core-0.10.7/test/test_routing.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-core-0.10.7/test/test_routing.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/.document b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/.document similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/.document rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/.document diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/.gitignore b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/.gitignore similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/.gitignore rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/.gitignore diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/.yardopts b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/.yardopts similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/.yardopts rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/.yardopts diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/LICENSE.txt b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/LICENSE.txt similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/LICENSE.txt rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/LICENSE.txt diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/README.rdoc b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/README.rdoc similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/README.rdoc rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/README.rdoc diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/Rakefile b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/Rakefile similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/Rakefile rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/Rakefile diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/asset_tag_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/asset_tag_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/asset_tag_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/asset_tag_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/form_builder/abstract_form_builder.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/form_builder/abstract_form_builder.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/form_builder/abstract_form_builder.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/form_builder/abstract_form_builder.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/form_builder/standard_form_builder.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/form_builder/standard_form_builder.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/form_builder/standard_form_builder.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/form_builder/standard_form_builder.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/form_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/form_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/form_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/form_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/format_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/format_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/format_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/format_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/cs.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/cs.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/cs.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/cs.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/da.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/da.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/da.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/da.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/de.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/de.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/de.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/de.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/en.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/en.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/en.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/en.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/es.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/es.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/es.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/es.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/fr.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/fr.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/fr.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/fr.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/hu.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/hu.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/hu.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/hu.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/it.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/it.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/it.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/it.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ja.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ja.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ja.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ja.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/lv.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/lv.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/lv.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/lv.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/nl.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/nl.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/nl.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/nl.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/no.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/no.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/no.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/no.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/pl.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/pl.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/pl.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/pl.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/pt_br.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/pt_br.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/pt_br.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/pt_br.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ro.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ro.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ro.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ro.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ru.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ru.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ru.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/ru.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/sv.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/sv.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/sv.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/sv.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/tr.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/tr.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/tr.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/tr.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/uk.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/uk.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/uk.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/uk.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/zh_cn.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/zh_cn.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/zh_cn.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/zh_cn.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/zh_tw.yml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/zh_tw.yml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/locale/zh_tw.yml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/locale/zh_tw.yml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/number_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/number_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/number_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/number_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/abstract_handler.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/abstract_handler.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/abstract_handler.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/abstract_handler.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/erb_handler.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/erb_handler.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/erb_handler.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/erb_handler.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/haml_handler.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/haml_handler.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/haml_handler.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/haml_handler.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/slim_handler.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/slim_handler.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/slim_handler.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/output_helpers/slim_handler.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/render_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/render_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/render_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/render_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/tag_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/tag_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/tag_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/tag_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/translation_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/translation_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/lib/padrino-helpers/translation_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers/translation_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/padrino-helpers.gemspec b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/padrino-helpers.gemspec similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/padrino-helpers.gemspec rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/padrino-helpers.gemspec diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/app.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/app.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/app.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/app.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/capture_concat.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_for.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/content_tag.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/current_engine.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/fields_for.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_for.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/form_tag.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/link_to.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/mail_to.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/meta_tag.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_erb.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_erb.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_erb.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_erb.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_haml.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_haml.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_haml.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_haml.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_slim.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_slim.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_slim.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/partials/_slim.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/markup_app/views/simple_partial.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/app.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/app.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/app.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/app.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engine.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engine.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engine.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engine.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_erb.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_erb.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_erb.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_erb.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_haml.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_haml.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_haml.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_haml.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_slim.slim b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_slim.slim similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_slim.slim rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/current_engines/_slim.slim diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/erb/test.erb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/erb/test.erb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/erb/test.erb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/erb/test.erb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/explicit_engine.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/explicit_engine.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/explicit_engine.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/explicit_engine.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/haml/test.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/haml/test.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/haml/test.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/haml/test.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/_user.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/_user.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/_user.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/_user.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/haml_template.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/haml_template.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/haml_template.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/haml_template.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/some_template.haml b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/some_template.haml similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/some_template.haml rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/fixtures/render_app/views/template/some_template.haml diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/helper.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/helper.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/helper.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/helper.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_asset_tag_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_asset_tag_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_asset_tag_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_asset_tag_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_form_builder.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_form_builder.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_form_builder.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_form_builder.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_form_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_form_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_form_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_form_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_format_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_format_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_format_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_format_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_locale.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_locale.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_locale.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_locale.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_number_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_number_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_number_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_number_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_output_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_output_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_output_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_output_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_render_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_render_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_render_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_render_helpers.rb diff --git a/middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_tag_helpers.rb b/middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_tag_helpers.rb similarity index 100% rename from middleman-core/lib/middleman-more/vendor/padrino-helpers-0.10.7/test/test_tag_helpers.rb rename to middleman-core/lib/vendored-middleman-deps/padrino-helpers-0.10.7/test/test_tag_helpers.rb