zget 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a831b06d7c4da66c9b0632b5110bc6031754ac1
-  data.tar.gz: 69b1be9ef5e06e7f5651cc7c8d9c5aa01e9ae5c1
+  metadata.gz: f8412a5e29c87313f3ca871dcea9e46a946e561f
+  data.tar.gz: 437166bd8f02d16a15ba06e2af78d9f527563fc2
 SHA512:
-  metadata.gz: 690435177f2fa5d251e575cd71235dcf324abf71e0a970948161847443ed2c9964fbe5b8e6cff64918f0b5afd55a2188a77a5497e49f1e47b9bfe3383d49db77
-  data.tar.gz: dcf962e64d9804c051207bf80fd34cc1c805f05370c46238e19ec040b7e2957184afd127a7d819f9165b40db2806fc6c4217ca2cd5c079755cfa59db14a5b0ff
+  metadata.gz: 3e0affe16488be33258b8e2c81631e616a95e56e64907905ffe851882acc8cd9080f9210fac450fe78041dcf597a716f09cf06a0a1576629c897a531c4a27d46
+  data.tar.gz: d93d7d9c3f2e7d87be00be6411d0c86450224f19d5d589886b06bd3184946586306f9bedda8810c11adfe4f21e91dcf6e04b11cacdfaa6b73eb53b316253d2c1

data/lib/zget/command/zget.rb

@@ -2,7 +2,15 @@ module Zget
   class Zget < Command
     attr_reader :file_or_alias, :output
 
+    CONTENT_LENGTH_PROC = ->(content_length) { @content_length = content_length }
+    PROGRESS_PROC = ->(size) do
+      percentage = size * 100 / @content_length
+      print "\rDownloading: #{percentage}%"
+      puts "\n" if percentage == 100
+    end
+
     def initialize(file_or_alias: nil, output: nil)
+      @content_length = 0
       @file_or_alias = file_or_alias
       @output = output
     end
@@ -25,7 +33,7 @@ module Zget
 
         unless service.nil?
           DNSSD.resolve! service do |r|
-            open url(r) do |f|
+            open url(r), content_length_proc: CONTENT_LENGTH_PROC, progress_proc: PROGRESS_PROC do |f|
               filename = output || f.meta["content-disposition"].split(";").last.split("=").last
               File.write filename, f.read
             end

data/lib/zget/file_handler.rb

@@ -1,8 +1,25 @@
 module Zget
   # We want this server to shutdown as soon as the file is downloaded
   class FileHandler < WEBrick::HTTPServlet::DefaultFileHandler
-    def do_GET(request, response)
-      response["Content-Disposition"] = "inline; filename=#{File.basename @local_path}"
+    # We want to trick `Kernel::open` in order to display the upload progress.
+    # We do so by reading the file in chunks rather than the whole file.
+    # Why trick `Kernel::open`? See: https://github.com/ruby/ruby/blob/trunk/lib/webrick/httpservlet/filehandler.rb#L61
+    def open(path, mode)
+      st = File::stat(@local_path)
+      Kernel.open(path, mode) do |io|
+        data = ""
+        while d = io.read(1024 * 8)
+          data << d
+          percentage = data.size * 100 / st.size
+          print "\rUploading: #{percentage}%"
+          puts "\n" if percentage == 100
+        end
+        data
+      end
+    end
+
+    def do_GET(req, res)
+      res["Content-Disposition"] = "inline; filename=#{File.basename @local_path}"
       super
       @server.shutdown
     end

data/lib/zget/version.rb

@@ -1,3 +1,3 @@
 module Zget
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zget
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Patricio Mac Adden
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-23 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Write a short summary, because Rubygems requires one.