vulcan 0.1.2 → 0.1.3

data/lib/vulcan/cli.rb

@@ -115,7 +115,8 @@ update the build server
 
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
-        api_key = %x{ env BUNDLE_GEMFILE= heroku credentials }
+        api_key = %x{ env BUNDLE_GEMFILE= heroku credentials 2>&1 }.chomp
+        error "invalid api key detected, try running `heroku credentials`" if api_key =~ / /
 
         system "git init"
         system "git remote add heroku git@heroku.com:#{config[:app]}.git"

data/lib/vulcan/version.rb

@@ -1,5 +1,5 @@
 module Vulcan
 
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 
 end

data/server/web.js

@@ -14,34 +14,48 @@ var app = express.createServer(
   require('connect-form')({ keepExtensions: true })
 );
 
+// connect to couchdb
 var couchdb_url = require('url').parse(process.env.CLOUDANT_URL);
-
 var couchdb_options = couchdb_url.auth ?
-  {
-    auth: { username: couchdb_url.auth.split(':')[0], password: couchdb_url.auth.split(':')[1] }
-  } :
+  { auth: { username: couchdb_url.auth.split(':')[0], password: couchdb_url.auth.split(':')[1] }  } :
   { }
-
 var db = new(cradle.Connection)(couchdb_url.hostname, couchdb_url.port || 5984, couchdb_options).database('make');
-
 db.create();
 
+// POST /make starts a build
 app.post('/make', function(request, response, next) {
+
+  // require a form
   if (! request.form) {
-    response.send('invalid');
+    response.write('invalid form');
+    response.send(500);
   } else {
+
+    // form handler
     request.form.complete(function(err, fields, files) {
+
+      // if there's an error
       if (err) {
+
+        // pass through to the next handler
         next(err);
+
       } else {
+
+        // match on the shared secret
         if (fields.secret != process.env.SECRET) {
+          response.write('invalid secret');
           response.send(500);
         } else {
+
           var id      = uuid();
           var command = fields.command;
           var prefix  = fields.prefix;
 
+          // create a couchdb documents for this build
           var doc = db.save(id, { command:command, prefix:prefix }, function(err, doc) {
+
+            // save the input tarball as an attachment
             db.saveAttachment(
               doc.id,
               doc.rev,
@@ -49,14 +63,16 @@ app.post('/make', function(request, response, next) {
               'application/octet-stream',
               fs.createReadStream(files.code.path),
               function(err, data) {
+
+                // spawn bin/make with this build id
                 var ls = spawner.spawn('bin/make ' + id, function(err) {
-                  console.log('couldnt spawn: ' + err);
+                  response.write('could not spawn: ' + err);
+                  response.send(500);
                 });
 
                 ls.on('error', function(error) {
-                  response.writeHead(500);
-                  console.log('error: ' + error);
-                  response.end();
+                  response.write('error: ' + err);
+                  response.send(500);
                 });
 
                 ls.on('data', function(data) {
@@ -69,6 +85,7 @@ app.post('/make', function(request, response, next) {
               }
             );
 
+            // return the build id as a header
             response.header('X-Make-Id', id);
           });
         }
@@ -77,7 +94,10 @@ app.post('/make', function(request, response, next) {
   }
 });
 
+// download build output
 app.get('/output/:id', function(request, response, next) {
+
+  // from couchdb
   var stream = db.getAttachment(request.params.id, 'output');
 
   stream.on('data', function(chunk) {
@@ -87,8 +107,10 @@ app.get('/output/:id', function(request, response, next) {
   stream.on('end', function(chunk) {
     response.end();
   });
+
 });
 
+// start up the webserver
 var port = process.env.PORT || 3000;
 console.log('listening on port ' + port);
 app.listen(port);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vulcan
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70286582431000 !ruby/object:Gem::Requirement
+  requirement: &70260058252980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70286582431000
+  version_requirements: *70260058252980
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70286582430240 !ruby/object:Gem::Requirement
+  requirement: &70260058252160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70286582430240
+  version_requirements: *70260058252160
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70286582429540 !ruby/object:Gem::Requirement
+  requirement: &70260058251500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70286582429540
+  version_requirements: *70260058251500
 description: Build software in the cloud
 email: ddollar@gmail.com
 executables: