lib/octopress/commands/new.rb in octopress-3.0.0.alpha6 vs lib/octopress/commands/new.rb in octopress-3.0.0.alpha7

@@ -2,45 +2,47 @@
 
 module Octopress
   class New < Command
     def self.init_with_program(p)
       p.command(:new) do |c|
-        c.syntax 'octopress new PATH'
-        c.description 'Creates a new Jekyll site scaffold in PATH'
-        c.option 'force', '--force', 'Force creation even if PATH already exists'
+        c.syntax 'new <path>'
+        c.description 'Creates a new Jekyll site scaffold in path'
+        c.option 'force', '--force', 'Force creation even if path already exists'
         c.option 'blank', '--blank', 'Creates scaffolding but with empty files'
         
         c.action do |args, options|
-          abort "You must specify a path." if args.empty?
-          ::Jekyll::Commands::New.process(args, options.to_symbol_keys)
+          if args.empty?
+            c.logger.error "You must specify a path."
+          else
+            ::Jekyll::Commands::New.process(args, options.to_symbol_keys)
+          end
         end
 
         c.command(:page) do |page_command|
-          page_command.syntax 'octopress new page PATH [options]'
+          page_command.syntax 'page <PATH> [options]'
           page_command.description 'Add a new page to your Jekyll site.'
           page_command.option 'title', '--title TITLE', 'String to be added as the title in the YAML front-matter.'
           CommandHelpers.add_common_options page_command
 
           page_command.action do |args, options|
-            abort "You must specify a path." if args.empty?
             options['path'] = args.first
             Page.new(options).write
           end
         end
 
         c.command(:post) do |post_command|
-          post_command.syntax 'octopress new post TITLE [options]'
+          post_command.syntax 'post <TITLE> [options]'
           post_command.description 'Add a new post to your Jekyll site.'
           CommandHelpers.add_common_options post_command
 
           post_command.action do |args, options|
             options['title'] = args.first
             Post.new(options).write
           end
         end
 
         c.command(:draft) do |draft_command|
-          draft_command.syntax 'octopress new draft TITLE [options]'
+          draft_command.syntax 'draft <TITLE> [options]'
           draft_command.description 'Add a new draft post to your Jekyll site.'
           CommandHelpers.add_common_options draft_command
 
           draft_command.action do |args, options|
             options['title'] = args.first