move vendored gems into shared root

.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/

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"

Rakefile

@@ -94,12 +94,18 @@ task :spec do
   end
 end
 
-# desc "Rune cane for all middleman gems"
+begin
-# task :cane do
+  require 'cane/rake_task'
-#   GEM_PATHS.each do |g|
+
-#     sh "cd #{File.join(ROOT, g)} && #{Gem.ruby} -S cane"
+  desc "Run cane to check quality metrics"
-#   end
+  Cane::RakeTask.new(:quality) do |cane|
-# end
+    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

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"
 

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 'vendored-middleman-deps/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-helpers-0.10.7/lib/padrino-helpers'
 
     app.helpers ::Padrino::Helpers::OutputHelpers
     app.helpers ::Padrino::Helpers::TagHelpers

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