vulcan 0.3.0 → 0.4.0

data/bin/vulcan

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 
+$:.unshift File.expand_path("../../lib", __FILE__)
+
 require "net/http/post/multipart"
 require "tmpdir"
 require "uri"
-require File.expand_path("#{File.dirname(__FILE__)}/../lib/vulcan/cli")
+require "vulcan/cli"
 
 Vulcan::CLI.start
 

data/lib/vulcan/cli.rb

@@ -62,15 +62,20 @@ if no COMMAND is specified, a sensible default will be chosen for you
 
         puts ">> Downloading build artifacts to: #{output}"
 
+        output_url = "#{server}/output/#{response["X-Make-Id"]}"
+        puts "   (available at #{output_url})"
+
         File.open(output, "w") do |output|
           begin
-            output.print RestClient.get("#{server}/output/#{response["X-Make-Id"]}")
+            output.print RestClient.get(output_url)
           rescue Exception => ex
             puts ex.inspect
           end
         end
       end
     end
+  rescue Interrupt
+    error "Aborted by user"
   rescue Errno::EPIPE
     error "Could not connect to build server: #{server}"
   end
@@ -111,17 +116,20 @@ update the build server
         error "invalid api key detected, try running `heroku auth:token`" if api_key =~ / /
 
         system "git init"
-        system "git remote add heroku git@heroku.com:#{config[:app]}.git"
+        system "git remote add heroku git@#{heroku_git_domain}:#{config[:app]}.git"
         FileUtils.cp_r "#{server_path}/.", "."
         File.open(".gitignore", "w") do |file|
           file.puts ".env"
           file.puts "node_modules"
         end
+
+        %x{ env BUNDLE_GEMFILE= heroku config:remove BUILDPACK_URL 2>&1 }
+
         system "git add . >/dev/null"
         system "git commit -m commit >/dev/null"
         system "git push heroku -f master"
 
