vulcan 0.5.0 → 0.6.0

data/README.md

@@ -16,12 +16,13 @@ A build server in the cloud.
       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
+      -c, [--command=COMMAND]     # the command to run for compilation
+      -n, [--name=NAME]           # the name of the library (defaults to 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
+      -d, [--deps=one two three]  # urls of vulcan compiled libraries to build with
+      -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

data/lib/vulcan/cli.rb

@@ -21,11 +21,11 @@ if no COMMAND is specified, a sensible default will be chosen for you
   DESC
 
   method_option :command, :aliases => "-c", :desc => "the command to run for compilation"
-  method_option :name,    :aliases => "-n", :desc => "the name of the library (defaults ot the directory name)"
+  method_option :name,    :aliases => "-n", :desc => "the name of the library (defaults to the directory name)"
   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 :deps,    :aliases => "-d", :desc => "urls of vulcan compiled libraries to build with", :type=>:array
   method_option :verbose, :aliases => "-v", :desc => "show the full build output", :type => :boolean
 
   def build
@@ -36,7 +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]    || ""
+    deps    = options[:deps]    || []
     server  = URI.parse(ENV["MAKE_SERVER"] || "http://#{app}.herokuapp.com")
 
     Dir.mktmpdir do |dir|
@@ -123,7 +123,6 @@ update the build server
         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 }
@@ -169,7 +168,7 @@ 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

data/lib/vulcan/version.rb

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

data/server/bin/make

@@ -20,13 +20,13 @@ Dir.mktmpdir do |dir|
 
     command = doc["command"]
     prefix = doc["prefix"]
-    deps = doc["deps"] || ""
+    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|
+    deps.each_with_index do |dep, index|
       puts "downloading #{dep}"
       File.open("dep_#{index}.tgz", "wb") do |file|
         begin
@@ -40,7 +40,7 @@ Dir.mktmpdir do |dir|
     FileUtils.mkdir_p "deps"
 
     Dir.chdir("deps") do
-      deps.split(",").each_with_index do |dep, index|
+      deps.each_with_index do |dep, index|
         %x{ tar xzf ../dep_#{index}.tgz 2>&1 }
       end
     end

data/server/package.json

@@ -10,6 +10,7 @@
     "restler": "2.x.x"
   },
   "engines": {
-    "node": "0.6.x"
+    "node": "0.6.12",
+    "npm": "1.1.4"
   }
 }

data/server/web.js

@@ -53,7 +53,7 @@ app.post('/make', function(request, response, next) {
         var id      = uuid();
         var command = fields.command;
         var prefix  = fields.prefix;
-        var deps    = fields.deps;
+        var deps    = JSON.parse(fields.deps);
 
         // create a couchdb documents for this build
         log_action(id, 'saving to couchdb');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vulcan
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &70318115078740 !ruby/object:Gem::Requirement
+  requirement: &70249862502880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.20.0
   type: :runtime
   prerelease: false
-  version_requirements: *70318115078740
+  version_requirements: *70249862502880
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70318115075980 !ruby/object:Gem::Requirement
+  requirement: &70249862501960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70318115075980
+  version_requirements: *70249862501960
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70318115073940 !ruby/object:Gem::Requirement
+  requirement: &70249862501440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70318115073940
+  version_requirements: *70249862501440
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70318115072520 !ruby/object:Gem::Requirement
+  requirement: &70249862500920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70318115072520
+  version_requirements: *70249862500920
 description: Build software in the cloud
 email: ddollar@gmail.com
 executables:
@@ -68,8 +68,6 @@ files:
 - lib/vulcan.rb
 - README.md
 - server/bin/make
-- server/lib/on.js
-- server/lib/spawner.js
 - server/node_modules/connect-form/History.md
 - server/node_modules/connect-form/index.html
 - server/node_modules/connect-form/index.js
@@ -91,8 +89,6 @@ files:
 - server/node_modules/connect-form/node_modules/formidable/Readme.md
 - server/node_modules/connect-form/node_modules/formidable/test/common.js
 - server/node_modules/connect-form/node_modules/formidable/test/fast/test-incoming-form.js
-- ! 'server/node_modules/connect-form/node_modules/formidable/test/fixture/file/:
-  \ ? % * | " < > . ☃ ; '' @ # $ ^ & ( ) - _ = + { } [ ] ` ~.txt'
 - server/node_modules/connect-form/node_modules/formidable/test/fixture/file/plain.txt
 - server/node_modules/connect-form/node_modules/formidable/test/fixture/http/no-filename/generic.http
 - server/node_modules/connect-form/node_modules/formidable/test/fixture/http/special-chars-in-filename/info.md
@@ -563,6 +559,7 @@ files:
 - server/node_modules/node-uuid/test/test.html
 - server/node_modules/node-uuid/test/test.js
 - server/node_modules/node-uuid/uuid.js
+- server/node_modules/on/index.js
 - server/node_modules/restler/bin/restler
 - server/node_modules/restler/index.js
 - server/node_modules/restler/lib/multipartform.js
@@ -573,6 +570,7 @@ files:
 - server/node_modules/restler/test/all.js
 - server/node_modules/restler/test/restler.js
 - server/node_modules/restler/test/test_helper.js
+- server/node_modules/spawner/index.js
 - server/package.json
 - server/Procfile
 - server/vendor/gems/bin/restclient

data/server/node_modules/connect-form/node_modules/formidable/test/fixture/file/: // ? % * | /" < > . /342/230/203 ; ' @ # $ ^ & ( ) - _ = + { } [ ] ` ~.txt"

@@ -1 +0,0 @@
-I am a text file with a funky name!