Merge pull request #2817 from rusikf/patch-2

lib/jekyll/commands/new.rb

@@ -3,77 +3,79 @@ require 'erb'
 module Jekyll
   module Commands
     class New < Command
-      def self.init_with_program(prog)
+      class << self 
-        prog.command(:new) do |c|
+        def init_with_program(prog)
-          c.syntax 'new PATH'
+          prog.command(:new) do |c|
-          c.description 'Creates a new Jekyll site scaffold in PATH'
+            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 'force', '--force', 'Force creation even if PATH already exists'
-          c.option 'blank', '--blank', 'Creates scaffolding but with empty files'
+            c.option 'blank', '--blank', 'Creates scaffolding but with empty files'
             
-          c.action do |args, options|
+            c.action do |args, options|
-            Jekyll::Commands::New.process(args, options)
+              Jekyll::Commands::New.process(args, options)
-          end
+            end
-        end
-      end
-
-      def self.process(args, options = {})
-        raise ArgumentError.new('You must specify a path.') if args.empty?
-
-        new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
-        FileUtils.mkdir_p new_blog_path
-        if preserve_source_location?(new_blog_path, options)
-          Jekyll.logger.abort_with "Conflict:", "#{new_blog_path} exists and is not empty."
-        end
-
-        if options["blank"]
-          create_blank_site new_blog_path
-        else
-          create_sample_files new_blog_path
-
-          File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f|
-            f.write(scaffold_post_content)
           end
         end
 
-        Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
+        def process(args, options = {})
-      end
+          raise ArgumentError.new('You must specify a path.') if args.empty?
 
-      def self.create_blank_site(path)
+          new_blog_path = File.expand_path(args.join(" "), Dir.pwd)
-        Dir.chdir(path) do
+          FileUtils.mkdir_p new_blog_path
-          FileUtils.mkdir(%w(_layouts _posts _drafts))
+          if preserve_source_location?(new_blog_path, options)
-          FileUtils.touch("index.html")
+            Jekyll.logger.abort_with "Conflict:", "#{new_blog_path} exists and is not empty."
+          end
+
+          if options["blank"]
+            create_blank_site new_blog_path
+          else
+            create_sample_files new_blog_path
+
+            File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f|
+              f.write(scaffold_post_content)
+            end
+          end
+
+          Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
         end
-      end
 
-      def self.scaffold_post_content
+        def create_blank_site(path)
-        ERB.new(File.read(File.expand_path(scaffold_path, site_template))).result
+          Dir.chdir(path) do
-      end
+            FileUtils.mkdir(%w(_layouts _posts _drafts))
+            FileUtils.touch("index.html")
+          end
+        end
 
-      # Internal: Gets the filename of the sample post to be created
+        def scaffold_post_content
-      #
+          ERB.new(File.read(File.expand_path(scaffold_path, site_template))).result
-      # Returns the filename of the sample post, as a String
+        end
-      def self.initialized_post_name
-        "_posts/#{Time.now.strftime('%Y-%m-%d')}-welcome-to-jekyll.markdown"
-      end
 
-      private
+        # Internal: Gets the filename of the sample post to be created
+        #
+        # Returns the filename of the sample post, as a String
+        def initialized_post_name
+          "_posts/#{Time.now.strftime('%Y-%m-%d')}-welcome-to-jekyll.markdown"
+        end
 
-      def self.preserve_source_location?(path, options)
+        private
-        !options["force"] && !Dir["#{path}/**/*"].empty?
-      end
 
-      def self.create_sample_files(path)
+        def preserve_source_location?(path, options)
-        FileUtils.cp_r site_template + '/.', path
+          !options["force"] && !Dir["#{path}/**/*"].empty?
-        FileUtils.rm File.expand_path(scaffold_path, path)
+        end
-      end
 
-      def self.site_template
+        def create_sample_files(path)
-        File.expand_path("../../site_template", File.dirname(__FILE__))
+          FileUtils.cp_r site_template + '/.', path
-      end
+          FileUtils.rm File.expand_path(scaffold_path, path)
+        end
 
-      def self.scaffold_path
+        def site_template
-        "_posts/0000-00-00-welcome-to-jekyll.markdown.erb"
+          File.expand_path("../../site_template", File.dirname(__FILE__))
+        end
+
+        def scaffold_path
+          "_posts/0000-00-00-welcome-to-jekyll.markdown.erb"
+        end
       end  
     end
   end