shotgun 0.3 → 0.4

data/lib/shotgun.rb

@@ -1,7 +1,9 @@
 require 'rack'
+require 'rack/utils'
 require 'thread'
 
 class Shotgun
+  include Rack::Utils
   attr_reader :rackup_file
 
   def initialize(rackup_file, wrapper=nil)
@@ -35,10 +37,20 @@ class Shotgun
 
   def proceed_as_parent
     @writer.close
-    status, headers, body = Marshal.load(@reader)
+    result = Marshal.load(@reader)
     @reader.close
     Process.wait
-    [status, headers, body]
+    if result.length == 3
+      result
+    else
+      [500, {'Content-Type'=>'text/html;charset=utf-8'}, [format_error(result)]]
+    end
+  end
+
+  def format_error(result)
+    message, backtrace = result
+    "<h1>FAIL</h1><h3>#{escape_html(message)}</h3>" +
+    "<pre>#{escape_html(backtrace.join("\n"))}</pre>"
   end
 
   # ==== Stuff that happens in the forked child process.
@@ -49,7 +61,9 @@ class Shotgun
     status, headers, body = app.call(@env)
     Marshal.dump([status, headers.to_hash, slurp(body)], @writer)
     @writer.close
-	ensure
+  rescue Object => boom
+    Marshal.dump(["#{boom.class.name}: #{boom.to_s}", boom.backtrace], @writer)
+  ensure
     exit! 0
   end
 

data/shotgun.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'shotgun'
-  s.version = '0.3'
+  s.version = '0.4'
   s.date = '2009-03-22'
 
   s.description = "Because reloading sucks."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shotgun
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: "0.4"
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -50,8 +50,10 @@ files:
 - shotgun.gemspec
 - lib/shotgun.rb
 - bin/shotgun
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/rtomayko/shotgun/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -72,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wink
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 2
 summary: Because reloading sucks.