Update Gemfiles to allow use of JRuby or Rubinius. Update .travis.yml…

… to include these VMs. Add begin/rescue block to Rakefile for RDocTask
jamesjefferies · Dec 15, 2013 · 7073a63 · 7073a63
1 parent 799465c
commit 7073a63
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,12 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - jruby-19mode
+  - rbx
 gemfile:
  - gemfiles/rails3/Gemfile
  - gemfiles/rails4/Gemfile
 matrix:
   allow_failures:
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails4/Gemfile
     - rvm: 1.9.2
       gemfile: gemfiles/rails4/Gemfile
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,14 @@
 source "http://rubygems.org"
 
+gem 'sqlite3', :platforms => [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl-test-unit'
+end
+
 # Specify your gem's dependencies in acts_as_list-rails3.gemspec
 gemspec
 

diff --git a/Rakefile b/Rakefile
@@ -15,15 +15,19 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-# Run the rdoc task to generate rdocs for this gem
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  require "acts_as_list/version"
-  version = ActiveRecord::Acts::List::VERSION
+begin
+  # Run the rdoc task to generate rdocs for this gem
+  require 'rdoc/task'
+  RDoc::Task.new do |rdoc|
+    require "acts_as_list/version"
+    version = ActiveRecord::Acts::List::VERSION
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "acts_as_list-rails3 #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = "acts_as_list-rails3 #{version}"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+rescue LoadError
+  puts 'RDocTask is not supported on this platform.'
 end
 
diff --git a/acts_as_list.gemspec b/acts_as_list.gemspec
@@ -26,6 +26,4 @@ Gem::Specification.new do |s|
   # Dependencies (installed via 'bundle install')...
   s.add_dependency("activerecord", [">= 3.0"])
   s.add_development_dependency("bundler", [">= 1.0.0"])
-  s.add_development_dependency("rdoc")
-  s.add_development_dependency("sqlite3")
 end
diff --git a/gemfiles/rails3/Gemfile b/gemfiles/rails3/Gemfile
@@ -1,5 +1,14 @@
 source "https://rubygems.org"
 
+gem 'sqlite3', :platforms => [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl-test-unit'
+end
+
 gem 'activerecord', '>= 3.0', '< 4'
 
 # Specify your gem's dependencies in acts_as_list.gemspec

diff --git a/gemfiles/rails4/Gemfile b/gemfiles/rails4/Gemfile
@@ -1,5 +1,15 @@
 source "https://rubygems.org"
 
+gem 'sqlite3', :platforms => [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl-test-unit'
+end
+
+
 gem 'activerecord', '>= 4.0.0', '< 5'
 
 # Specify your gem's dependencies in acts_as_list.gemspec