vulcan 0.7.0 → 0.7.1

data/README.md

@@ -19,7 +19,7 @@ A build server in the cloud.
       -c, [--command=COMMAND]     # the command to run for compilation
       -n, [--name=NAME]           # the name of the library (defaults to the directory name)
       -o, [--output=OUTPUT]       # output build artifacts to this file
-      -p, [--prefix=PREFIX]       # the build/install --prefix of the software
+      -p, [--prefix=PREFIX]       # vulcan will look in this path for the compiled artifacts
       -s, [--source=SOURCE]       # the source directory to build from
       -d, [--deps=one two three]  # urls of vulcan compiled libraries to build with
       -v, [--verbose]             # show the full build output

data/lib/vulcan/cli.rb

@@ -23,7 +23,7 @@ if no COMMAND is specified, a sensible default will be chosen for you
   method_option :command, :aliases => "-c", :desc => "the command to run for compilation"
   method_option :name,    :aliases => "-n", :desc => "the name of the library (defaults to the directory name)"
   method_option :output,  :aliases => "-o", :desc => "output build artifacts to this file"
-  method_option :prefix,  :aliases => "-p", :desc => "the build/install --prefix of the software"
+  method_option :prefix,  :aliases => "-p", :desc => "vulcan will look in this path for the compiled artifacts"
   method_option :source,  :aliases => "-s", :desc => "the source directory to build from"
   method_option :deps,    :aliases => "-d", :desc => "urls of vulcan compiled libraries to build with", :type=>:array
   method_option :verbose, :aliases => "-v", :desc => "show the full build output", :type => :boolean

data/lib/vulcan/version.rb

@@ -1,5 +1,5 @@
 module Vulcan
 
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 
 end

data/server/web.coffee

@@ -45,11 +45,10 @@ app.post "/make", (req, res, next) ->
         res.write "Building with: #{command}\n"
         log.info  "spawning build"
 
-        env =
+        make = spawner.spawn "bin/make \"#{id}\"", env:
           CLOUDANT_URL: process.env.CLOUDANT_URL
           PATH: process.env.PATH
 
-        make = spawner.spawn "bin/make \"#{id}\"", env:env
         make.on "error", (err)  -> log.error(err)
         make.on "data",  (data) -> res.write data
         make.on "exit",  (code) -> res.end())

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vulcan
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &70106450727000 !ruby/object:Gem::Requirement
+  requirement: &70233685257360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106450727000
+  version_requirements: *70233685257360
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70106450725480 !ruby/object:Gem::Requirement
+  requirement: &70233685255820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70106450725480
+  version_requirements: *70233685255820
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70106450718280 !ruby/object:Gem::Requirement
+  requirement: &70233685248500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70106450718280
+  version_requirements: *70233685248500
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70106450717060 !ruby/object:Gem::Requirement
+  requirement: &70233685247460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,7 +57,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70106450717060
+  version_requirements: *70233685247460
 description: Build software in the cloud
 email: ddollar@gmail.com
 executables:
@@ -808,7 +808,6 @@ files:
 - server/vendor/gems/specifications/multi_json-1.0.3.gemspec
 - server/vendor/gems/specifications/rest-client-1.6.7.gemspec
 - server/web.coffee
-- server/web.js
 homepage: http://vulcan.com/
 licenses: []
 post_install_message: Please run 'vulcan update' to update your build server.

data/server/web.js

@@ -1,151 +0,0 @@
-var cradle  = require('cradle');
-var express = require('express');
-var fs      = require('fs');
-var spawner = require('spawner').create();
-var util    = require('util');
-var uuid    = require('node-uuid');
-
-var app = express.createServer(
-  express.logger(),
-  express.cookieParser(),
-  express.session({ secret: process.env.SECRET }),
-  require('connect-form')({ keepExtensions: true })
-);
-
-function log_action(uuid, message) {
-  console.log(uuid + ': ' + message);
-}
-
-function log_error(uuid, message) {
-  log_action(uuid, 'ERROR: ' + message);
-}
-
-// 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] }  } :
-  { }
-var db = new(cradle.Connection)(couchdb_url.hostname, couchdb_url.port || 5984, couchdb_options).database('make');
-db.create(function(){});
-
-// POST /make starts a build
-app.post('/make', function(request, response, next) {
-
-  // require a form
-  if (! request.form) {
-    console.log('invalid form');
-    response.write('invalid form');
-    response.send(500);
-  } else {
-
-    // form handler
-    request.form.complete(function(err, fields, files) {
-
-      // if there's an error, pass through to the next handler
-      if (err) { return next(err); }
-
-      // 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;
-        var deps    = [];
-
-        if (fields.deps) {
-          deps = JSON.parse(fields.deps);
-        }
-
-        // return the build id as a header
-        response.header('X-Make-Id', id);
-
-        // send data as a keepalive
-        setInterval(function() {
-          response.write(String.fromCharCode(0) + String.fromCharCode(10));
-        }, 1000);
-
-        // create a couchdb documents for this build
-        log_action(id, 'saving to couchdb');
-        db.save(id, { command:command, prefix:prefix, deps:deps }, function(err, doc) {
-          if (err) { log_error(id, util.inspect(err)); return next(err); }
-
-          // save the input tarball as an attachment
-          log_action(id, 'saving attachment - [id:' + doc.id + ', rev:' + doc.rev + ']')
-          fs.createReadStream(files.code.path).pipe(db.saveAttachment(
-            {id: doc.id,
-             rev: doc.rev},
-            {name:'input',
-            'Content-Type': 'application/octet-stream'},
-            function(err, data) {
-
-              // finish uploading message
-              response.write('done\n');
-
-              response.write('Building with: ' + command + '\n');
-
-              if (err) {
-                // work around temporary problem with cloudant and document
-                // conflicts
-                if (err.error != 'conflict') {
-                  log_error(id, err.reason);
-                  return next(err.reason);
-                }
-              }
-
-              // spawn bin/make with this build id
-              log_action(id, 'spawning build');
-              var ls = spawner.spawn('bin/make ' + id, function(err) {
-                log_error(id, 'could not spawn: ' + err);
-                response.write('could not spawn: ' + err);
-                response.send(500);
-              });
-
-              ls.on('error', function(error) {
-                log_error(id, 'spawn error: ' + util.inspect(error));
-                response.write('error: ' + util.inspect(error));
-                response.send(500);
-              });
-
-              ls.on('data', function(data) {
-                response.write(data);
-              });
-
-              ls.on('exit', function(code) {
-                response.end();
-              });
-            }
-          ));
-        });
-      }
-
-    });
-  }
-});
-
-// download build output
-app.get('/output/:id', function(request, response, next) {
-
-  // from couchdb
-  var stream = db.getAttachment(request.params.id, 'output', function(){});
-
-  stream.on('error', function(err) {
-    console.log('download error: ' + err);
-  });
-
-  stream.on('data', function(chunk) {
-    response.write(chunk, 'binary');
-  });
-
-  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);