test/app.rb in sinatra-websocketio-0.4.0 vs test/app.rb in sinatra-websocketio-0.4.1

@@ -14,48 +14,17 @@
 
   def self.websocketio_url
     "ws://localhost:#{ws_port}"
   end
 
-  def self.pid_file
-    ENV['PID_FILE'] || "/tmp/sinatra-websocketio-testapp.pid"
-  end
-
   def self.app_dir
     File.expand_path 'app', File.dirname(__FILE__)
   end
 
-  def self.pid
-    return unless @running
-    File.open(pid_file) do |f|
-      pid = f.gets.strip.to_i
-      return pid if pid > 0
-    end
-    return
-  end
-
   def self.start
-    return if @running
-    File.delete pid_file if File.exists? pid_file
-    Thread.new do
-      IO::popen "cd #{app_dir} && PID_FILE=#{pid_file} WS_PORT=#{ws_port} rackup config.ru -p #{port} > /dev/null 2>&1"
-    end
+    return if running
     @running = true
-    100.times do
-      if File.exists? pid_file
-        sleep 1
-        return true
-      end
-      sleep 0.1
-    end
-    @running = false
-    return false
-  end
-
-  def self.stop
-    return unless @running
-    system "kill #{pid}"
-    File.delete pid_file if File.exists? pid_file
-    @running = false
+    cmd = "cd #{app_dir} && WS_PORT=#{ws_port} rackup config.ru -p #{port}"
+    system cmd
   end
 
 end