summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJurriaan Pruis <[email protected]>2014-01-02 09:32:54 -0800
committerJurriaan Pruis <[email protected]>2014-01-02 09:32:54 -0800
commit40c1d19e98dba73997ad773ef019570e9afd560c (patch)
tree361a5caf3760009f8f077fae9539c786c90457eb
parent2f09f7530acfb47ebc772a609b2cf9d523ac60b7 (diff)
parentcb8f60856bf85ac3dec940f525a4bfb83e89e03a (diff)
downloadcaxlsx-40c1d19e98dba73997ad773ef019570e9afd560c.tar.gz
caxlsx-40c1d19e98dba73997ad773ef019570e9afd560c.zip
Merge pull request #271 from jurriaan/travis-fixes
Travis fixes
-rw-r--r--.travis.yml3
-rw-r--r--Gemfile7
-rw-r--r--Rakefile19
3 files changed, 18 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 201aa3ca..088ab1da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,8 @@ rvm:
- 1.9.2
- 1.9.3
- 2.0.0
- - rbx-19mode
+ - 2.1.0
+ - rbx
- jruby-19mode
- ruby-head
- jruby-head
diff --git a/Gemfile b/Gemfile
index a68ee61c..b3b89451 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,3 +9,10 @@ end
group :profile do
gem 'ruby-prof'
end
+
+platforms :rbx do
+ gem 'rubysl'
+ gem 'rubysl-test-unit'
+ gem 'racc'
+ gem 'rubinius-coverage', '~> 2.0'
+end
diff --git a/Rakefile b/Rakefile
index 0e29e787..9f1dd36e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,18 +10,17 @@ end
task :gendoc do
#puts 'yard doc generation disabled until JRuby build native extensions for redcarpet or yard removes the dependency.'
- system "yardoc"
- system "yard stats --list-undoc"
+ system "yardoc"
+ system "yard stats --list-undoc"
end
-task :test do
- require 'rake/testtask'
- Rake::TestTask.new do |t|
- t.libs << 'test'
- t.test_files = FileList['test/**/tc_*.rb']
- t.verbose = false
- t.warning = true
- end
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+ t.libs << 'test'
+ t.test_files = FileList['test/**/tc_*.rb']
+ t.verbose = false
+ t.warning = true
end
task :release => :build do