summaryrefslogtreecommitdiff
path: root/Rakefile
diff options
context:
space:
mode:
authorCharles Oliver Nutter <headius@headius.com>2015-01-09 10:06:51 -0600
committerCharles Oliver Nutter <headius@headius.com>2015-01-09 10:06:51 -0600
commit3ddffabc91bee3ba136a9367f24083b6bf9fd7ef (patch)
treee73ce4213df554530b1088bc9d082b62f46f2862 /Rakefile
parentea50d0179c51d271c9fead299e9bf6dd06fe9689 (diff)
parent24055a152492123b7516e9b4e54af5710ffed247 (diff)
downloadpsych-3ddffabc91bee3ba136a9367f24083b6bf9fd7ef.tar.gz
Merge remote-tracking branch 'origin/master' into jruby
Conflicts: .gitignore
Diffstat (limited to 'Rakefile')
-rw-r--r--Rakefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Rakefile b/Rakefile
index c67cb89..3acf614 100644
--- a/Rakefile
+++ b/Rakefile
@@ -16,11 +16,13 @@ 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'
developer 'Aaron Patterson', 'aaron@tenderlovemaking.com'
self.extra_rdoc_files = Dir['*.rdoc']
@@ -29,6 +31,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"],
@@ -71,7 +74,7 @@ namespace :merge do
[basedir, 'test', 'psych/'] => [rubydir, 'test', 'psych/'],
}
- rsync = 'rsync -av --exclude extconf.rb --exclude lib --exclude ".*" --exclude "*.o" --exclude Makefile --exclude mkmf.log --delete'
+ rsync = 'rsync -av --exclude lib --exclude ".*" --exclude "*.o" --exclude Makefile --exclude mkmf.log --delete'
task :to_ruby do
mergedirs.each do |from, to|