bin/bonsai in bonsai-1.1.0 vs bin/bonsai in bonsai-1.1.1

@@ -21,31 +21,35 @@
     end
     Bonsai::Generate.new("#{Dir.pwd}/#{name}")
   end
   
   opts.on("--cultivate", "run a local web server and process your files on save") do
-    Bonsai.log banner
+    begin
+      Bonsai.log banner
+      Bonsai.log "Press Control+C to quit"
     
-    require 'rack'
-    require 'sinatra'
-    require 'watch'
+      require 'rack'
+      require 'sinatra'
+      require 'watch'
+      require 'launchy'
     
-    Bonsai.root_dir = Dir.pwd
+      Bonsai.root_dir = Dir.pwd
       
-    server = fork {
-      app = Rack::Builder.app {
-        use Bonsai::StaticPassThrough, :root => Bonsai.root_dir + "/output", :urls => ["/"]
-        run Bonsai::DevelopmentServer
-      }
-      Rack::Handler::Thin.run(app, :Port => 5000)
-    }
-    
-    trap("SIGINT") do
+      server = fork {        
+        app = Rack::Builder.app {
+          use Bonsai::StaticPassThrough, :root => Bonsai.root_dir + "/output", :urls => ["/"]
+          run Bonsai::DevelopmentServer
+        }
+        Rack::Handler.default.run(app, :Port => 5000) do
+          Launchy.open("http://localhost:5000/")
+        end
+      }    
+      Watch.new("{content,templates,public}/**/*") { Bonsai::Exporter.process! }
+    rescue Interrupt
       Process.kill("QUIT", server)
+      Process.wait(server)
       exit
     end
-    
-    Watch.new("{content,templates,public}/**/*") { Bonsai::Exporter.process! }
   end
   
   opts.on("--repot", "export your site to #{Dir.pwd}/output") do
     Bonsai.root_dir = Dir.pwd
     Bonsai::Exporter.publish!
\ No newline at end of file