vulcan 0.7.2 → 0.8.0

data/lib/vulcan/cli.rb

@@ -24,7 +24,7 @@ if no COMMAND is specified, a sensible default will be chosen for you
   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 => "vulcan will look in this path for the compiled artifacts"
-  method_option :source,  :aliases => "-s", :desc => "the source directory to build from"
+  method_option :source,  :aliases => "-s", :desc => "directory, tarball, or url containing the source"
   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
 
@@ -32,50 +32,71 @@ if no COMMAND is specified, a sensible default will be chosen for you
     app = read_config[:app] || "need a server first, use vulcan create"
 
     source  = options[:source]  || Dir.pwd
-    name    = options[:name]    || File.basename(source)
+    name    = options[:name]    || File.basename(source, File.extname(source))
     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["VULCAN_HOST"] || "http://#{app}.herokuapp.com")
 
+    source_is_url = URI.parse(source).scheme
+
     Dir.mktmpdir do |dir|
-      action "Packaging local directory" do
-        %x{ cd #{source} && tar czvf #{dir}/input.tgz . 2>&1 }
+      unless source_is_url
+        input_tgz = "#{dir}/input.tgz"
+        if File.directory?(source)
+          action "Packaging local directory" do
+            %x{ cd #{source} && tar czvf #{input_tgz} . 2>&1 }
+          end
+        else
+          input_tgz = source
+        end
+        input = File.open(input_tgz, "r")
+      end
+
+      make_options = {
+        "command" => command,
+        "prefix"  => prefix,
+        "secret"  => config[:secret],
+        "deps"    => deps
+      }
+
+      if source_is_url
+        make_options["code_url"] = source
+      else
+        make_options["code"] = UploadIO.new(input, "application/octet-stream", "input.tgz")
       end
 
-      File.open("#{dir}/input.tgz", "r") do |input|
-        request = Net::HTTP::Post::Multipart.new "/make",
-          "code" => UploadIO.new(input, "application/octet-stream", "input.tgz"),
-          "command" => command,
-          "prefix" => prefix,
-          "secret" => config[:secret],
-          "deps"   => deps
+      request = Net::HTTP::Post::Multipart.new "/make", make_options
 
+      if source_is_url
+        print "Initializing build... "
+      else
         print "Uploading source package... "
-        response = Net::HTTP.start(server.host, server.port) do |http|
-          http.request(request) do |response|
-            response.read_body do |chunk|
-              unless chunk == 0.chr + "\n"
-                print chunk if options[:verbose]
-              end
+      end
+
+      response = Net::HTTP.start(server.host, server.port) do |http|
+        http.request(request) do |response|
+          response.read_body do |chunk|
+            unless chunk == 0.chr + "\n"
+              print chunk if options[:verbose]
             end
           end
         end
+      end
 
-        error "Unknown error, no build output given" unless response["X-Make-Id"]
+      error "Unknown error, no build output given" unless response["X-Make-Id"]
 
-        puts ">> Downloading build artifacts to: #{output}"
+      puts ">> Downloading build artifacts to: #{output}"
 
-        output_url = "#{server}/output/#{response["X-Make-Id"]}"
-        puts "   (available at #{output_url})"
+      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)
-          rescue Exception => ex
-            puts ex.inspect
-          end
+      File.open(output, "w") do |output|
+        begin
+          output.print RestClient.get(output_url)
+        rescue Exception => ex
+          puts ex.inspect
         end
       end
     end

data/lib/vulcan/version.rb

@@ -1,5 +1,5 @@
 module Vulcan
 
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 
 end

data/server/web.coffee

@@ -2,7 +2,9 @@ coffee  = require("coffee-script")
 express = require("express")
 fs      = require("fs")
 logger  = require("logger")
+rest    = require("restler")
 spawner = require("spawner").init()
+url     = require("url")
 util    = require("util")
 uuid    = require("node-uuid")
 
@@ -34,23 +36,36 @@ app.post "/make", (req, res, next) ->
   db.save id, command:command, prefix:prefix, deps:deps, (err, doc) ->
     return log.error(util.inspect(err)) if err
 
-    # save uploaded code as an attachment
-    log.info "saving attachment - [id:#{doc.id} rev:#{doc.rev}]"
-    fs.createReadStream(req.files.code.path).pipe(
-      db.saveAttachment {id:doc.id, rev:doc.rev}, {name:"input", "Content-Type":"application/octet-stream"}, (err, data) ->
-        return log.error(err.reason) if err && err.error != "conflict"
+    save_attachment = (source, cb) ->
+      source.pipe(
+        db.saveAttachment {id:doc.id, rev:doc.rev}, {name:"input", "Content-Type":"application/octet-stream"}, (err, data) ->
+          return log.error(err.reason) if err && err.error != "conflict"
+          cb())
 
-        res.write "done\n"
-        res.write "Building with: #{command}\n"
-        log.info  "spawning build"
+    build = ->
+      res.write "done\n"
+      res.write "Building with: #{command}\n"
+      log.info  "spawning build"
+      make = spawner.spawn "bin/make \"#{id}\"", env:
+        CLOUDANT_URL: process.env.CLOUDANT_URL
+        PATH: process.env.PATH
+      make.on "error", (err)  -> log.error(err)
+      make.on "data",  (data) -> res.write data
+      make.on "end",   (code) -> res.end()
 
-        make = spawner.spawn "bin/make \"#{id}\"", env:
-          CLOUDANT_URL: process.env.CLOUDANT_URL
-          PATH: process.env.PATH
+    if (req.files.code)
+      log.info "saving attachment - [id:#{doc.id} rev:#{doc.rev}]"
+      save_attachment fs.createReadStream(req.files.code.path), ->
+        build()
 
-        make.on "error", (err)  -> log.error(err)
-        make.on "data",  (data) -> res.write data
-        make.on "end",   (code) -> res.end())
+    else if (req.body.code_url)
+      log.info "downloading attachment: #{req.body.code_url}"
+      parts = url.parse(req.body.code_url)
+      client = if parts.protocol is "https:" then require("https") else require("http")
+      get = client.request parts, (res) ->
+        save_attachment res, ->
+          build()
+      get.end()
 
 app.get "/output/:id", (req, res, next) ->
   log    = logger.init(res, next, req.params.id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vulcan
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &70147638459760 !ruby/object:Gem::Requirement
+  requirement: &70103648157100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147638459760
+  version_requirements: *70103648157100
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70147638457320 !ruby/object:Gem::Requirement
+  requirement: &70103648154600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70147638457320
+  version_requirements: *70103648154600
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70147638455780 !ruby/object:Gem::Requirement
+  requirement: &70103648153680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70147638455780
+  version_requirements: *70103648153680
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70147638454480 !ruby/object:Gem::Requirement
+  requirement: &70103648152920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,7 +57,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70147638454480
+  version_requirements: *70103648152920
 description: Build software in the cloud
 email: ddollar@gmail.com
 executables:
@@ -808,7 +808,7 @@ files:
 - server/vendor/gems/specifications/multi_json-1.0.3.gemspec
 - server/vendor/gems/specifications/rest-client-1.6.7.gemspec
 - server/web.coffee
-homepage: http://vulcan.com/
+homepage: https://github.com/heroku/vulcan
 licenses: []
 post_install_message: Please run 'vulcan update' to update your build server.
 rdoc_options: []