trying to integrate Travis CI

9 files changed, 53 insertions, 44 deletions

diff --git a/.gitignore b/.gitignore
index f7531e0..b8988f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,6 @@ pkg
 test/executable/source.rb.html
 test/executable/source.rb.json
 test/scanners
-
 bench/test.div.html
-.rvmrc
\ No newline at end of file
+.rvmrc
+diff.html
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..8a6503e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+rvm:
+  - 1.8.6
+  - 1.8.7 # (current default)
+  - 1.9.2
+  - ruby-head
+  - rbx
+  - rbx-2.0
+  - ree
+  - jruby
+branches:
+  only:
+    - master
+    - stable
+# script: "bundle exec rake test test:scanners"
diff --git a/Gemfile b/Gemfile
index d5ae377..29c842e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,5 +10,6 @@ group :development do
   gem "shoulda-context", "= 1.0.0.beta1"
   gem "RedCloth"
   gem "json" unless RUBY_VERSION >= '1.9.1'
+  gem "rdoc"
   gem "bundler", "~> 1.0.0"
 end
diff --git a/README.rdoc b/README.rdoc
index 3ae753f..f36859c 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,5 +1,7 @@
 = CodeRay
 
+https://secure.travis-ci.org/rubychan/coderay.png
+
 Tired of blue'n'gray? Try the original version of this documentation on
 coderay.rubychan.de[http://coderay.rubychan.de/doc/] :-)
 
@@ -111,6 +113,8 @@ Where would we be without all those people?
   less useless
 * Term::ANSIColor[http://term-ansicolor.rubyforge.org/]
 * PLEAC[http://pleac.sourceforge.net/] code examples
+* Github
+* Travis CI (http://travis-ci.org/rubychan/github)
 
 === Free
 
diff --git a/etc/CodeRay.tmproj b/etc/CodeRay.tmproj
index 4ca8548..54d2118 100644
--- a/etc/CodeRay.tmproj
+++ b/etc/CodeRay.tmproj
@@ -2,13 +2,9 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>currentDocument</key>
-	<string>../test/functional/for_redcloth.rb</string>
 	<key>documents</key>
 	<array>
 		<dict>
-			<key>expanded</key>
-			<true/>
 			<key>name</key>
 			<string>lib</string>
 			<key>regexFolderFilter</key>
@@ -26,9 +22,21 @@
 		</dict>
 		<dict>
 			<key>filename</key>
+			<string>../coderay.gemspec</string>
+		</dict>
+		<dict>
+			<key>filename</key>
+			<string>../Changes-1.0.textile</string>
+			<key>lastUsed</key>
+			<date>2011-08-19T01:04:06Z</date>
+		</dict>
+		<dict>
+			<key>filename</key>
 			<string>../Changes.textile</string>
 			<key>lastUsed</key>
-			<date>2011-08-16T18:06:14Z</date>
+			<date>2011-08-19T01:04:06Z</date>
+			<key>selected</key>
+			<true/>
 		</dict>
 		<dict>
 			<key>filename</key>
@@ -80,13 +88,21 @@
 		</dict>
 		<dict>
 			<key>filename</key>
+			<string>../Gemfile</string>
+			<key>lastUsed</key>
+			<date>2011-08-19T00:26:29Z</date>
+		</dict>
+		<dict>
+			<key>filename</key>
+			<string>../Gemfile.lock</string>
+		</dict>
+		<dict>
+			<key>filename</key>
 			<string>../Rakefile</string>
 			<key>lastUsed</key>
-			<date>2011-08-01T01:19:43Z</date>
+			<date>2011-08-19T00:21:31Z</date>
 		</dict>
 		<dict>
-			<key>expanded</key>
-			<true/>
 			<key>name</key>
 			<string>executable</string>
 			<key>regexFolderFilter</key>
@@ -95,8 +111,6 @@
 			<string>../test/executable</string>
 		</dict>
 		<dict>
-			<key>expanded</key>
-			<true/>
 			<key>name</key>
 			<string>functional</string>
 			<key>regexFolderFilter</key>
@@ -111,21 +125,21 @@
 					<key>filename</key>
 					<string>../test/scanners/coderay_suite.rb</string>
 					<key>lastUsed</key>
-					<date>2011-08-01T01:19:42Z</date>
+					<date>2011-08-19T00:50:30Z</date>
 				</dict>
 				<dict>
 					<key>filename</key>
 					<string>../test/scanners/suite.rb</string>
 					<key>lastUsed</key>
-					<date>2011-03-01T00:06:06Z</date>
+					<date>2011-08-19T00:50:31Z</date>
 				</dict>
 			</array>
+			<key>expanded</key>
+			<true/>
 			<key>name</key>
 			<string>scanners</string>
 		</dict>
 		<dict>
-			<key>expanded</key>
-			<true/>
 			<key>name</key>
 			<string>unit</string>
 			<key>regexFolderFilter</key>
@@ -137,32 +151,13 @@
 			<key>filename</key>
 			<string>../bench/bench.rb</string>
 			<key>lastUsed</key>
-			<date>2011-07-11T22:05:29Z</date>
+			<date>2011-08-18T23:38:33Z</date>
 		</dict>
 	</array>
 	<key>fileHierarchyDrawerWidth</key>
 	<integer>204</integer>
 	<key>metaData</key>
-	<dict>
-		<key>../test/functional/for_redcloth.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>2</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>36</integer>
-		</dict>
-	</dict>
-	<key>openDocuments</key>
-	<array>
-		<string>../test/functional/for_redcloth.rb</string>
-	</array>
+	<dict/>
 	<key>showFileHierarchyDrawer</key>
 	<true/>
 	<key>windowFrame</key>
diff --git a/rake_tasks/documentation.rake b/rake_tasks/documentation.rake
index f83d5d9..0e3907c 100644
--- a/rake_tasks/documentation.rake
+++ b/rake_tasks/documentation.rake
@@ -6,7 +6,7 @@ begin
     require 'rake/rdoctask'

   end

 rescue LoadError

-  puts 'Please gem install rdoc.'

+  warn 'Please gem install rdoc.'

 end

 

 desc 'Generate documentation for CodeRay'

diff --git a/rake_tasks/test.rake b/rake_tasks/test.rake
index 7078f84..f070ccc 100644
--- a/rake_tasks/test.rake
+++ b/rake_tasks/test.rake
@@ -7,14 +7,12 @@ namespace :test do
   
   desc 'run functional tests'
   task :functional do
-    ENV['check_rubygems'] = 'true'
     ruby './test/functional/suite.rb'
     ruby './test/functional/for_redcloth.rb'
   end
   
   desc 'run unit tests'
   task :units do
-    ENV['check_rubygems'] = 'true'
     ruby './test/unit/suite.rb'
   end
   
diff --git a/test/functional/basic.rb b/test/functional/basic.rb
index 8200ae4..5d82f5f 100755
--- a/test/functional/basic.rb
+++ b/test/functional/basic.rb
@@ -129,10 +129,6 @@ more code  # and another comment, in-line.
     assert_equal 4, CodeRay.scan(rHTML, :erb).lines_of_code
   end
   
-  def test_rubygems_not_loaded
-    assert_equal nil, defined? Gem
-  end if ENV['check_rubygems'] && RUBY_VERSION < '1.9'
-  
   def test_list_of_encoders
     assert_kind_of(Array, CodeRay::Encoders.list)
     assert CodeRay::Encoders.list.include?(:count)
diff --git a/test/unit/suite.rb b/test/unit/suite.rb
index 769b6cc..ee568e7 100755
--- a/test/unit/suite.rb
+++ b/test/unit/suite.rb
@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'rubygems'
 $:.unshift 'lib'
 
 mydir = File.dirname(__FILE__)