From 15242e8ba43b2220267cb6957324772583e20f28 Mon Sep 17 00:00:00 2001
From: guilherme silveira <guilherme.silveira@caelum.com.br>
Date: Fri, 11 Jun 2010 10:27:26 -0300
Subject: [PATCH] dont wait more than you should

---
 Rakefile                       | 18 +++++++++---------
 spec/units/client/base_spec.rb |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Rakefile b/Rakefile
index 6397a637..8ae0f64b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -42,7 +42,7 @@ end
 
 def execute_process(name)
   sh "ruby ./spec/units/client/#{name}.rb &"
-  sleep 15
+  wait_server 4567
   %x(ps -ef | grep #{name}).split[1]  
 end
 
@@ -51,24 +51,24 @@ def process(name)
 end
 
 def start_server_and_invoke_test(task_name)
+  kill_server "fake_server"
   pid = process "fake_server"
-  puts "fake_server pid >>>> #{pid}"
   Rake::Task[task_name].invoke
-  sh "kill -9 #{pid}"
+  kill_server "fake_server"
 end
 
-def kill_server
-  c = `(ps -ef | grep 'script/server')`.split(/\n/)
+def kill_server(where)
+  c = `(ps -ef | grep '#{where}')`.split(/\n/)
   c.each do |line|
     pid = line.split[1]
     system "kill -9 #{pid}"
   end
 end
 
-def wait_server
+def wait_server(port=3000)
   (1..15).each do 
     begin
-      Net::HTTP.get(URI.parse('http://localhost:3000/'))
+      Net::HTTP.get(URI.parse("http://localhost:#{port}/"))
       return
     rescue
       sleep 1
@@ -151,12 +151,12 @@ namespace :test do
 
   desc "runs all example tests"
   task :examples do
-    kill_server
+    kill_server "script/server"
     enter_dir = "cd full-examples/rest_from_scratch/part_3"
     system "#{enter_dir} && rake db:reset db:seed && script/server -d"
     wait_server
     system "#{enter_dir} && rake spec"
-    kill_server
+    kill_server "script/server"
   end
 
 end
diff --git a/spec/units/client/base_spec.rb b/spec/units/client/base_spec.rb
index 76b2b7ee..b5fb0b30 100644
--- a/spec/units/client/base_spec.rb
+++ b/spec/units/client/base_spec.rb
@@ -24,6 +24,7 @@ class Song
     a_song.id.should == 'http://localhost:4567/songs_1'
   end
 
+
   it 'should load top ten songs' do
     top_ten_songs = @songs_from_class.links.top_ten.get!
     top_ten_songs.response.code.should == 200