Merge pull request #5860 from ashmaroli/exclude-patch

Merge pull request 5860
jekyll · Feb 11, 2017 · afe6e36 · afe6e36
2 parents 7b58bcf + 3745b24
commit afe6e36
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/features/site_configuration.feature b/features/site_configuration.feature
@@ -44,9 +44,11 @@ Feature: Site configuration
     Given I have an "Rakefile" file that contains "I want to be excluded"
     And I have an "README" file that contains "I want to be excluded"
     And I have an "index.html" file that contains "I want to be included"
+    And I have a "Gemfile" file that contains "gem 'include-me'"
     And I have a configuration file with "exclude" set to "['Rakefile', 'README']"
     When I run jekyll build
     Then I should see "I want to be included" in "_site/index.html"
+    And the "_site/Gemfile" file should exist
     And the "_site/Rakefile" file should not exist
     And the "_site/README" file should not exist
 

diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
@@ -18,7 +18,8 @@ class Configuration < Hash
       "safe"              => false,
       "include"           => [".htaccess"],
       "exclude"           => %w(
-        node_modules vendor/bundle/ vendor/cache/ vendor/gems/ vendor/ruby/
+        Gemfile Gemfile.lock node_modules vendor/bundle/ vendor/cache/ vendor/gems/
+        vendor/ruby/
       ),
       "keep_files"        => [".git", ".svn"],
       "encoding"          => "utf-8",

diff --git a/lib/site_template/_config.yml b/lib/site_template/_config.yml
@@ -29,6 +29,15 @@ markdown: kramdown
 theme: minima
 gems:
   - jekyll-feed
-exclude:
-  - Gemfile
-  - Gemfile.lock
+
+# Exclude from processing.
+# The following items will not be processed, by default. Create a custom list
+# to override the default setting.
+# exclude:
+#   - Gemfile
+#   - Gemfile.lock
+#   - node_modules
+#   - vendor/bundle/
+#   - vendor/cache/
+#   - vendor/gems/
+#   - vendor/ruby/
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
@@ -55,6 +55,8 @@ class TestConfiguration < JekyllUnitTest
 
     should "exclude ruby vendor directories" do
       exclude = Configuration.from({})["exclude"]
+      assert_includes exclude, "Gemfile"
+      assert_includes exclude, "Gemfile.lock"
       assert_includes exclude, "vendor/bundle/"
       assert_includes exclude, "vendor/cache/"
       assert_includes exclude, "vendor/gems/"