daps 0.0.1.a.4 → 0.0.1.a.5

data/lib/daps/client.rb

@@ -6,9 +6,8 @@ class Daps::Client
 
   def start!
     system(%{
-      wget -T 300 -O /tmp/daps-#{@token}-client.tar.gz http://#{@remote}:#{@port}/#{@token} &&
+      wget -T 600 -O /tmp/daps-#{@token}-client.tar.gz http://#{@remote}:#{@port}/#{@token} &&
       tar --directory=#{@dir} -xzf /tmp/daps-#{@token}-client.tar.gz ;
-      wget -q -O /dev/null http://#{@remote}:#{@port}/#{@token}/close ;
       rm -f /tmp/daps-#{@token}-client.tar.gz
     })
   end

data/lib/daps/server.rb

@@ -18,35 +18,61 @@ class Daps::Server
   def call(env)
     env['daps.token'] = @token
     env['daps.dir']   = @dir
-    Http.call(env)
+    ArchiveStreamer.call(env)
   end
 
-  class Http < Sinatra::Base
+  class ArchiveStreamer < Cramp::Controller::Action
+    before_start :verify_token, :build_archive
+    on_start  :prepare_stream
+    on_finish :terminate
 
-    get '/:token/close' do
-      token = params[:token]
-      if @env['daps.token'] != token
-        halt(403, {'Content-type' => 'text/plain'}, 'back off!')
+    def verify_token
+      @token = File.basename(@env['PATH_INFO'])
+      if @env['daps.token'] != @token
+        halt 403, {}, 'back off!!'
+      else
+        yield
       end
-
-      File.unlink("/tmp/daps-#{token}-server.tar.gz")
-      EM.stop_event_loop
     end
 
-    get '/:token' do
-      token = params[:token]
-      if @env['daps.token'] != token
-        halt(403, {'Content-type' => 'text/plain'}, 'back off!')
-      end
-
+    def build_archive
       puts "Compressing files..."
       system(%{
         cd #{@env['daps.dir']} ;
-        tar -czf /tmp/daps-#{token}-server.tar.gz . ;
+        tar -czf /tmp/daps-#{@token}-server.tar.gz . ;
       })
 
-      puts "Transfering archive..."
-      send_file "/tmp/daps-#{token}-server.tar.gz"
+      @length  = File.size("/tmp/daps-#{@token}-server.tar.gz")
+      @archive = File.open("/tmp/daps-#{@token}-server.tar.gz")
+
+      yield
+    end
+
+    def respond_with
+      [200, {'Content-Type' => 'text/html', 'Content-Length' => @length.to_s}]
+    end
+
+    def prepare_stream
+      puts "Transferring archive..."
+      stream_chunks
+    end
+
+    def stream_chunks
+      if data = @archive.read(1024 * 8)
+        render data
+        EM.add_timer(0.01) { stream_chunks }
+      else
+        finish
+      end
+    end
+
+    def terminate
+      EM.next_tick {
+        if @env['daps.token'] == @token
+          File.unlink("/tmp/daps-#{@token}-server.tar.gz")
+          EM.stop_event_loop
+        end
+      }
     end
 
   end

data/lib/daps/version.rb

@@ -1,3 +1,3 @@
 module Daps
-  VERSION = '0.0.1.a.4'
+  VERSION = '0.0.1.a.5'
 end

data/lib/daps.rb

@@ -3,7 +3,7 @@ module Daps
   require 'uri'
   require 'digest/sha1'
   require 'thor'
-  require 'sinatra'
+  require 'cramp/controller'
 
   require 'daps/version'
   require 'daps/application'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: daps
 version: !ruby/object:Gem::Version 
-  hash: 117
+  hash: 119
   prerelease: true
   segments: 
   - 0
   - 0
   - 1
   - a
-  - 4
-  version: 0.0.1.a.4
+  - 5
+  version: 0.0.1.a.5
 platform: ruby
 authors: 
 - Simon Menke
@@ -21,18 +21,18 @@ date: 2010-06-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: cramp
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 29
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        - 11
+        version: "0.11"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency