Making the website doc generation play nicely with the nokogiri.org g…

…emset.
sparklemotion · Nov 6, 2011 · ddcd5e5 · ddcd5e5
1 parent 875448f
commit ddcd5e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,9 +7,11 @@
 .classpath
 .project
 .rake_tasks
+.rvmrc
 .settings
 Gemfile*
 TAGS
+build
 ext/java/Canna
 ext/java/nokogiri/*.class
 ext/java/nokogiri/*/*.class
@@ -30,4 +32,3 @@ test/*_mini.rb
 test/test_jruby_footer.rb
 test/test_jruby_header.rb
 tmp
-build
diff --git a/lib/nokogiri/css/tokenizer.rex b/lib/nokogiri/css/tokenizer.rex
@@ -1,6 +1,6 @@
 module Nokogiri
 module CSS
-class Tokenizer
+class Tokenizer # :nodoc:
 
 macro
   nl        \n|\r\n|\r|\f

diff --git a/tasks/nokogiri.org.rb b/tasks/nokogiri.org.rb
@@ -1,6 +1,12 @@
+#
+#  note that this file will only work if you've got the `nokogiri.org`
+#  repo checked out, and you've got an rvm gemset "1.8.7@nokogiri"
+#  bundled with both nokogiri's and nokogiri.org's gems.
+#
 namespace :docs do
   desc "generate HTML docs for nokogiri.org"
   task :website do
+    system 'rvm use 1.8.7@nokogiri' # see above
     title = "#{HOE.name}-#{HOE.version} Documentation"
 
     options = []