spade 0.0.5 → 0.0.6

data/lib/spade/server.rb

@@ -1,6 +1,7 @@
 require 'rack'
 require 'rack/static'
 require 'tempfile'
+require 'child_labor'
 
 module Spade
   module Server
@@ -8,7 +9,7 @@ module Spade
       rootdir = Spade.discover_root(working)
       static = Rack::Static.new(nil, :urls => ['/'], :root => rootdir)
       static = CommandRunner.new(static)
-      static = Rack::ShowStatus.new(Rack::ShowExceptions.new(static))
+      static = Rack::ShowStatus.new(Rack::ShowExceptions.new(Rack::Chunked.new(Rack::ContentLength.new(static))))
 
       Rack::Handler::WEBrick.run static, :Port => port.to_i
     end
@@ -39,12 +40,22 @@ module Spade
           tempfile.write(params['code'])
           tempfile.close
 
+
           puts "Running: #{command_path}"
-          output = `#{command_path} < #{tempfile.path}`
+
+          output, error = nil
+          process = ChildLabor.subprocess("#{command_path} < #{tempfile.path}") do |p|
+            output = p.read
+            error = p.read_stderr
+          end
 
           tempfile.delete
 
-          [200, {}, output]
+          if process.exit_status == 0
+            [200, {}, output]
+          else
+            [500, {}, error]
+          end
         else
           @app.call(env)
         end

data/lib/spade/version.rb

@@ -1,3 +1,3 @@
 module Spade
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spade",
-  "version": "0.0.1",
+  "version": "0.0.6",
   "description": "CommonJS Microkernel for Browser and Command Line",
 
   "maintainers": [

data/spade.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "json_pure",    "~> 1.4.6"
   s.add_dependency "rack",         "~> 1.2.1"
   s.add_dependency "thor",         "~> 0.14.3"
+  s.add_dependency "childlabor",   "~> 0.0.3"
   s.add_dependency "therubyracer", "~> 0.8.0" if mri
 
   s.add_development_dependency "rspec"

metadata

@@ -2,7 +2,7 @@
 name: spade
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Charles Jolley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 Z
+date: 2011-04-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gemcutter
@@ -79,27 +79,38 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: therubyracer
+  name: childlabor
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.0
+        version: 0.0.3
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: therubyracer
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.0
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: Unified JavaScript runner for browser and command line
 email: 
 - charles@sproutcore.com