Merge pull request #5564 from jekyll/vendor-bundle

Merge pull request 5564

lib/jekyll/configuration.rb

@@ -17,7 +17,9 @@ module Jekyll
       # Handling Reading
       "safe"              => false,
       "include"           => [".htaccess"],
-      "exclude"           => %w(node_modules vendor),
+      "exclude"           => %w(
+        node_modules vendor/bundle/ vendor/cache/ vendor/gems/ vendor/ruby/
+      ),
       "keep_files"        => [".git", ".svn"],
       "encoding"          => "utf-8",
       "markdown_ext"      => "markdown,mkdown,mkdn,mkd,md",

lib/jekyll/entry_filter.rb

@@ -36,8 +36,7 @@ module Jekyll
     end
 
     def included?(entry)
-      glob_include?(site.include,
+      glob_include?(site.include, entry)
-        entry)
     end
 
     def special?(entry)
@@ -50,14 +49,14 @@ module Jekyll
     end
 
     def excluded?(entry)
-      excluded = glob_include?(site.exclude, relative_to_source(entry))
+      glob_include?(site.exclude, relative_to_source(entry)).tap do |excluded|
         if excluded
           Jekyll.logger.debug(
             "EntryFilter:",
             "excluded #{relative_to_source(entry)}"
           )
         end
-      excluded
+      end
     end
 
     # --

test/test_configuration.rb

@@ -52,6 +52,14 @@ class TestConfiguration < JekyllUnitTest
     should "exclude node_modules" do
       assert_includes Configuration.from({})["exclude"], "node_modules"
     end
+
+    should "exclude ruby vendor directories" do
+      exclude = Configuration.from({})["exclude"]
+      assert_includes exclude, "vendor/bundle/"
+      assert_includes exclude, "vendor/cache/"
+      assert_includes exclude, "vendor/gems/"
+      assert_includes exclude, "vendor/ruby/"
+    end
   end
 
   context "#add_default_collections" do