Skip to content

Commit

Permalink
Merge pull request #9 from petergoldstein/feature/jruby_and_rubinius
Browse files Browse the repository at this point in the history
Add rbx and JRuby compatibility
  • Loading branch information
rubiety committed Dec 9, 2013
2 parents 08f9ed3 + e6706df commit 44d800b
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Expand Up @@ -4,6 +4,8 @@ rvm:
- 1.9.2
- 1.9.3
- 2.0.0
- rbx
- jruby-19mode
gemfile:
- gemfiles/3.0.gemfile
- gemfiles/3.1.gemfile
Expand Down
5 changes: 5 additions & 0 deletions Gemfile
@@ -1,3 +1,8 @@
source "http://rubygems.org"

gem 'rubysl', '~> 2.0', :platforms => [:rbx]

gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
gem 'sqlite3', :platforms => [:ruby]

gemspec
21 changes: 13 additions & 8 deletions Rakefile
Expand Up @@ -4,7 +4,6 @@ require 'bundler/setup'
require 'rake'
require 'appraisal'
require 'rspec/core/rake_task'
require 'rdoc/task'

desc 'Default: run unit tests.'
task :default => [:clean, :test]
Expand Down Expand Up @@ -32,13 +31,19 @@ task :clean do |t|
Dir.glob("spec/db/*.sqlite3").each {|f| FileUtils.rm f }
end

desc "Generate documentation for the plugin."
Rake::RDocTask.new(:rdoc) do |rdoc|
rdoc.rdoc_dir = "rdoc"
rdoc.title = "nilify_blanks"
rdoc.options << "--line-numbers" << "--inline-source"
rdoc.rdoc_files.include('README')
rdoc.rdoc_files.include('lib/**/*.rb')
begin
require 'rdoc/task'

desc "Generate documentation for the plugin."
Rake::RDocTask.new(:rdoc) do |rdoc|
rdoc.rdoc_dir = "rdoc"
rdoc.title = "nilify_blanks"
rdoc.options << "--line-numbers" << "--inline-source"
rdoc.rdoc_files.include('README')
rdoc.rdoc_files.include('lib/**/*.rb')
end
rescue LoadError
puts 'RDocTask is not supported for this platform'
end

Dir["#{File.dirname(__FILE__)}/lib/tasks/*.rake"].sort.each { |ext| load ext }
Expand Down
5 changes: 5 additions & 0 deletions gemfiles/3.0.gemfile
Expand Up @@ -4,4 +4,9 @@ source "http://rubygems.org"

gem "rails", "~> 3.0.9"

gem 'rubysl', '~> 2.0', :platforms => [:rbx]

gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
gem 'sqlite3', :platforms => [:ruby]

gemspec :path=>"../"
5 changes: 5 additions & 0 deletions gemfiles/3.1.gemfile
Expand Up @@ -4,4 +4,9 @@ source "http://rubygems.org"

gem "rails", "~> 3.1.6"

gem 'rubysl', '~> 2.0', :platforms => [:rbx]

gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
gem 'sqlite3', :platforms => [:ruby]

gemspec :path=>"../"
5 changes: 5 additions & 0 deletions gemfiles/3.2.gemfile
Expand Up @@ -4,4 +4,9 @@ source "http://rubygems.org"

gem "rails", "~> 3.2.6"

gem 'rubysl', '~> 2.0', :platforms => [:rbx]

gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
gem 'sqlite3', :platforms => [:ruby]

gemspec :path=>"../"
5 changes: 5 additions & 0 deletions gemfiles/4.0.gemfile
Expand Up @@ -4,4 +4,9 @@ source "http://rubygems.org"

gem "rails", "~> 4.0.0"

gem 'rubysl', '~> 2.0', :platforms => [:rbx]

gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
gem 'sqlite3', :platforms => [:ruby]

gemspec :path=>"../"

0 comments on commit 44d800b

Please sign in to comment.