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

Extract check for force to improve readability

This commit is contained in:
Casey Lang 2013-05-16 16:13:13 -05:00
parent 09eb0c5718
commit 00dd37d2e4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/jekyll/commands/new.rb
View File

@ -8,7 +8,7 @@ module Jekyll
new_blog_path = File.expand_path(args.join(" "), Dir.pwd) new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
FileUtils.mkdir_p new_blog_path FileUtils.mkdir_p new_blog_path
if !options[:force] && !Dir["#{new_blog_path}/**/*"].empty? if preserve_source_location(new_blog_path, options)
Jekyll::Stevenson.error "Conflict:", "#{new_blog_path} exists and is not empty." Jekyll::Stevenson.error "Conflict:", "#{new_blog_path} exists and is not empty."
exit(1) exit(1)
end end
@ -33,6 +33,11 @@ module Jekyll
end end
private private
def self.preserve_source_location(path, options)
!options[:force] && !Dir["#{path}/**/*"].empty?
end
def self.create_sample_files(path) def self.create_sample_files(path)
FileUtils.cp_r site_template + '/.', path FileUtils.cp_r site_template + '/.', path
FileUtils.rm File.expand_path(scaffold_path, path) FileUtils.rm File.expand_path(scaffold_path, path)