0
@@ -72,9 +72,10 @@
0
     private
0
       # Send the command to the +thin+ script
0
       def run(cmd, options, port)
0
-        shell_cmd = shellify(cmd, options.merge(:p:pid => pid_file_for(port), :log => log_file_for(port)))
0
+        shell_cmd = shellify(cmd, options.merge(:port => port, :pid => pid_file_for(port), :log => log_file_for(port)))
0
         trace shell_cmd
0
-        log `#{shell_cmd}`
0
+        ouput = `#{shell_cmd}`.chomp
0
+        log ouput unless ouput.empty?
0
       end
0
       
0
       # Turn into a runnable shell command

0
@@ -39,25 +39,21 @@
0
   end
0
   
0
   it 'should start on specified port' do
0
-    @cluster.start_on_port 3000
0
-    
0
-    File.exist?(@cluster.pid_file_for(3000)).should be_true
0
-    File.exist?(@cluster.log_file_for(3000)).should be_true
0
+    @cluster.should_receive(:`) do |with|
0
+      with.should include('thin start', '--daemonize', 'thin.3001.log', 'thin.3001.pid', '--port=3001')
0
+      ''
0
+    end
0
+
0
+    @cluster.start_on_port 3001    
0
   end
0
 
0
   it 'should stop on specified port' do
0
-    @cluster.start_on_port 3000
0
-    @cluster.stop_on_port 3000
0
-    
0
-    File.exist?(@cluster.pid_file_for(3000)).should be_false
0
-  end
0
-  
0
-  after do
0
-    3000.upto(3003) do |port|
0
-      Process.kill 9, @cluster.pid_for(port) rescue nil
0
-      File.delete @cluster.pid_file_for(port) rescue nil
0
-      File.delete @cluster.log_file_for(port) rescue nil
0
+    @cluster.should_receive(:`) do |with|
0
+      with.should include('thin stop', '--daemonize', 'thin.3001.log', 'thin.3001.pid', '--port=3001')
0
+      ''
0
     end
0
+
0
+    @cluster.stop_on_port 3001
0
   end
0
 end