test/acceptance/helper.rb in spring-1.1.0.beta3 vs test/acceptance/helper.rb in spring-1.1.0.beta4

- old
+ new

@@ -55,20 +55,12 @@ def stderr @stderr ||= IO.pipe end - def log_file_path - path("tmp/spring.log") - end - def log_file - @log_file ||= begin - tmp = path("tmp") - tmp.mkdir unless tmp.exist? - tmp.join("spring.log").open("w+") - end + @log_file ||= path("tmp/spring.log").open("w+") end def env @env ||= { "GEM_HOME" => gem_home.to_s, @@ -263,11 +255,11 @@ def system(command) if ENV["SPRING_DEBUG"] puts "$ #{command}\n" else - command = "#{command} > /dev/null" + command = "(#{command}) > /dev/null" end Kernel.system(command) or raise "command failed: #{command}" puts if ENV["SPRING_DEBUG"] end @@ -327,11 +319,11 @@ application.run! "#{application.spring} binstub --all" @installed = true end def copy_to(path) - FileUtils.rm_rf(path.to_s) - FileUtils.cp_r(application.root.to_s, path.to_s) + system("rm -rf #{path}") + system("cp -r #{application.root} #{path}") end end end end