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

Merge pull request #3992 from jekyll/abort-before-confusing-msg 

Merge pull request 3992
This commit is contained in:
Parker Moore 2015-09-24 16:06:26 -07:00
parent 51f32502b9 c7bc76269c
commit e193f5a738
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/jekyll/deprecator.rb
View File

@ -3,9 +3,10 @@ module Jekyll
extend self extend self
def process(args) def process(args)
no_subcommand(args)
arg_is_present? args, "--server", "The --server command has been replaced by the \ arg_is_present? args, "--server", "The --server command has been replaced by the \
'serve' subcommand." 'serve' subcommand."
arg_is_present? args, "--serve", "The --server command has been replaced by the \
'serve' subcommand."
arg_is_present? args, "--no-server", "To build Jekyll without launching a server, \ arg_is_present? args, "--no-server", "To build Jekyll without launching a server, \
use the 'build' subcommand." use the 'build' subcommand."
arg_is_present? args, "--auto", "The switch '--auto' has been replaced with '--watch'." arg_is_present? args, "--auto", "The switch '--auto' has been replaced with '--watch'."
@ -16,12 +17,13 @@ module Jekyll
arg_is_present? args, "--paginate", "The 'paginate' setting can only be set in your \ arg_is_present? args, "--paginate", "The 'paginate' setting can only be set in your \
config files." config files."
arg_is_present? args, "--url", "The 'url' setting can only be set in your config files." arg_is_present? args, "--url", "The 'url' setting can only be set in your config files."
no_subcommand(args)
end end
def no_subcommand(args) def no_subcommand(args)
if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first) if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first)
deprecation_message "Jekyll now uses subcommands instead of just \ deprecation_message "Jekyll now uses subcommands instead of just switches. Run `jekyll --help` to find out more."
switches. Run `jekyll --help` to find out more." abort
end end
end end