vulcan 0.1.6 → 0.2.0

data/lib/vulcan/cli.rb

@@ -66,6 +66,8 @@ if no COMMAND is specified, a sensible default will be chosen for you
         end
       end
     end
+  rescue Interrupt
+    error "Aborted by user"
   rescue Errno::EPIPE
     error "Could not connect to build server: #{server}"
   end
@@ -135,6 +137,7 @@ update the build server
         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 BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-nodejs.git#versions 2>&1 }
         %x{ env BUNDLE_GEMFILE= heroku addons:add cloudant:oxygen }
       end
     end

data/lib/vulcan/version.rb

@@ -1,5 +1,5 @@
 module Vulcan
 
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 
 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/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,44 @@
 
+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 
 ==================
 

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
 

data/server/node_modules/express/bin/express

@@ -5,6 +5,7 @@
  */
 
 var fs = require('fs')
+  , os = require('os')
   , exec = require('child_process').exec
   , mkdirp = require('mkdirp');
 
@@ -12,7 +13,7 @@ var fs = require('fs')
  * Framework version.
  */
 
-var version = '2.4.7';
+var version = '2.5.5';
 
 /**
  * Add session support.
@@ -26,6 +27,14 @@ var sessions = false;
 
 var cssEngine;
 
+/**
+ * End-of-line code.
+ */
+
+var eol = os.platform
+  ? ('win32' == os.platform() ? '\r\n' : '\n')
+  : '\n';
+
 /**
  * Template engine to utilize.
  */
@@ -43,11 +52,26 @@ var usage = ''
   + '  Options:\n'
   + '    -s, --sessions           add session support\n'
   + '    -t, --template <engine>  add template <engine> support (jade|ejs). default=jade\n'
-  + '    -c, --css <engine>       add stylesheet <engine> support (less|sass|stylus). default=plain css\n'
+  + '    -c, --css <engine>       add stylesheet <engine> support (stylus). default=plain css\n'
   + '    -v, --version            output framework version\n'
   + '    -h, --help               output help information\n'
   ;
 
+/**
+ * Routes index template.
+ */
+
+var index = [
+    ''
+  , '/*'
+  , ' * GET home page.'
+  , ' */'
+  , ''
+  , 'exports.index = function(req, res){'
+  , '  res.render(\'index\', { title: \'Express\' })'
+  , '};'
+].join(eol);
+
 /**
  * Jade layout template.
  */
@@ -59,7 +83,7 @@ var jadeLayout = [
   , '    title= title'
   , '    link(rel=\'stylesheet\', href=\'/stylesheets/style.css\')'
   , '  body!= body'
-].join('\n');
+].join(eol);
 
 /**
  * Jade index template.
@@ -68,7 +92,7 @@ var jadeLayout = [
 var jadeIndex = [
     'h1= title'
   , 'p Welcome to #{title}'
-].join('\n');
+].join(eol);
 
 /**
  * EJS layout template.
@@ -85,7 +109,7 @@ var ejsLayout = [
   , '    <%- body %>'
   , '  </body>'
   , '</html>'
-].join('\n');
+].join(eol);
 
 /**
  * EJS index template.
@@ -94,7 +118,7 @@ var ejsLayout = [
 var ejsIndex = [
     '<h1><%= title %></h1>'
   , '<p>Welcome to <%= title %></p>'
-  ].join('\n');
+  ].join(eol);
 
 /**
  * Default css template.
@@ -109,34 +133,7 @@ var css = [
   , 'a {'
   , '  color: #00B7FF;'
   , '}'
-].join('\n');
-
-/**
- * Default less template.
- */
-
-var less = [
-    'body {'
-  , '  padding: 50px;'
-  , '  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;'
-  , '}'
-  , ''
-  , 'a {'
-  , '  color: #00B7FF;'
-  , '}'
-].join('\n');
-
-/**
- * Default sass template.
- */
-
-var sass = [
-    'body'
-  , '  :padding 50px'
-  , '  :font 14px "Lucida Grande", Helvetica, Arial, sans-serif'
-  , 'a'
-  , '  :color #00B7FF'
-].join('\n');
+].join(eol);
 
 /**
  * Default stylus template.
@@ -148,7 +145,7 @@ var stylus = [
   , '  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif'
   , 'a'
   , '  color: #00B7FF'
-].join('\n');
+].join(eol);
 
 /**
  * App template.
@@ -160,7 +157,8 @@ var app = [
   , ' * Module dependencies.'
   , ' */'
   , ''
