vulcan 0.2.5 → 0.3.0

data/README.md

@@ -1,80 +1 @@
-# Vulcan
-
-A build server in the cloud.
-
-## Usage
-
-    $ vulcan help
-    Tasks:
-      vulcan build            # build a piece of software for the heroku cloud using COMMAND as a build command if no COMMAND is...
-      vulcan create APP_NAME  # create a build server on Heroku
-      vulcan help [TASK]      # Describe available tasks or one specific task
-      vulcan update           # update the build server
-
-    $ vulcan help build
-    Usage:
-      vulcan build
-
-    Options:
-      -c, [--command=COMMAND]  # the command to run for compilation
-      -n, [--name=NAME]        # the name of the library (defaults ot the directory name)
-      -o, [--output=OUTPUT]    # output build artifacts to this file
-      -p, [--prefix=PREFIX]    # the build/install --prefix of the software
-      -s, [--source=SOURCE]    # the source directory to build from
-      -v, [--verbose]          # show the full build output
-
-    build a piece of software for the heroku cloud using COMMAND as a build command
-    if no COMMAND is specified, a sensible default will be chosen for you
-
-## Examples
-
-### Create a Build Server
-
-    $ vulcan create vulcan-david
-    Creating vulcan-david... done, stack is cedar
-    http://vulcan-david.herokuapp.com/ | git@heroku.com:vulcan-david.git
-    ...
-
-### Build
-
-    $ vulcan build -s ~/Code/memcached -p /tmp/memcached -c "./autogen.sh && ./configure --prefix=/tmp/memcached && make install"
-    >> Packaging local directory
-    >> Uploading code for build
-    >> Building with: ./autogen.sh && ./configure --prefix=/tmp/memcached && make install
-    >> Downloading build artifacts to: /tmp/memcached.tgz
-
-    $ tar tvf /tmp/memcached.tgz
-    drwx------  0 u24714 24714       0 Sep 21 20:25 bin/
-    -rwxr-xr-x  0 u24714 24714  273082 Sep 21 20:25 bin/memcached
-    drwx------  0 u24714 24714       0 Sep 21 20:25 include/
-    drwx------  0 u24714 24714       0 Sep 21 20:25 include/memcached/
-    -rw-r--r--  0 u24714 24714   14855 Sep 21 20:25 include/memcached/protocol_binary.h
-    drwx------  0 u24714 24714       0 Sep 21 20:25 share/
-    drwx------  0 u24714 24714       0 Sep 21 20:25 share/man/
-    drwx------  0 u24714 24714       0 Sep 21 20:25 share/man/man1/
-    -rw-r--r--  0 u24714 24714    5304 Sep 21 20:25 share/man/man1/memcached.1
-    
-### Keep the Build Server Updated
-
-    $ vulcan update
-    Initialized empty Git repository in /private/var/folders/rm/qksq9jk15vx0xcjxkqc8yg5w0000gn/T/d20110921-70016-1iksqwy/.git/
-    Counting objects: 176, done.
-    Delta compression using up to 8 threads.
-    Compressing objects: 100% (156/156), done.
-    Writing objects: 100% (176/176), 326.86 KiB, done.
-    Total 176 (delta 5), reused 0 (delta 0)
-
-    -----> Heroku receiving push
-    -----> Node.js app detected
-    -----> Vendoring node 0.4.7
-    -----> Installing dependencies with npm 1.0.27
-
-           Dependencies installed
-    -----> Discovering process types
-           Procfile declares types -> web
-    -----> Compiled slug size is 5.5MB
-    -----> Launching... done, v5
-           http://vulcan-david.herokuapp.com deployed to Heroku
-
-    To git@heroku.com:vulcan-david.git
-     + 2e69a42...eddcb91 master -> master (forced update)
+This repo has been moved to [heroku/vulcan](http://github.com/heroku/vulcan)

data/lib/vulcan/cli.rb

@@ -1,4 +1,9 @@
 require "digest/sha1"
+require "heroku/auth"
+require "heroku/command"
+require "heroku/command/base"
+require "heroku/command/help"
+require "heroku/plugin"
 require "net/http/post/multipart"
 require "rest_client"
 require "thor"
@@ -57,20 +62,15 @@ 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(output_url)
+            output.print RestClient.get("#{server}/output/#{response["X-Make-Id"]}")
           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
@@ -101,32 +101,14 @@ update the build server
   def update
     error "no app yet, create first" unless config[:app]
 
-    FileUtils.mkdir_p File.expand_path("~/.heroku/plugins/heroku-credentials")
-
-    File.open(File.expand_path("~/.heroku/plugins/heroku-credentials/init.rb"), "w") do |file|
-      file.puts <<-CONTENTS
-        class Heroku::Auth
-          def self.api_key
-            Heroku::Client.auth(user, password, host)["api_key"]
-          end
-        end
-        class Heroku::Command::Credentials < Heroku::Command::Base
-
-          # credentials
-          #
-          # list your api key
-          #
-          def index
-            puts Heroku::Auth.api_key
-          end
-        end
-      CONTENTS
-    end
+    # clean up old plugin, can use auth:token now
+    FileUtils.rm_rf(File.expand_path("~/.heroku/plugins/heroku-credentials"))
 
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
-        api_key = %x{ env BUNDLE_GEMFILE= heroku credentials 2>&1 }.chomp
-        error "invalid api key detected, try running `heroku credentials`" if api_key =~ / /
+        Heroku::Plugin.load!
+        api_key = Heroku::Auth.api_key
+        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"
@@ -135,14 +117,11 @@ update the build server
           file.puts ".env"
           file.puts "node_modules"
         end
-
-        %x{ env BUNDLE_GEMFILE= heroku config:add BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-nodejs.git#versions 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} NODE_PATH=lib 2>&1 }
+        %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 addons:add cloudant:oxygen }
       end
     end

data/lib/vulcan/version.rb

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

data/server/bin/make

@@ -35,10 +35,12 @@ 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
-      # temporarily work around problem with bigcouch
+      retries += 1
+      retry if retries < 3
     end
 
   end

data/server/lib/spawner.js

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

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

@@ -20,15 +20,6 @@ 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)
@@ -151,11 +142,9 @@ Creates a new incoming form.
 
 The encoding to use for incoming form fields.
 
