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

Checking the arguments to ensure we have a subcommand before proceeding. (#1008)

This commit is contained in:
Parker Moore 2013-04-30 22:17:15 +02:00
parent 463ea15a3e
commit c32b570114
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/jekyll/deprecator.rb
View File

@ -1,6 +1,7 @@
module Jekyll module Jekyll
class Deprecator class Deprecator
def self.process(args) def self.process(args)
no_subcommand(args)
deprecation_message args, "--server", "The --server command has been replaced by the \ deprecation_message args, "--server", "The --server command has been replaced by the \
'serve' subcommand." 'serve' subcommand."
deprecation_message args, "--no-server", "To build Jekyll without launching a server, \ deprecation_message args, "--no-server", "To build Jekyll without launching a server, \
@ -15,6 +16,14 @@ module Jekyll
deprecation_message args, "--url", "The 'url' setting can only be set in your config files." deprecation_message args, "--url", "The 'url' setting can only be set in your config files."
end end
def self.no_subcommand(args)
if args.size == 0 || args.first =~ /^--/
Jekyll::Logger.error "Deprecation:", "Jekyll now uses subcommands instead of just \
switches. Run `jekyll help' to find out more."
exit(1)
end
end
def self.deprecation_message(args, deprecated_argument, message) def self.deprecation_message(args, deprecated_argument, message)
if args.include?(deprecated_argument) if args.include?(deprecated_argument)
Jekyll::Logger.error "Deprecation:", message Jekyll::Logger.error "Deprecation:", message