lib/octopress/commands/serve.rb in octopress-3.0.0.alpha8 vs lib/octopress/commands/serve.rb in octopress-3.0.0.rc.1

@@ -1,15 +1,12 @@
-require 'jekyll'
-require File.expand_path('helpers', File.dirname(__FILE__))
-
 module Octopress
   class Serve < Command
     def self.init_with_program(p)
       p.command(:serve) do |c|
         c.alias(:server)
 
-        c.syntax 'jekyll serve [options]'
+        c.syntax 'serve [options]'
         c.description 'Serve your site locally'
 
         CommandHelpers.add_build_options(c)
 
         c.option 'detach', '-B', '--detach',      'Run the server in the background (detach)'
@@ -20,12 +17,12 @@
         c.action do |args, options|
           Octopress.config(options)
 
           options.default :serving => true
           options = CommandHelpers.normalize_options(options)
-          options = ::Jekyll.configuration(options.to_symbol_keys)
-          ::Jekyll::Commands::Build.process(options)
-          ::Jekyll::Commands::Serve.process(options)
+          options = Jekyll.configuration(options.to_symbol_keys)
+          Jekyll::Commands::Build.process(options)
+          Jekyll::Commands::Serve.process(options)
         end
       end
     end
   end
 end