-  , 'var express = require(\'express\');'
+  , 'var express = require(\'express\')'
+  , '  , routes = require(\'./routes\')'
   , ''
   , 'var app = module.exports = express.createServer();'
   , ''
@@ -185,16 +183,12 @@ var app = [
   , ''
   , '// Routes'
   , ''
-  , 'app.get(\'/\', function(req, res){'
-  , '  res.render(\'index\', {'
-  , '    title: \'Express\''
-  , '  });'
-  , '});'
+  , 'app.get(\'/\', routes.index);'
   , ''
   , 'app.listen(3000);'
   , 'console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);'
   , ''
-].join('\n');
+].join(eol);
 
 // Parse arguments
 
@@ -260,7 +254,16 @@ while (args.length) {
  */
 
 function createApplicationAt(path) {
+  console.log();
+  process.on('exit', function(){
+    console.log();
+    console.log('   dont forget to install dependencies:');
+    console.log('   $ cd %s && npm install', path);
+    console.log();
+  });
+
   mkdir(path, function(){
+    mkdir(path + '/public');
     mkdir(path + '/public/javascripts');
     mkdir(path + '/public/images');
     mkdir(path + '/public/stylesheets', function(){
@@ -268,16 +271,15 @@ function createApplicationAt(path) {
         case 'stylus':
           write(path + '/public/stylesheets/style.styl', stylus);
           break;
-        case 'less':
-          write(path + '/public/stylesheets/style.less', less);
-          break;
-        case 'sass':
-          write(path + '/public/stylesheets/style.sass', sass);
-          break;
         default:
           write(path + '/public/stylesheets/style.css', css);
       }
     });
+
+    mkdir(path + '/routes', function(){
+      write(path + '/routes/index.js', index);
+    });
+
     mkdir(path + '/views', function(){
       switch (templateEngine) {
         case 'ejs':
@@ -293,12 +295,8 @@ function createApplicationAt(path) {
 
     // CSS Engine support
     switch (cssEngine) {
-      case 'sass':
-      case 'less':
-        app = app.replace('{css}', '\n  app.use(express.compiler({ src: __dirname + \'/public\', enable: [\'' + cssEngine + '\'] }));');
-        break;
       case 'stylus':
-        app = app.replace('{css}', '\n  app.use(require(\'stylus\').middleware({ src: __dirname + \'/public\' }));');
+        app = app.replace('{css}', eol + '  app.use(require(\'stylus\').middleware({ src: __dirname + \'/public\' }));');
         break;
       default:
         app = app.replace('{css}', '');
@@ -306,22 +304,22 @@ function createApplicationAt(path) {
 
     // Session support
     app = app.replace('{sess}', sessions
-      ? '\n  app.use(express.cookieParser());\n  app.use(express.session({ secret: \'your secret here\' }));'
+      ? eol + '  app.use(express.cookieParser());' + eol + '  app.use(express.session({ secret: \'your secret here\' }));'
       : '');
 
     // Template support
     app = app.replace(':TEMPLATE', templateEngine);
 
     // package.json
-    var json = '{\n';
-    json += '    "name": "application-name"\n';
-    json += '  , "version": "0.0.1"\n';
-    json += '  , "private": true\n';
-    json += '  , "dependencies": {\n';
-    json += '      "express": "' + version + '"\n';
-    if (cssEngine) json += '    , "' + cssEngine + '": ">= 0.0.1"\n';
-    if (templateEngine) json += '    , "' + templateEngine + '": ">= 0.0.1"\n';
-    json += '  }\n';
+    var json = '{' + eol;
+    json += '    "name": "application-name"' + eol;
+    json += '  , "version": "0.0.1"' + eol;
+    json += '  , "private": true' + eol;
+    json += '  , "dependencies": {' + eol;
+    json += '      "express": "' + version + '"' + eol;
+    if (cssEngine) json += '    , "' + cssEngine + '": ">= 0.0.1"' + eol;
+    if (templateEngine) json += '    , "' + templateEngine + '": ">= 0.0.1"' + eol;
+    json += '  }' + eol;
     json += '}';