-        %x{ env BUNDLE_GEMFILE= heroku config:add SECRET=#{config[:secret]} SPAWN_ENV=heroku HEROKU_APP=#{config[:app]} HEROKU_API_KEY=#{api_key} 2>&1 }
+        %x{ env BUNDLE_GEMFILE= heroku config:add SECRET=#{config[:secret]} SPAWN_ENV=heroku HEROKU_APP=#{config[:app]} HEROKU_API_KEY=#{api_key} NODE_PATH=lib 2>&1 }
         %x{ env BUNDLE_GEMFILE= heroku addons:add cloudant:oxygen }
       end
     end
@@ -158,5 +166,16 @@ private
   def server_path
     File.expand_path("../../../server", __FILE__)
   end
+  
+  #
+  # heroku_git_domain checks to see if the heroku-accounts plugin is present,
+  # and if so, it will set the domain to the one that matches the credentials
+  # for the currently set account
+  #
+  def heroku_git_domain
+    suffix = %x{ git config heroku.account }
+    suffix = "com" if suffix.nil? or suffix.strip == ""
+    "heroku.#{suffix.strip}"
+  end
 
 end

data/lib/vulcan/version.rb

@@ -1,5 +1,5 @@
 module Vulcan
 
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 
 end

data/server/bin/make

@@ -35,12 +35,10 @@ Dir.mktmpdir do |dir|
       %x{ tar czf #{dir}/output.tgz * 2>&1 }
     end
 
-    retries = 0
     begin
       doc.put_attachment("output", File.open("#{dir}/output.tgz"))
     rescue RestClient::Conflict
-      retries += 1
-      retry if retries < 3
+      # temporarily work around problem with bigcouch
     end
 
   end

data/server/lib/spawner.js

@@ -62,7 +62,8 @@ var Spawner = function(env) {
     restler.post('https://api.heroku.com/apps/' + app + '/ps', {
       headers: {
         'Authorization': auth,
-        'Accept': 'application/json'
+        'Accept': 'application/json',
+        'User-Agent': 'heroku-gem/2.5'
       },
       data: {
         attach: true,
@@ -72,10 +73,14 @@ var Spawner = function(env) {
     }).on('success', function(data) {
 
       var url = require('url').parse(data.rendezvous_url);
-      var rendezvous = new net.Socket();
 
-      rendezvous.connect(url.port, url.hostname, function() {
-        rendezvous.write(url.pathname.substring(1) + '\n');
+      var rendezvous = tls.connect(url.port, url.hostname, function() {
+        if (rendezvous.authorized) {
+          console.log('valid socket');
+          rendezvous.write(url.pathname.substring(1) + '\n');
+        } else {
+          console.log('invalid socket');
+        }
       });
 
       rendezvous.on('data', function(data) {

data/server/node_modules/connect-form/node_modules/formidable/Readme.md

@@ -20,6 +20,15 @@ a big variety of clients and is considered production-ready.
 
 ## Changelog
 
+### v1.0.5
+
+* Support filename="" in multipart parts
+* Explain unexpected end() errors in parser better
+
+### v1.0.4
+
+* Detect a good default tmp directory regardless of plattform. (#88)
+
 ### v1.0.3
 
 * Fix problems with utf8 characters (#84) / semicolons in filenames (#58)
@@ -142,9 +151,11 @@ Creates a new incoming form.
 
 The encoding to use for incoming form fields.
 
-#### incomingForm.uploadDir = '/tmp'
+#### incomingForm.uploadDir = process.env.TMP || '/tmp' || process.cwd()
 
-The directory for placing file uploads in. You can later on move them using `fs.rename()`.
+The directory for placing file uploads in. You can later on move them using
+`fs.rename()`. The default directoy is picked at module load time depending on
+the first existing directory from those listed above.
 
 #### incomingForm.keepExtensions = false
 

data/server/node_modules/connect-form/node_modules/formidable/lib/incoming_form.js

@@ -1,5 +1,6 @@
 if (global.GENTLY) require = GENTLY.hijack(require);
 
+var fs = require('fs');
 var util = require('./util'),
     path = require('path'),
     File = require('./file'),
@@ -17,7 +18,7 @@ function IncomingForm() {
 
   this.maxFieldsSize = 2 * 1024 * 1024;
   this.keepExtensions = false;
-  this.uploadDir = '/tmp';
+  this.uploadDir = IncomingForm.UPLOAD_DIR;
   this.encoding = 'utf-8';
   this.headers = null;
   this.type = null;
@@ -32,6 +33,20 @@ function IncomingForm() {
 util.inherits(IncomingForm, EventEmitter);
 exports.IncomingForm = IncomingForm;
 
+IncomingForm.UPLOAD_DIR = (function() {
+  var dirs = [process.env.TMP, '/tmp', process.cwd()];
+  for (var i = 0; i < dirs.length; i++) {
+    var dir = dirs[i];
+    var isDirectory = false;
+
+    try {
+      isDirectory = fs.statSync(dir).isDirectory();
+    } catch (e) {}
+
+    if (isDirectory) return dir;
+  }
+})();
+
 IncomingForm.prototype.parse = function(req, cb) {
   this.pause = function() {
     try {
@@ -147,7 +162,7 @@ IncomingForm.prototype.onPart = function(part) {
 IncomingForm.prototype.handlePart = function(part) {
   var self = this;
 
-  if (!part.filename) {
+  if (part.filename === undefined) {
     var value = ''
       , decoder = new StringDecoder(this.encoding);
 
@@ -278,10 +293,7 @@ IncomingForm.prototype._initMultipart = function(boundary) {
         part.name = m[1];
       }
 
-      var filename = self._fileName(headerValue);
-      if (filename) {
-        part.filename = filename;
-      }
+      part.filename = self._fileName(headerValue);
     } else if (headerField == 'content-type') {
       part.mime = headerValue;
     }
@@ -311,7 +323,7 @@ IncomingForm.prototype._initMultipart = function(boundary) {
 };
 
 IncomingForm.prototype._fileName = function(headerValue) {
-  var m = headerValue.match(/filename="(.+?)"($|; )/i)
+  var m = headerValue.match(/filename="(.*?)"($|; )/i)
   if (!m) return;
 
   var filename = m[1].substr(m[1].lastIndexOf('\\') + 1);

data/server/node_modules/connect-form/node_modules/formidable/lib/multipart_parser.js

@@ -49,6 +49,13 @@ function MultipartParser() {
 };
 exports.MultipartParser = MultipartParser;
 
+MultipartParser.stateToString = function(stateNumber) {
+  for (var state in S) {
+    var number = S[state];
+    if (number === stateNumber) return state;
+  }
+};
+
 MultipartParser.prototype.initWithBoundary = function(str) {
   this.boundary = new Buffer(str.length+4);
   this.boundary.write('\r\n--', 'ascii', 0);
@@ -296,6 +303,10 @@ MultipartParser.prototype.write = function(buffer) {
 
 MultipartParser.prototype.end = function() {
   if (this.state != S.END) {
-    return new Error('MultipartParser.end(): stream ended unexpectedly');
+    return new Error('MultipartParser.end(): stream ended unexpectedly: ' + this.explain());
   }
 };
+
+MultipartParser.prototype.explain = function() {
+  return 'state = ' + MultipartParser.stateToString(this.state);
+};

data/server/node_modules/connect-form/node_modules/formidable/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formidable",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "dependencies": {},
   "devDependencies": {
     "gently": "0.8.0",

data/server/node_modules/connect-form/node_modules/formidable/test/fixture/file/plain.txt

@@ -0,0 +1 @@
+I am a plain text file

data/server/node_modules/connect-form/node_modules/formidable/test/fixture/http/no-filename/generic.http

@@ -0,0 +1,13 @@
+POST /upload HTTP/1.1
+Host: localhost:8080
+Content-Type: multipart/form-data; boundary=----WebKitFormBoundarytyE4wkKlZ5CQJVTG
+Content-Length: 1000
+
+------WebKitFormBoundarytyE4wkKlZ5CQJVTG
+Content-Disposition: form-data; name="upload"; filename=""
+Content-Type: text/plain
+
+I am a plain text file
+
+------WebKitFormBoundarytyE4wkKlZ5CQJVTG--
+

data/server/node_modules/connect-form/node_modules/formidable/test/fixture/http/special-chars-in-filename/osx-chrome-13.http

@@ -24,13 +24,3 @@ Content-Type: text/plain
 I am a text file with a funky name!
 
 ------WebKitFormBoundarytyE4wkKlZ5CQJVTG--
-GET /favicon.ico HTTP/1.1
-Host: localhost:8080
-Connection: keep-alive
-Accept: */*
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.220 Safari/535.1
-Accept-Encoding: gzip,deflate,sdch
-Accept-Language: en-US,en;q=0.8
-Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
-Cookie: jqCookieJar_tablesorter=%7B%22showListTable%22%3A%5B%5B5%2C1%5D%2C%5B1%2C0%5D%5D%7D
-

data/server/node_modules/connect-form/node_modules/formidable/test/fixture/http/special-chars-in-filename/xp-chrome-12.http

@@ -22,12 +22,3 @@ Content-Type: text/plain
 
 
 ------WebKitFormBoundaryEvqBNplR3ByrwQPa--
-GET /favicon.ico HTTP/1.1
-Host: 192.168.56.1:8080
-Connection: keep-alive
-Accept: */*
-User-Agent: Mozilla/5.0 (Windows NT 5.1) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.122 Safari/534.30
-Accept-Encoding: gzip,deflate,sdch
-Accept-Language: de-DE,de;q=0.8,en-US;q=0.6,en;q=0.4
-Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
-

data/server/node_modules/connect-form/node_modules/formidable/test/fixture/js/no-filename.js

@@ -0,0 +1,3 @@
+module.exports['generic.http'] = [
+  {type: 'file', name: 'upload', filename: '', fixture: 'plain.txt'},
+];

data/server/node_modules/connect-form/node_modules/formidable/test/legacy/simple/test-multipart-parser.js

@@ -40,7 +40,7 @@ test(function parserError() {
 
 test(function end() {
   (function testError() {
-    assert.equal(parser.end().message, 'MultipartParser.end(): stream ended unexpectedly');
+    assert.equal(parser.end().message, 'MultipartParser.end(): stream ended unexpectedly: ' + parser.explain());
   })();
 
   (function testRegular() {

data/server/node_modules/cradle/lib/cradle.js

@@ -1,5 +1,4 @@
 var path = require('path'),
-     sys = require("sys"),
     http = require("http"),
    https = require("https"),
   events = require('events'),

data/server/node_modules/cradle/package.json

@@ -5,9 +5,9 @@
   "keywords"        : ["couchdb", "database", "couch"],
   "author"          : "Alexis Sellier <self@cloudhead.net>",
   "contributors"    : [],
-  "dependencies"    : { "vargs": ">=0.1.0", "vows": ">=0.5.4" },
-  "devDependencies" : { "async": "~0.1.x", "request": "~2.1.1" },
-  "version"         : "0.5.7",
+  "dependencies"    : { "vargs": ">=0.1.0" },
+  "devDependencies" : { "async": "0.1.x", "request": "2.2.x", "vows": "0.6.x" },
+  "version"         : "0.5.8",
   "main"            : "./lib/cradle",
   "directories"     : { "test": "./test" },
   "engines"         : { "node": ">=0.3.6" }

data/server/node_modules/cradle/test/cache-test.js

@@ -1,5 +1,4 @@
 var path = require('path'),
-    sys = require('sys'),
     assert = require('assert'),
     events = require('events'),
     vows = require('vows');
@@ -19,7 +18,7 @@ vows.describe('cradle/Cache').addBatch({
 
         'should be able to store 8 keys': function (topic) {
             for (var i = 0; i < 8; i++) { topic.save(i.toString(), {}) }
-            assert.length (Object.keys(topic.store), 8);
+            assert.lengthOf (Object.keys(topic.store), 8);
         },
         'if more than 8 keys are set': {
             topic: function (cache) {
@@ -30,7 +29,7 @@ vows.describe('cradle/Cache').addBatch({
                 });
             },
             'there should still be 8 keys in the store': function (cache) {
-                assert.length (Object.keys(cache.store), 8);
+                assert.lengthOf (Object.keys(cache.store), 8);
             }
         },
         'if an extra 8 keys are set': {
@@ -67,10 +66,10 @@ vows.describe('cradle/Cache').addBatch({
                 }, 10);
             },
             'it should have the 3 accessed ones, with the 5 new ones': function (cache) {
-                assert.length (Object.keys(cache.store), 8);
-                assert.isTrue (cache.has('2'));
-                assert.isTrue (cache.has('5'));
-                assert.isTrue (cache.has('1'));
+                assert.lengthOf (Object.keys(cache.store), 8);
+                assert.isTrue   (cache.has('2'));
+                assert.isTrue   (cache.has('5'));
+                assert.isTrue   (cache.has('1'));
                 for (var i = 8; i < 13; i++) { cache.has(i.toString()) }
             }
         }

data/server/node_modules/cradle/test/cradle-test.js

@@ -1,5 +1,4 @@
 var path = require('path'),
-    sys = require('sys'),
     assert = require('assert'),
     events = require('events'),
     http = require('http'),
@@ -278,7 +277,7 @@ vows.describe("cradle").addBatch(seed.requireSeed()).addBatch({
                 "returns a 200": status(200),
                 "returns an array of UUIDs": function (uuids) {
                     assert.isArray(uuids);
-                    assert.length(uuids, 42);
+                    assert.lengthOf(uuids, 42);
                 }
             },
             "without count": {
@@ -287,7 +286,7 @@ vows.describe("cradle").addBatch(seed.requireSeed()).addBatch({
                 "returns a 200": status(200),
                 "returns an array of UUIDs": function (uuids) {
                     assert.isArray(uuids);
-                    assert.length(uuids, 1);
+                    assert.lengthOf(uuids, 1);
                 }
             }
         },
@@ -497,7 +496,7 @@ vows.describe("cradle").addBatch(seed.requireSeed()).addBatch({
                 },
                 "returns an iterable object with key/val pairs": function (res) {
                     assert.isArray(res);
-                    assert.length(res, 2);
+                    assert.lengthOf(res, 2);
                     res.forEach(function (k, v) {
                         assert.isObject(v);
                         assert.isString(k);
@@ -528,7 +527,7 @@ vows.describe("cradle").addBatch(seed.requireSeed()).addBatch({
                 },
                 "returns an iterable object with key/val pairs": function (res) {
                     assert.isArray(res);
-                    assert.length(res, 2);
+                    assert.lengthOf(res, 2);
                     res.forEach(function (k, v) {
                         assert.isObject(v);
                         assert.isString(k);

data/server/node_modules/cradle/test/response-test.js

@@ -1,5 +1,4 @@
 var path = require('path'),
-    sys = require('sys'),
     assert = require('assert'),
     events = require('events'),
     http = require('http'),
@@ -15,7 +14,7 @@ vows.describe('cradle/Response').addBatch({
             topic: new(cradle.Response)(document),
 
             'should only have the original keys': function (topic) {
-                assert.length    (Object.keys(topic), 4);
+                assert.lengthOf  (Object.keys(topic), 4);
                 assert.equal     (topic.name, 'buzz');
                 assert.equal     (topic.age, 99);
                 assert.deepEqual (document, topic);
@@ -29,15 +28,15 @@ vows.describe('cradle/Response').addBatch({
                 assert.deepEqual   (topic.json, document);
                 assert.isUndefined (topic.json.json);
                 assert.isUndefined (topic.headers);
-                assert.length      (Object.keys(topic.json), 4);
+                assert.lengthOf    (Object.keys(topic.json), 4);
             },
             'when using a `for .. in` loop, should only return the original keys': function (topic) {
                 var keys = [];
                 for (var k in topic) { keys.push(k) }
 
-                assert.length  (keys, 4);
-                assert.include (keys, 'name');
-                assert.include (keys, 'age');
+                assert.lengthOf (keys, 4);
+                assert.include  (keys, 'name');
+                assert.include  (keys, 'age');
             },
             'should stringify': function (topic) {
                 var expected = JSON.stringify(document);

data/server/node_modules/express/History.md

@@ -1,4 +1,55 @@
 
+2.5.6 / 2012-01-13 
+==================
+
+  * Updated hamljs dev dep. Closes #953
+
+2.5.5 / 2012-01-08 
+==================
+
+  * Fixed: set `filename` on cached templates [matthewleon]
+
+2.5.4 / 2012-01-02 
+==================
+
+  * Fixed `express(1)` eol on 0.4.x. Closes #947
+
+2.5.3 / 2011-12-30 
+==================
+
+  * Fixed `req.is()` when a charset is present
+
+2.5.2 / 2011-12-10 
+==================
+
+  * Fixed: express(1) LF -> CRLF for windows
+
+2.5.1 / 2011-11-17 
+==================
+
+  * Changed: updated connect to 1.8.x
+  * Removed sass.js support from express(1)
+
+2.5.0 / 2011-10-24 
+==================
+
+  * Added ./routes dir for generated app by default
+  * Added npm install reminder to express(1) app gen
+  * Added 0.5.x support
+  * Removed `make test-cov` since it wont work with node 0.5.x
+  * Fixed express(1) public dir for windows. Closes #866
+
+2.4.7 / 2011-10-05 
+==================
+
+  * Added mkdirp to express(1). Closes #795
+  * Added simple _json-config_ example
+  * Added  shorthand for the parsed request's pathname via `req.path`
+  * Changed connect dep to 1.7.x to fix npm issue...
+  * Fixed `res.redirect()` __HEAD__ support. [reported by xerox]
+  * Fixed `req.flash()`, only escape args
+  * Fixed absolute path checking on windows. Closes #829 [reported by andrewpmckenzie]
+
 2.4.6 / 2011-08-22 
 ==================
 
@@ -9,7 +60,8 @@
 
   * Added support for routes to handle errors. Closes #809
   * Added `app.routes.all()`. Closes #803
-  * Added "basepath" setting to work in conjunction with reverse proxies etc.   * Refactored `Route` to use a single array of callbacks
+  * Added "basepath" setting to work in conjunction with reverse proxies etc.   
+  * Refactored `Route` to use a single array of callbacks
   * Added support for multiple callbacks for `app.param()`. Closes #801
 Closes #805
   * Changed: removed .call(self) for route callbacks

data/server/node_modules/express/Makefile

@@ -1,16 +1,10 @@
 
 DOCS = $(shell find docs/*.md)
-HTMLDOCS =$(DOCS:.md=.html)
+HTMLDOCS = $(DOCS:.md=.html)
 TESTS = $(shell find test/*.test.js)
 
 test:
-	@NODE_ENV=test ./node_modules/.bin/expresso \
-		-I lib \
-		$(TESTFLAGS) \
-		$(TESTS)
-
-test-cov:
-	@TESTFLAGS=--cov $(MAKE) test
+	@NODE_ENV=test ./node_modules/.bin/expresso $(TESTS)
 
 docs: $(HTMLDOCS)
 	@ echo "... generating TOC"
@@ -32,4 +26,4 @@ site:
 docclean:
 	rm -f docs/*.{1,html}
 
-.PHONY: site test test-cov docs docclean
+.PHONY: site test docs docclean

data/server/node_modules/express/Readme.md

@@ -95,7 +95,9 @@ The following are the major contributors of Express (in no specific order).
 
 Express 1.x is compatible with node 0.2.x and connect < 1.0.
 
-Express 2.x is compatible with node 0.4.x and connect 1.x
+Express 2.x is compatible with node 0.4.x or 0.6.x, and connect 1.x
+
+Express 3.x (master) will be compatible with node 0.6.x and connect 2.x
 
 ## Viewing Examples