spitball 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/bin/spitball-server

@@ -36,20 +36,32 @@ get '/:digest.:format' do |digest, format|
   send_file Spitball::Repo.path(digest, format), :type => format
 end
 
-# POST a gemfile. Returns 201 Created if the bundle already exists, or 202 Accepted if it does not. The body of the response is the URI for the tarball.
+class Streamer
+  def initialize(io); @io = io end
+  def each; while buf = @io.read(200); yield buf end end
+end
+
+# POST a gemfile. Returns 201 Created if the bundle already exists, or
+# 202 Accepted if it does not. The body of the response is the URI for
+# the tarball.
 post '/create' do
-  p request.body.read
-  request.body.rewind
   ball = Spitball.new(request.body.read)
   url = "#{request.url.split("/create").first}/#{ball.digest}.tgz"
   response['Location'] = url
 
   if ball.cached?
     status 201
+    "Bundle tarball pre-cached.\n"
   else
     status 202
-    fork { ball.cache! }
-  end
 
-  url
+    pid = open("|-")
+
+    if pid == nil # child
+      ball.cache!
+      exit!
+    end
+
+    Streamer.new(pid)
+  end
 end

data/lib/spitball/remote.rb

@@ -12,33 +12,48 @@ class Spitball::Remote
   end
 
   def copy_to(path)
-    data = get_tarball_data
+    data = generate_remote_tarball
     File.open(path, 'w') { |f| f.write data }
   end
 
-  def get_tarball_data
+  private
+
+  def generate_remote_tarball
     url = URI.parse("http://#{@host}:#{@port}/create")
     res = Net::HTTP.start(url.host, url.port) do |http|
-      http.post(url.path, @gemfile)
+      http.post(url.path, @gemfile) do |body|
+        print body
+      end
     end
 
-    case res.code
-    when '201' # Created
-      Net::HTTP.get(URI.parse(res['Location']))
-    when '202' # Accepted
-      (WAIT_SECONDS / 2).times do
-        sleep 2
-        try = Net::HTTP.get_response(URI.parse(res['Location']))
-        next if try.code != '200'
-        return try.body
+    print "\nDownloading tarball..."; $stdout.flush
+
+    data =
+      case res.code
+      when '201', '202' # Created, Accepted
+        get_tarball_data res['Location']
+      else
+        raise Spitball::ServerFailure, "Expected 2xx response code. Got #{res.code}."
       end
 
-      raise Spitball::ServerFailure, "Spitball build timed out. The build failed or it's just taking a while..."
-    else
-      raise Spitball::ServerFailure, "Expected 2xx response code. Got #{res.code}."
-    end
+    puts "done."
+
+    data
   rescue URI::InvalidURIError => e
     raise Spitball::ClientError, e.message
   end
 
+  def get_tarball_data(location)
+    uri = URI.parse(location)
+
+    (WAIT_SECONDS / 2).times do
+      if (res = Net::HTTP.get_response(uri)).code == '200'
+        return res.body
+      else
+        sleep 2
+      end
+    end
+
+    raise Spitball::ServerFailure, "Spitball download timed out."
+  end
 end

data/lib/spitball.rb

@@ -7,7 +7,7 @@ class Spitball
   require 'spitball/remote'
 
   class ServerFailure < StandardError; end
-  class ClientFailure < StandardError; end
+  class ClientError < StandardError; end
   class BundleCreationFailure < StandardError; end
 
   VERSION = '1.0'

data/spitball.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spitball}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Brandon Mitchell"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2010-09-02}
   s.description = %q{Use bundler to generate gem tarball packages.}
   s.email = %q{freels@twitter.com}
   s.executables = ["spitball", "spitball-cache-cleanup", "spitball-server"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spitball
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Matt Freels
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -07:00
+date: 2010-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency