From 4bae42a671ba549bf05b2eabbcb8d3fcf26da430 Mon Sep 17 00:00:00 2001
From: edeustace <ed.eustace@gmail.com>
Date: Sun, 9 Dec 2012 11:43:49 +0100
Subject: [PATCH] use Array.join instead of Array.inject, add .svn to defaults

---
 lib/jekyll.rb      | 2 +-
 lib/jekyll/site.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 50125b08..f74e428b 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -59,7 +59,7 @@ module Jekyll
     'source'       => Dir.pwd,
     'destination'  => File.join(Dir.pwd, '_site'),
     'plugins'      => File.join(Dir.pwd, '_plugins'),
-    'keep_files'   => ['.git'],
+    'keep_files'   => ['.git','.svn'],
     'layouts'      => '_layouts',
 
     'future'       => true,
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index b3490264..058e6e11 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -251,7 +251,7 @@ module Jekyll
     # create a regex from the keep_files array
     # ['.git','.svn'] => /\/(\.git|\/.svn)/
     def keep_file_regex
-      or_list = self.keep_files.map.inject("") { |x,y| "#{x}|#{y}" }[1..-1]
+      or_list = self.keep_files.join("|")
       pattern = "\/(#{or_list.gsub(".", "\.")})"
       Regexp.new pattern
     end