Fixed rdoc generation and publishing with rake doc:pages:publish.

dblock · dblock · commit ecea8178ee8d · 2013-04-14T15:50:05.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -15,4 +15,5 @@ group :development, :test do
   gem 'github-markup'
   gem 'cookiejar'
   gem 'rack-contrib'
+  gem 'redcarpet'
 end
diff --git a/Rakefile b/Rakefile
@@ -28,16 +28,32 @@ begin
   namespace :doc do
     YARD::Rake::YardocTask.new(:pages) do |t|
       t.files   = DOC_FILES
-      t.options = ['-o', '../grape.doc']
+      t.options = ['-o', '../grape.doc/docs']
     end
 
     namespace :pages do
+
+      desc "Check out gh-pages."
+      task :checkout do
+        dir = File.dirname(__FILE__) + '/../grape.doc'
+        unless Dir.exist?(dir)
+          Dir.mkdir(dir)
+          Dir.chdir(dir) do
+            system("git init")
+            system("git remote add origin git@github.com:intridea/grape.git")
+            system("git pull")
+            system("git checkout gh-pages")
+          end
+        end
+      end
+
       desc 'Generate and publish YARD docs to GitHub pages.'
-      task :publish => ['doc:pages'] do
+      task :publish => ['doc:pages:checkout', 'doc:pages'] do
         Dir.chdir(File.dirname(__FILE__) + '/../grape.doc') do
+          system("git checkout gh-pages")
           system("git add .")
           system("git add -u")
-          system("git commit -m 'Generating docs for version #{version}.'")
+          system("git commit -m 'Generating docs for version #{Grape::VERSION}.'")
           system("git push origin gh-pages")
         end
       end
