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

Add '--force' to 'new' command. Implements #1104

This commit is contained in:
Casey Lang 2013-05-15 17:29:27 -05:00
parent 98923f87b5
commit 2ce39bc20a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/jekyll Executable file → Normal file
View File

@ -37,8 +37,10 @@ command :new do |c|
c.syntax = 'jekyll new PATH' c.syntax = 'jekyll new PATH'
c.description = 'Creates a new Jekyll site scaffold in PATH' c.description = 'Creates a new Jekyll site scaffold in PATH'
c.option '--force', 'Force creation even if PATH already exists'
c.action do |args, options| c.action do |args, options|
Jekyll::Commands::New.process(args) Jekyll::Commands::New.process(args, options.__hash__)
end end
end end

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

@ -3,12 +3,12 @@ require 'erb'
module Jekyll module Jekyll
module Commands module Commands
class New < Command class New < Command
def self.process(args) def self.process(args, options = {})
raise ArgumentError.new('You must specify a path.') if args.empty? raise ArgumentError.new('You must specify a path.') if args.empty?
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
unless Dir["#{new_blog_path}/**/*"].empty? if !options[:force] && !Dir["#{new_blog_path}/**/*"].empty?
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