vulcan 0.4.0 → 0.5.0

data/README.md

@@ -1 +1,80 @@
-This repo has been moved to [heroku/vulcan](http://github.com/heroku/vulcan)
+# 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)

data/lib/vulcan/cli.rb

@@ -25,6 +25,7 @@ if no COMMAND is specified, a sensible default will be chosen for you
   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 :source,  :aliases => "-s", :desc => "the source directory to build from"
+  method_option :deps,    :aliases => "-d", :desc => "other vulcan compiled libraries to build with"
   method_option :verbose, :aliases => "-v", :desc => "show the full build output", :type => :boolean
 
   def build
@@ -35,6 +36,7 @@ if no COMMAND is specified, a sensible default will be chosen for you
     output  = options[:output]  || "/tmp/#{name}.tgz"
     prefix  = options[:prefix]  || "/app/vendor/#{name}"
     command = options[:command] || "./configure --prefix #{prefix} && make install"
+    deps    = options[:deps]    || ""
     server  = URI.parse(ENV["MAKE_SERVER"] || "http://#{app}.herokuapp.com")
 
     Dir.mktmpdir do |dir|
@@ -47,7 +49,8 @@ if no COMMAND is specified, a sensible default will be chosen for you
           "code" => UploadIO.new(input, "application/octet-stream", "input.tgz"),
           "command" => command,
           "prefix" => prefix,
-          "secret" => config[:secret]
+          "secret" => config[:secret],
+          "deps"   => deps
 
         puts ">> Building with: #{command}"
         response = Net::HTTP.start(server.host, server.port) do |http|

data/lib/vulcan/version.rb

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

data/server/bin/make

@@ -10,7 +10,8 @@ id  = ARGV.shift
 require "couchrest"
 require "fileutils"
 require "tmpdir"
-
+require "rest_client"
+ 
 db = CouchRest.database!(ENV["CLOUDANT_URL"] + "/make")
 
 Dir.mktmpdir do |dir|
@@ -19,11 +20,42 @@ Dir.mktmpdir do |dir|
 
     command = doc["command"]
     prefix = doc["prefix"]
+    deps = doc["deps"] || ""
 
     File.open("input.tgz", "wb") do |file|
       file.print doc.fetch_attachment("input")
     end
 
+    deps.split(",").each_with_index do |dep, index|
+      puts "downloading #{dep}"
+      File.open("dep_#{index}.tgz", "wb") do |file|
+        begin
+          file.print RestClient.get(dep)
+        rescue Exception => ex
+          puts ex.inspect
+        end 
+      end
+    end
+      
+    FileUtils.mkdir_p "deps"
+
+    Dir.chdir("deps") do
+      deps.split(",").each_with_index do |dep, index|
+        %x{ tar xzf ../dep_#{index}.tgz 2>&1 }
+      end
+    end
+
+    unless deps.empty?
+      ENV["LDFLAGS"] ||= ""
+      ENV["LDFLAGS"] += " -L%s/deps/lib" % dir
+
+      ENV["CFLAGS"] ||= ""
+      ENV["CFLAGS"] += " -I%s/deps/include" % dir
+
+      ENV["CXXFLAGS"] ||= ""
+      ENV["CXXFLAGS"] += " -I%s/deps/include" % dir
+    end
+
     FileUtils.mkdir_p "input"
 
     Dir.chdir("input") do

data/server/package.json

@@ -1,14 +1,14 @@
 {
   "name":        "heroku-make",
   "version":     "0.0.1",
-  "dependencies": [
-    "connect-form",
-    "cradle",
-    "express",
-    "knox",
-    "node-uuid",
-    "restler"
-  ],
+  "dependencies": {
+    "connect-form": "0.2.x",
+    "cradle": "0.6.x",
+    "express": "2.x.x",
+    "knox": "0.0.x",
+    "node-uuid": "1.x.x",
+    "restler": "2.x.x"
+  },
   "engines": {
     "node": "0.6.x"
   }

data/server/web.js

@@ -26,7 +26,7 @@ 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();
+db.create(function(){});
 
 // POST /make starts a build
 app.post('/make', function(request, response, next) {
@@ -53,20 +53,20 @@ app.post('/make', function(request, response, next) {
         var id      = uuid();
         var command = fields.command;
         var prefix  = fields.prefix;
+        var deps    = fields.deps;
 
         // create a couchdb documents for this build
         log_action(id, 'saving to couchdb');
-        db.save(id, { command:command, prefix:prefix }, function(err, doc) {
+        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 + ']')
-          db.saveAttachment(
-            doc.id,
-            doc.rev,
-            'input',
-            'application/octet-stream',
-            fs.createReadStream(files.code.path),
+          fs.createReadStream(files.code.path).pipe(db.saveAttachment(
+            {id: doc.id,
+             rev: doc.rev},
+            {name:'input',
+            'Content-Type': 'application/octet-stream'},
             function(err, data) {
               if (err) {
                 // work around temporary problem with cloudant and document
@@ -99,7 +99,7 @@ app.post('/make', function(request, response, next) {
                 response.end();
               });
             }
-          );
+          ));
 
           // return the build id as a header
           response.header('X-Make-Id', id);
@@ -114,7 +114,7 @@ app.post('/make', function(request, response, next) {
 app.get('/output/:id', function(request, response, next) {
 
   // from couchdb
-  var stream = db.getAttachment(request.params.id, 'output');
+  var stream = db.getAttachment(request.params.id, 'output', function(){});
 
   stream.on('error', function(err) {
     console.log('download error: ' + err);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vulcan
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &70102058845160 !ruby/object:Gem::Requirement
+  requirement: &70318115078740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.20.0
   type: :runtime
   prerelease: false
-  version_requirements: *70102058845160
+  version_requirements: *70318115078740
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70102058844240 !ruby/object:Gem::Requirement
+  requirement: &70318115075980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70102058844240
+  version_requirements: *70318115075980
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70102058843520 !ruby/object:Gem::Requirement
+  requirement: &70318115073940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70102058843520
+  version_requirements: *70318115073940
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70102058842760 !ruby/object:Gem::Requirement
+  requirement: &70318115072520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70102058842760
+  version_requirements: *70318115072520
 description: Build software in the cloud
 email: ddollar@gmail.com
 executables: