Merge pull request #2817 from rusikf/patch-2

lib/jekyll/commands/new.rb

@@ -3,7 +3,8 @@ require 'erb'
 module Jekyll
   module Commands
     class New < Command
-      def self.init_with_program(prog)
+      class << self 
+        def init_with_program(prog)
           prog.command(:new) do |c|
             c.syntax 'new PATH'
             c.description 'Creates a new Jekyll site scaffold in PATH'
@@ -17,7 +18,7 @@ module Jekyll
           end
         end
 
-      def self.process(args, options = {})
+        def process(args, options = {})
           raise ArgumentError.new('You must specify a path.') if args.empty?
 
           new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
@@ -39,42 +40,43 @@ module Jekyll
           Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
         end
 
-      def self.create_blank_site(path)
+        def create_blank_site(path)
           Dir.chdir(path) do
             FileUtils.mkdir(%w(_layouts _posts _drafts))
             FileUtils.touch("index.html")
           end
         end
 
-      def self.scaffold_post_content
+        def scaffold_post_content
           ERB.new(File.read(File.expand_path(scaffold_path, site_template))).result
         end
 
         # Internal: Gets the filename of the sample post to be created
         #
         # Returns the filename of the sample post, as a String
-      def self.initialized_post_name
+        def initialized_post_name
           "_posts/#{Time.now.strftime('%Y-%m-%d')}-welcome-to-jekyll.markdown"
         end
 
         private
 
-      def self.preserve_source_location?(path, options)
+        def preserve_source_location?(path, options)
           !options["force"] && !Dir["#{path}/**/*"].empty?
         end
 
-      def self.create_sample_files(path)
+        def create_sample_files(path)
           FileUtils.cp_r site_template + '/.', path
           FileUtils.rm File.expand_path(scaffold_path, path)
         end
 
-      def self.site_template
+        def site_template
           File.expand_path("../../site_template", File.dirname(__FILE__))
         end
 
-      def self.scaffold_path
+        def scaffold_path
           "_posts/0000-00-00-welcome-to-jekyll.markdown.erb"
         end
       end  
     end
+  end
 end