Merge remote-tracking branch 'origin/master'

plusjade · plusjade · commit d82396e81fc5 · 2013-02-24T01:48:13.000-08:00
diff --git a/Rakefile b/Rakefile
@@ -40,11 +40,12 @@ module JB
   end #Path
 end #JB
 
-# Usage: rake post title="A Title" [date="2012-02-09"]
+# Usage: rake post title="A Title" [date="2012-02-09"] [tags=[tag1, tag2]]
 desc "Begin a new post in #{CONFIG['posts']}"
 task :post do
   abort("rake aborted: '#{CONFIG['posts']}' directory not found.") unless FileTest.directory?(CONFIG['posts'])
   title = ENV["title"] || "new-post"
+  tags = ENV["tags"] || "[]"
   slug = title.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
   begin
     date = (ENV['date'] ? Time.parse(ENV['date']) : Time.now).strftime('%Y-%m-%d')
@@ -197,8 +198,8 @@ namespace :theme do
     # Mirror each file into the framework making sure to prompt if already exists.
     packaged_theme_files.each do |filename|
       file_install_path = File.join(JB::Path.base, filename)
-      if File.exist? file_install_path
-        next if ask("#{file_install_path} already exists. Do you want to overwrite?", ['y', 'n']) == 'n'
+      if File.exist? file_install_path and ask("#{file_install_path} already exists. Do you want to overwrite?", ['y', 'n']) == 'n'
+        next
       else
         mkdir_p File.dirname(file_install_path)
         cp_r File.join(packaged_theme_path, filename), file_install_path
diff --git a/_posts/core-samples/2011-12-29-jekyll-introduction.md b/_posts/core-samples/2011-12-29-jekyll-introduction.md
@@ -90,8 +90,8 @@ Jekyll expects your website directory to be laid out like so:
     |   |-- default.html
     |   |-- post.html
     |-- _posts
-    |   |-- 20011-10-25-open-source-is-good.markdown
-    |   |-- 20011-04-26-hello-world.markdown
+    |   |-- 2011-10-25-open-source-is-good.markdown
+    |   |-- 2011-04-26-hello-world.markdown
     |-- _site
     |-- index.html
     |-- assets
