daps 0.0.1.a.3 → 0.0.1.a.4

data/lib/daps/application.rb

@@ -1,10 +1,8 @@
 class Daps::Application < Thor
 
   desc "server DIR [TOKEN]", "Start the daps server"
-  method_option :port, :type => :numeric, :default => 5001
+  method_option :port, :type => :numeric, :default => 0
   def server(dir, token=nil)
-    token ||= Digest::SHA1.hexdigest([Time.now, rand(1<<100)].join('--'))
-    puts "Token: #{token}"
     server = Daps::Server.new(dir, token, options.port)
     server.start!
   end

data/lib/daps/client.rb

@@ -6,8 +6,9 @@ class Daps::Client
 
   def start!
     system(%{
-      wget -O /tmp/daps-#{@token}-client.tar.gz http://#{@remote}:#{@port}/#{@token} &&
+      wget -T 300 -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

@@ -2,11 +2,17 @@ class Daps::Server
 
   def initialize(dir, token, port)
     @dir, @token, @port = File.expand_path(dir), token, port.to_i
-    Dir.chdir(@dir)
   end
 
   def start!
-    Rack::Handler::Thin.run self, :Port => @port
+    Dir.chdir(@dir)
+
+    @port    = rand(5000) + 5000 if @port == 0
+    @token ||= Digest::SHA1.hexdigest([Time.now, rand(1<<100)].join('--'))
+
+    puts "URI: daps://#{`hostname`.strip}:#{@port}/#{@token}"
+
+    Rack::Handler::Thin.run(self, :Port => @port) { |s| s.silent = true }
   end
 
   def call(env)
@@ -17,6 +23,16 @@ class Daps::Server
 
   class Http < Sinatra::Base
 
+    get '/:token/close' do
+      token = params[:token]
+      if @env['daps.token'] != token
+        halt(403, {'Content-type' => 'text/plain'}, 'back off!')
+      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
@@ -35,16 +51,4 @@ class Daps::Server
 
   end
 
-end
-
-class Sinatra::Helpers::StaticFile < ::File
-  alias_method :other_each, :each
-  def each(&block)
-    other_each(&block)
-  ensure
-    EM.next_tick do
-      File.unlink(self.path)
-      EM.stop_event_loop
-    end
-  end
 end

data/lib/daps/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: daps
 version: !ruby/object:Gem::Version 
-  hash: 123
+  hash: 117
   prerelease: true
   segments: 
   - 0
   - 0
   - 1
   - a
-  - 3
-  version: 0.0.1.a.3
+  - 4
+  version: 0.0.1.a.4
 platform: ruby
 authors: 
 - Simon Menke