-#### incomingForm.uploadDir = process.env.TMP || '/tmp' || process.cwd()
+#### incomingForm.uploadDir = '/tmp'
 
-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.
+The directory for placing file uploads in. You can later on move them using `fs.rename()`.
 
 #### incomingForm.keepExtensions = false
 

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

@@ -1,6 +1,5 @@
 if (global.GENTLY) require = GENTLY.hijack(require);
 
-var fs = require('fs');
 var util = require('./util'),
     path = require('path'),
     File = require('./file'),
@@ -18,7 +17,7 @@ function IncomingForm() {
 
   this.maxFieldsSize = 2 * 1024 * 1024;
   this.keepExtensions = false;
-  this.uploadDir = IncomingForm.UPLOAD_DIR;
+  this.uploadDir = '/tmp';
   this.encoding = 'utf-8';
   this.headers = null;
   this.type = null;
@@ -33,20 +32,6 @@ 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 {
@@ -162,7 +147,7 @@ IncomingForm.prototype.onPart = function(part) {
 IncomingForm.prototype.handlePart = function(part) {
   var self = this;
 
-  if (part.filename === undefined) {
+  if (!part.filename) {
     var value = ''
       , decoder = new StringDecoder(this.encoding);
 
@@ -293,7 +278,10 @@ IncomingForm.prototype._initMultipart = function(boundary) {
         part.name = m[1];
       }
 
-      part.filename = self._fileName(headerValue);
+      var filename = self._fileName(headerValue);
+      if (filename) {
+        part.filename = filename;
+      }
     } else if (headerField == 'content-type') {
       part.mime = headerValue;
     }
@@ -323,7 +311,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,13 +49,6 @@ 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);
@@ -303,10 +296,6 @@ MultipartParser.prototype.write = function(buffer) {
 
 MultipartParser.prototype.end = function() {
   if (this.state != S.END) {
-    return new Error('MultipartParser.end(): stream ended unexpectedly: ' + this.explain());
+    return new Error('MultipartParser.end(): stream ended unexpectedly');
   }
 };
-
-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.6",
+  "version": "1.0.3",
   "dependencies": {},
   "devDependencies": {
     "gently": "0.8.0",

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

@@ -24,3 +24,13 @@ 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,3 +22,12 @@ 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/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: ' + parser.explain());
+    assert.equal(parser.end().message, 'MultipartParser.end(): stream ended unexpectedly');
   })();
 
   (function testRegular() {

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

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

data/server/node_modules/cradle/node_modules/vows/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 cloudhead
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/server/node_modules/cradle/node_modules/vows/Makefile

@@ -0,0 +1,7 @@
+#
+# Run all tests
+#
+test: 
+	@@bin/vows test/*
+
+.PHONY: test install

data/server/node_modules/cradle/node_modules/vows/README.md

@@ -0,0 +1,39 @@
+Vows
+====
+
+> Asynchronous BDD & continuous integration for node.js
+
+#### <http://vowsjs.org> #
+
+introduction
+------------
+There are two reasons why we might want asynchronous testing. The first, and obvious reason is that node.js is asynchronous, and therefore our tests need to be. The second reason is to make test suites which target I/O libraries run much faster.
+
+_Vows_ is an experiment in making this possible, while adding a minimum of overhead.
+
+synopsis
+--------
+
+    var vows = require('vows'),
+        assert = require('assert');
+
+    vows.describe('Deep Thought').addBatch({
+        'An instance of DeepThought': {
+            topic: new DeepThought,
+
+            'should know the answer to the ultimate question of life': function (deepThought) {
+                assert.equal (deepThought.question('what is the answer to the universe?'), 42);
+            }
+        }
+    });
+
+installation
+------------
+
+    $ npm install vows
+
+documentation
+-------------
+
+Head over to <http://vowsjs.org>
+