dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly select dotfiles during directory scan. 

Fixes #363.
Fixes #431.
Fixes #377.
This commit is contained in:
Tom Preston-Werner 2012-01-23 00:18:19 -08:00
parent e27e2554d9
commit 9d70088f01
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
History.txt
View File

@ -8,6 +8,7 @@
* Allow some special characters in highlight names * Allow some special characters in highlight names
* URL escape category names in URL generation (#360) * URL escape category names in URL generation (#360)
* Fix error with limit_posts (#442) * Fix error with limit_posts (#442)
* Properly select dotfile during directory scan (#363, #431, #377)
== 0.11.2 / 2011-12-27 == 0.11.2 / 2011-12-27
* Bug Fixes * Bug Fixes

6
features/create_sites.feature
View File

@ -104,3 +104,9 @@ Feature: Create sites
When I run jekyll When I run jekyll
Then the _site directory should exist Then the _site directory should exist
And I should see "URL: /2020/01/31/entry2/" in "_site/index.html" And I should see "URL: /2020/01/31/entry2/" in "_site/index.html"
Scenario: Basic site with whitelisted dotfile
Given I have an ".htaccess" file that contains "SomeDirective"
When I run jekyll
Then the _site directory should exist
And I should see "SomeDirective" in "_site/.htaccess"

12
features/site_configuration.feature
View File

@ -131,3 +131,15 @@ Feature: Site configuration
And the "_site/2009/04/05/bananas.html" file should exist And the "_site/2009/04/05/bananas.html" file should exist
And the "_site/2009/04/01/oranges.html" file should exist And the "_site/2009/04/01/oranges.html" file should exist
And the "_site/2009/03/27/apples.html" file should not exist And the "_site/2009/03/27/apples.html" file should not exist
Scenario: Copy over normally excluded files when they are explicitly included
Given I have a ".gitignore" file that contains ".DS_Store"
And I have an ".htaccess" file that contains "SomeDirective"
And I have a configuration file with "include" set to:
| value |
| .gitignore |
| .foo |
When I run jekyll
Then the _site directory should exist
And I should see ".DS_Store" in "_site/.gitignore"
And the "_site/.htaccess" file should not exist

2
lib/jekyll/site.rb
View File

@ -124,7 +124,7 @@ module Jekyll
# Returns nothing. # Returns nothing.
def read_directories(dir = '') def read_directories(dir = '')
base = File.join(self.source, dir) base = File.join(self.source, dir)
entries = Dir.chdir(base) { filter_entries(Dir['*']) } entries = Dir.chdir(base) { filter_entries(Dir.entries('.')) }
self.read_posts(dir) self.read_posts(dir)