summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-12-06 14:29:06 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2014-12-06 14:29:06 -0800
commit1109112f5785f6d55a74fed8f04a174e52293af5 (patch)
tree8e1a098ef5337e955137bb397d2252af104f38d2
parent5ade7c60dc1871d537241678b1a4d1a079eae393 (diff)
parent681ad3e66ffa4ecfd7fe838fd40c47f9f48aa43d (diff)
downloadpsych-1109112f5785f6d55a74fed8f04a174e52293af5.zip
Merge pull request #213 from hsbt/ruby-head
Added ruby-head env into travis
-rw-r--r--.travis.yml5
-rw-r--r--Rakefile4
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index d995250..2c45195 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,9 @@ rvm:
- 1.9.3
- 2.0.0
- 2.1.0
+ - ruby-head
before_script:
- - gem install isolate
- gem install hoe
- gem install rake-compiler
-script: rake isolate test
+ - gem install minitest -v '~> 4.0'
+script: rake test
diff --git a/Rakefile b/Rakefile
index fd20115..7c15d95 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,9 +9,10 @@ class Hoe
end
gem 'rake-compiler', '>= 0.4.1'
+gem 'minitest', '~> 4.0'
require "rake/extensiontask"
-Hoe.plugin :doofus, :git, :gemspec, :isolate
+Hoe.plugin :doofus, :git, :gemspec
$hoe = Hoe.spec 'psych' do
license 'MIT'
@@ -23,6 +24,7 @@ $hoe = Hoe.spec 'psych' do
self.testlib = :minitest
extra_dev_deps << ['rake-compiler', '>= 0.4.1']
+ extra_dev_deps << ['minitest', '~> 4.0']
self.spec_extras = {
:extensions => ["ext/psych/extconf.rb"],