droxi 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b3d4718e377e5291effa8c95ef8b88f2dd10f8b
-  data.tar.gz: b14e7c988a4f40f0e53363c1d45f5257e9c76017
+  metadata.gz: 41024246faf2e570c6f96a0c2cfa77af7a871cbb
+  data.tar.gz: 9a516974414a11c3427e81590aa77d92a43e68d5
 SHA512:
-  metadata.gz: c67954fa6f3ff293c90d88934651dd1c1438cd09461b2cbb5a57dcb72ae094a40d197fecd731fcbfa8fef3838459b2b3185d8cfa52784bf33d97d872b82efccf
-  data.tar.gz: 9fab7e390b306c6a8322b52c2a8ec6b3645ac7b6cc35e2ff392e69130e46d7efce8c2cfd8c45fcc9f22f49f4d7b051ea9b7ab83f13adf2f12fd987a8dcf12989
+  metadata.gz: 13d4714c04d56e274c6dc50a7612bb51714c956503faf91a2b83b68d054221ffbb576455d44ad7568ee2a44998bb4f724cbed135108740e303d113ae2490a334
+  data.tar.gz: a91221075eb67995cb8a38578a4a030531e7028e86ed1346fae2570d28c56cb0b4e153e9cf51c8592c66408dd038bd2963213445bddfd4089d1fd824972a52de

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-11'
+  s.date        = '2014-12-17'
   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 \

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.2'
+  VERSION = '0.2.3'
 
   # Message to display when invoked with the --help option.
   HELP_TEXT =

data/lib/droxi/commands.rb

@@ -357,14 +357,21 @@ module Commands
 
   # Upload a local file.
   PUT = Command.new(
-    'put [-f] [-O REMOTE_DIR] LOCAL_FILE...',
+    'put [-f] [-q] [-O REMOTE_DIR] [-t COUNT] LOCAL_FILE...',
     "Upload local files to the remote working directory. If a remote file of \
      the same name already exists, Dropbox will rename the upload unless the \
      the -f option is given, in which case the remote file will be \
      overwritten. If the -O option is given, the files will be uploaded to \
-     the given directory instead of the current directory.",
+     the given directory instead of the current directory. The -q option \
+     prevents progress from being printed. The -t option specifies the \
+     number of tries in case of error. The default is 5; -t 0 will retry \
+     infinitely.",
     lambda do |client, state, args|
-      flags = extract_flags(PUT.usage, args, '-f' => 0, '-O' => 1)
+      flags = extract_flags(PUT.usage, args,
+                            '-f' => 0,
+                            '-q' => 0,
+                            '-O' => 1,
+                            '-t' => 1)
 
       dest_index = flags.find_index('-O')
       dest_path = nil
@@ -378,6 +385,9 @@ module Commands
         end
       end
 
+      tries_index = flags.find_index('-t')
+      tries = tries_index ? flags[tries_index + 1].to_i : 5
+
       args.each do |arg|
         to_path = state.resolve_path(File.basename(arg))
 
@@ -390,7 +400,8 @@ module Commands
 
             # Chunked upload if file is more than 1M.
             if file.size > 1024 * 1024
-              data = chunked_upload(client, to_path, file)
+              data = chunked_upload(client, to_path, file,
+                                    flags.include?('-q'), tries)
             else
               data = client.put_file(to_path, file)
             end
@@ -659,17 +670,6 @@ module Commands
     (state.pwd = File.dirname(state.pwd)) until state.metadata(state.pwd)
   end
 
-  # def self.extract_flags(@usage, cmd, args, valid_flags)
-  #   tokens = args.take_while { |s| s[/^-\w+$/] }
-  #   args.shift(tokens.size)
-
-  #   # Process compound flags like -rf into -r, -f.
-  #   flags = tokens.join.chars.uniq.drop(1).map { |c| "-#{c}" }
-  #   invalid_flags = flags.reject { |f| valid_flags[f[1]] }
-  #   invalid_flags.each { |f| warn "#{cmd}: #{f}: invalid option" }
-  #   flags
-  # end
-
   # Removes flags (e.g. -f) from the +Array+ and returns an +Array+ of the
   # removed flags. Prints warnings if the flags are not in the given +String+
   # of valid flags (e.g. '-rf').
@@ -701,29 +701,35 @@ module Commands
   end
 
   # Attempts to upload a file to the server in chunks, displaying progress.
-  def self.chunked_upload(client, to_path, file)
+  def self.chunked_upload(client, to_path, file, quiet, tries)
     uploader = DropboxClient::ChunkedUploader.new(client, file, file.size)
-    thread = Thread.new { monitor_upload(uploader, to_path) }
-    loop_upload(uploader, thread)
+    thread = quiet ? nil : Thread.new { monitor_upload(uploader, to_path) }
+    tries = -1 if tries == 0
+    loop_upload(uploader, thread, tries)
     data = uploader.finish(to_path)
-    thread.join
-    print "\r" + (' ' * (18 + to_path.rpartition('/')[2].size)) + "\r"
+    if thread
+      thread.join
+      print "\r" + (' ' * (18 + to_path.rpartition('/')[2].size)) + "\r"
+    end
     data
   end
 
   # Continuously try to upload until successful or interrupted.
-  def self.loop_upload(uploader, monitor_thread)
-    while uploader.offset < uploader.total_size
+  # rubocop:disable Style/MethodLength
+  def self.loop_upload(uploader, monitor_thread, tries)
+    while tries != 0 && uploader.offset < uploader.total_size
       begin
         uploader.upload(1024 * 1024)
       rescue DropboxError => error
         puts "\n" + error.to_s
+        --tries
       end
     end
   rescue Interrupt => error
-    monitor_thread.kill
+    monitor_thread.kill if monitor_thread
     raise error
   end
+  # rubocop:enable Style/MethodLength
 
   # Displays real-time progress for the a being uploaded.
   def self.monitor_upload(uploader, to_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droxi
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Brandon Mulcahy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk