summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2014-09-19 11:53:11 +0900
committerAndre Arko <andre@arko.net>2014-09-19 11:53:11 +0900
commitff5e65c97bd7dbb69426ee7c5f2faf986b034fe4 (patch)
treed7f55ce03c655da9d621f64face75bc49f48a6fd
parentfa92a05ee015e8880b2ce9b808bbcac829c698ed (diff)
downloadbundler-ff5e65c97bd7dbb69426ee7c5f2faf986b034fe4.tar.gz
skip sudo commands and ronn
-rw-r--r--Rakefile20
1 files changed, 11 insertions, 9 deletions
diff --git a/Rakefile b/Rakefile
index 078d03618b..806bf7d18e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -41,6 +41,7 @@ namespace :spec do
end
deps.each do |name, version|
+ next if name == "ronn"
sh "#{Gem.ruby} -S gem list -i '^#{name}$' -v '#{version}' || " \
"#{Gem.ruby} -S gem install #{name} -v '#{version}' --no-ri --no-rdoc"
end
@@ -54,11 +55,11 @@ namespace :spec do
namespace :travis do
task :deps do
# Give the travis user a name so that git won't fatally error
- system "sudo sed -i 's/1000::/1000:Travis:/g' /etc/passwd"
+ # system "sudo sed -i 's/1000::/1000:Travis:/g' /etc/passwd"
# Strip secure_path so that RVM paths transmit through sudo -E
- system "sudo sed -i '/secure_path/d' /etc/sudoers"
+ # system "sudo sed -i '/secure_path/d' /etc/sudoers"
# Install groff for the ronn gem
- sh "sudo apt-get install groff -y"
+ # sh "sudo apt-get install groff -y"
if RUBY_VERSION < '1.9'
# Downgrade Rubygems on 1.8 so Ronn can be required
# https://github.com/rubygems/rubygems/issues/784
@@ -176,12 +177,13 @@ begin
Rake::Task["spec:rubygems:#{rg}"].reenable
- puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against rubygems #{rg}\e[m\n\n"
- sudos = system("sudo -E rake spec:rubygems:#{rg}:sudo")
- # clean up by chowning the newly root-owned tmp directory back to the travis user
- system("sudo chown -R #{ENV['USER']} #{File.join(File.dirname(__FILE__), 'tmp')}")
-
- Rake::Task["spec:rubygems:#{rg}"].reenable
+ sudos = true
+ # puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against rubygems #{rg}\e[m\n\n"
+ # sudos = system("sudo -E rake spec:rubygems:#{rg}:sudo")
+ # # clean up by chowning the newly root-owned tmp directory back to the travis user
+ # system("sudo chown -R #{ENV['USER']} #{File.join(File.dirname(__FILE__), 'tmp')}")
+ #
+ # Rake::Task["spec:rubygems:#{rg}"].reenable
puts "\n\e[1;33m[Travis CI] Running bundler real world specs against rubygems #{rg}\e[m\n\n"
realworld = safe_task { Rake::Task["spec:rubygems:#{rg}:realworld"].invoke }