droxi 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e2082eebfa7309caf39ae23503dacebd697b296
-  data.tar.gz: df6667fdb18de0438a79c11f990589412a67dae5
+  metadata.gz: 9b3d4718e377e5291effa8c95ef8b88f2dd10f8b
+  data.tar.gz: b14e7c988a4f40f0e53363c1d45f5257e9c76017
 SHA512:
-  metadata.gz: 58ac779ee0ded7200528cc15301da40c6485f3c63fc2cf98ae7282743d31d7e27cbe9c3fedaaabbff5ae6e466f965521ff3a85f506ba1a55c36810ea95da1837
-  data.tar.gz: c4c44cb264cd3e9ccc046b50535c93e2451f0363fab1ec7beef8947bf6dc4f910d64f330d871edb2f7be8d355ff58a37c42819b6b78a71d838d0b141cafaade8
+  metadata.gz: c67954fa6f3ff293c90d88934651dd1c1438cd09461b2cbb5a57dcb72ae094a40d197fecd731fcbfa8fef3838459b2b3185d8cfa52784bf33d97d872b82efccf
+  data.tar.gz: 9fab7e390b306c6a8322b52c2a8ec6b3645ac7b6cc35e2ff392e69130e46d7efce8c2cfd8c45fcc9f22f49f4d7b051ea9b7ab83f13adf2f12fd987a8dcf12989

data/droxi.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'droxi'
   s.version     = IO.read('lib/droxi.rb')[/VERSION = '(.+)'/, 1]
-  s.date        = '2014-09-01'
+  s.date        = '2014-09-11'
   s.summary     = 'ftp-like command-line interface to Dropbox'
   s.description = "A command-line Dropbox interface inspired by GNU \
                    coreutils, GNU ftp, and lftp. Features include smart tab \
@@ -13,6 +13,6 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
 
   s.executables << 'droxi'
-  s.add_runtime_dependency 'dropbox-sdk', '~> 1.6', '>= 1.6.1'
+  s.add_runtime_dependency 'dropbox-sdk', '~> 1.6', '>= 1.6.4'
   s.required_ruby_version = '>= 2.0.0'
 end

data/lib/droxi/commands.rb

@@ -387,7 +387,14 @@ module Commands
               client.file_delete(to_path)
               state.cache.remove(to_path)
             end
-            data = client.put_file(to_path, file)
+
+            # Chunked upload if file is more than 1M.
+            if file.size > 1024 * 1024
+              data = chunked_upload(client, to_path, file)
+            else
+              data = client.put_file(to_path, file)
+            end
+
             state.cache.add(data)
             puts "#{arg} -> #{data['path']}"
           end
@@ -692,4 +699,40 @@ module Commands
       fail UsageError, usage
     end
   end
+
+  # Attempts to upload a file to the server in chunks, displaying progress.
+  def self.chunked_upload(client, to_path, file)
+    uploader = DropboxClient::ChunkedUploader.new(client, file, file.size)
+    thread = Thread.new { monitor_upload(uploader, to_path) }
+    loop_upload(uploader, thread)
+    data = uploader.finish(to_path)
+    thread.join
+    print "\r" + (' ' * (18 + to_path.rpartition('/')[2].size)) + "\r"
+    data
+  end
+
+  # Continuously try to upload until successful or interrupted.
+  def self.loop_upload(uploader, monitor_thread)
+    while uploader.offset < uploader.total_size
+      begin
+        uploader.upload(1024 * 1024)
+      rescue DropboxError => error
+        puts "\n" + error.to_s
+      end
+    end
+  rescue Interrupt => error
+    monitor_thread.kill
+    raise error
+  end
+
+  # Displays real-time progress for the a being uploaded.
+  def self.monitor_upload(uploader, to_path)
+    filename = to_path.rpartition('/')[2]
+    loop do
+      percent = 100.0 * uploader.offset / uploader.total_size
+      printf("\rUploading %s: %.1f%%", filename, percent)
+      break if uploader.offset == uploader.total_size
+      sleep 1
+    end
+  end
 end

data/lib/droxi.rb

@@ -10,7 +10,7 @@ require_relative 'droxi/text'
 # Command-line Dropbox client module.
 module Droxi
   # Version number of the program.
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 
   # Message to display when invoked with the --help option.
   HELP_TEXT =

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droxi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Brandon Mulcahy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk
@@ -19,7 +19,7 @@ dependencies:
         version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.4
 description: A command-line Dropbox interface inspired by GNU coreutils, GNU ftp,
   and lftp. Features include smart tab completion, globbing, and interactive help.
 email: brandon@jangler.info