vulcan 0.0.3 → 0.1.0

data/lib/vulcan/cli.rb

@@ -99,9 +99,14 @@ update the build server
 
     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
           def index
-            puts Heroku::Auth.password
+            puts Heroku::Auth.api_key
           end
         end
       CONTENTS
@@ -118,9 +123,8 @@ update the build server
           file.puts ".env"
           file.puts "node_modules"
         end
-        system "ls -la"
-        system "git add ."
-        system "git commit -m commit"
+        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 }

data/lib/vulcan/version.rb

@@ -1,5 +1,5 @@
 module Vulcan
 
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 
 end

data/server/bin/make

@@ -6,19 +6,20 @@ ENV["GEM_PATH"] = File.expand_path("../../vendor/gems", __FILE__)
 require "rubygems"
 
 id  = ARGV.shift
-command = ARGV.shift
-prefix = ARGV.shift
 
 require "couchrest"
 require "fileutils"
 require "tmpdir"
 
-db = CouchRest.database!(ENV["CLOUDANT_URL"] + ":5984/make")
+db = CouchRest.database!(ENV["CLOUDANT_URL"] + "/make")
 
 Dir.mktmpdir do |dir|
   Dir.chdir(dir) do
     doc = db.get(id)
 
+    command = doc["command"]
+    prefix = doc["prefix"]
+
     File.open("input.tgz", "wb") do |file|
       file.print doc.fetch_attachment("input")
     end
@@ -34,6 +35,13 @@ Dir.mktmpdir do |dir|
       %x{ tar czf #{dir}/output.tgz * 2>&1 }
     end
 
-    doc.put_attachment("output", File.open("#{dir}/output.tgz"))
+    retries = 0
+    begin
+      doc.put_attachment("output", File.open("#{dir}/output.tgz"))
+    rescue RestClient::Conflict
+      retries += 1
+      retry if retries < 3
+    end
+
   end
 end

data/server/web.js

@@ -17,12 +17,17 @@ var app = express.createServer(
 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] } } :
+  {
+    auth: { username: couchdb_url.auth.split(':')[0], password: couchdb_url.auth.split(':')[1] }
+  } :
   { }
 
-var db = new(cradle.Connection)(couchdb_url.host, couchdb_url.port || 5984, couchdb_options).database('make');
+var db = new(cradle.Connection)(couchdb_url.hostname, couchdb_url.port || 5984, couchdb_options).database('make');
 
-db.create();
+db.create(function(err, data) {
+  console.log('cerr: %s', err);
+  console.log('cdat: %s', data);
+});
 
 app.post('/make', function(request, response, next) {
   if (! request.form) {
@@ -32,8 +37,11 @@ app.post('/make', function(request, response, next) {
       if (err) {
         next(err);
       } else {
-        var id = uuid();
-        var doc = db.save(id, {}, function(err, doc) {
+        var id      = uuid();
+        var command = fields.command;
+        var prefix  = fields.prefix;
+
+        var doc = db.save(id, { command:command, prefix:prefix }, function(err, doc) {
           console.log('err: %s', sys.inspect(err));
           console.log('doc: %s', sys.inspect(doc));
 
@@ -44,19 +52,14 @@ app.post('/make', function(request, response, next) {
             'application/octet-stream',
             fs.createReadStream(files.code.path),
             function(err, data) {
-              var command = fields.command;
-              var prefix  = fields.prefix;
-
-              var make_args = [ id, command, prefix ].map(function(arg) {
-                return('"' + arg + '"');
-              }).join(' ');
-
-              var ls = spawner.spawn('bin/make ' + make_args, function(err) {
+              var ls = spawner.spawn('bin/make ' + id, function(err) {
                 console.log('couldnt spawn: ' + err);
               });
 
               ls.on('error', function(error) {
+                response.writeHead(500);
                 console.log('error: ' + error);
+                response.end();
               });
 
               ls.on('data', function(data) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vulcan
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000 Z
+date: 2011-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70144697507540 !ruby/object:Gem::Requirement
+  requirement: &70149200059360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70144697507540
+  version_requirements: *70149200059360
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70144697506920 !ruby/object:Gem::Requirement
+  requirement: &70149200058680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70144697506920
+  version_requirements: *70149200058680
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70144697506220 !ruby/object:Gem::Requirement
+  requirement: &70149200057980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70144697506220
+  version_requirements: *70149200057980
 description: Build software in the cloud
 email: ddollar@gmail.com
 executables: