droxi 0.2.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41024246faf2e570c6f96a0c2cfa77af7a871cbb
-  data.tar.gz: 9a516974414a11c3427e81590aa77d92a43e68d5
+  metadata.gz: 1c51dbec9e627b8b8b2e07e4ac8bf4464bee33dd
+  data.tar.gz: 480c18b2b62a8ec434cd6c8a8a481a40976f884b
 SHA512:
-  metadata.gz: 13d4714c04d56e274c6dc50a7612bb51714c956503faf91a2b83b68d054221ffbb576455d44ad7568ee2a44998bb4f724cbed135108740e303d113ae2490a334
-  data.tar.gz: a91221075eb67995cb8a38578a4a030531e7028e86ed1346fae2570d28c56cb0b4e153e9cf51c8592c66408dd038bd2963213445bddfd4089d1fd824972a52de
+  metadata.gz: 5af1c7d1ab268567fa44508dad484090c6da945f1861e022c025e34dff7527525d81af89d03812b613c1d8aa008e9e33e806656d47832f95fa9ae37654b16655
+  data.tar.gz: bd890a7e5aa0c14d912181f7d80643a46c1d41dbf914b4556919f660fa1e67edec98d8e18f48c25d01b9b6d71c4555e3c4e34a18553a6a613838410fba431906

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Brandon Mulcahy
+Copyright (c) 2014-2015 Brandon Mulcahy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,41 +1,43 @@
-droxi
+Droxi
 =====
+An `ftp`-like command-line [Dropbox](https://www.dropbox.com/) interface in
+[Ruby](https://www.ruby-lang.org/en/).
 
-ftp-like command-line [Dropbox](https://www.dropbox.com/) interface in
-[Ruby](https://www.ruby-lang.org/en/)
-
-installation
+Installation
 ------------
+Installation as Ruby gem:
 
     gem install droxi
 
-or
+Manual installation:
 
     git clone https://github.com/jangler/droxi.git
     cd droxi && rake && sudo rake install
 
-or
-
-    wget https://aur.archlinux.org/packages/dr/droxi/droxi.tar.gz
-    tar -xzf droxi.tar.gz
-    cd droxi && makepkg -s && sudo pacman -U droxi-*.pkg.tar.xz
+If you use Arch Linux or a derivative, you may also install via the
+[AUR package](https://aur.archlinux.org/packages/droxi/).
 
-features
+Features
 --------
-
-- interface inspired by
+- Interface based on
   [GNU coreutils](http://www.gnu.org/software/coreutils/),
   [GNU ftp](http://www.gnu.org/software/inetutils/), and
   [lftp](http://lftp.yar.ru/)
-- context-sensitive tab completion and path globbing
-- upload, download, organize, search, and share files
-- file revision control
-- man page and interactive help
-
-developer features
-------------------
-
-- extensive spec-style unit tests using
-  [MiniTest](https://github.com/seattlerb/minitest)
-- [RuboCop](https://github.com/bbatsov/rubocop)-approved
-- fully [RDoc](http://rdoc.sourceforge.net/) documented
+- Context-sensitive tab completion and path globbing
+- Upload, download, organize, search, and share files
+- File revision control
+- Man page and interactive help
+
+Examples
+--------
+Start interactive session:
+
+	droxi
+
+Invoke single command and exit:
+
+	droxi share Photos/pic.jpg
+
+Scripting:
+
+	echo -e "cd Photos \n put -f *jpg" | droxi

data/droxi.1.template

@@ -18,7 +18,7 @@ Pass a string to be executed by the local shell.
 --debug
 Enable the 'debug' command for the session.
 .TP
---help
+-h, --help
 Print help information and exit.
 .TP
 --version

data/droxi.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name        = 'droxi'
   s.version     = IO.read('lib/droxi.rb')[/VERSION = '(.+)'/, 1]
-  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 \
-                   completion, globbing, and interactive help.".squeeze(' ')
+  s.date        = '2015-05-09'
+  s.summary     = 'An ftp-like command-line interface to Dropbox'
+  s.description = "A command-line Dropbox interface based on GNU coreutils, \
+                   GNU ftp, and lftp. Features include smart tab completion, \
+                   globbing, and interactive help.".squeeze(' ')
   s.authors     = ['Brandon Mulcahy']
   s.email       = 'brandon@jangler.info'
   s.files       = `git ls-files`.split

data/lib/droxi/cache.rb

@@ -3,7 +3,7 @@ class Cache < Hash
   # Add a metadata +Hash+ and its contents to the +Cache+ and return the
   # +Cache+.
   def add(metadata)
-    path = metadata['path']
+    path = metadata['path'].downcase
     store(path, metadata)
     dirname = File.dirname(path)
     if dirname != path
@@ -17,14 +17,16 @@ class Cache < Hash
 
   # Remove a path's metadata from the +Cache+ and return the +Cache+.
   def remove(path)
+    path = path.downcase
     recursive_remove(path)
     contents = fetch(File.dirname(path), {}).fetch('contents', nil)
-    contents.delete_if { |item| item['path'] == path } if contents
+    contents.delete_if { |item| item['path'].downcase == path } if contents
     self
   end
 
   # Return +true+ if the path's information is cached, +false+ otherwise.
   def full_info?(path, require_contents = true)
+    path = path.downcase
     info = fetch(path, nil)
     info && (!require_contents || !info['is_dir'] || info.include?('contents'))
   end
@@ -33,6 +35,7 @@ class Cache < Hash
 
   # Recursively remove a path and its sub-files and directories.
   def recursive_remove(path)
+    path = path.downcase
     contents = fetch(path, {}).fetch('contents', nil)
     contents.each { |item| recursive_remove(item['path']) } if contents
     delete(path)

data/lib/droxi/commands.rb

@@ -165,12 +165,13 @@ module Commands
 
   # Download remote files.
   GET = Command.new(
-    'get [-f] REMOTE_FILE...',
+    'get [-E] [-f] REMOTE_FILE...',
     "Download each specified remote file to a file of the same name in the \
      local working directory. Will refuse to overwrite existing files unless \
-     invoked with the -f option.",
+     invoked with the -f option. If the -E option is given, remove each \
+     remote file after successful download.",
     lambda do |client, state, args|
-      flags = extract_flags(GET.usage, args, '-f' => 0)
+      flags = extract_flags(GET.usage, args, '-E' => 0, '-f' => 0)
 
       state.expand_patterns(args).each do |path|
         if path.is_a?(GlobError)
@@ -181,6 +182,10 @@ module Commands
             if flags.include?('-f') || !File.exist?(basename)
               contents = client.get_file(path)
               IO.write(basename, contents, mode: 'wb')
+              if flags.include?('-E')
+                client.file_delete(path)
+                state.cache.remove(path)
+              end
               puts "#{basename} <- #{path}"
             else
               warn "get: #{basename}: local file already exists"
@@ -199,6 +204,7 @@ module Commands
     lambda do |_client, _state, args|
       extract_flags(HELP.usage, args, {})
       if args.empty?
+        puts 'Type "help <command>" for more info about a command:'
         Text.table(NAMES).each { |line| puts line }
       else
         cmd_name = args.first
@@ -263,7 +269,7 @@ module Commands
         state.local_oldpwd = Dir.pwd
         Dir.chdir(path)
       else
-        warn "lcd: #{args.first}: no such file or directory"
+        warn "lcd: #{args.first}: no such directory"
       end
     end
   )
@@ -357,17 +363,18 @@ module Commands
 
   # Upload a local file.
   PUT = Command.new(
-    'put [-f] [-q] [-O REMOTE_DIR] [-t COUNT] LOCAL_FILE...',
+    'put [-E] [-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 -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.",
+     overwritten. If the -E option is given, delete each local file after \
+     successful upload. If the -O option is given, the files will be uploaded \
+     to 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,
+                            '-E' => 0,
                             '-f' => 0,
                             '-q' => 0,
                             '-O' => 1,
@@ -388,11 +395,27 @@ module Commands
       tries_index = flags.find_index('-t')
       tries = tries_index ? flags[tries_index + 1].to_i : 5
 
+      # Glob arguments.
+      args.map! do |arg|
+        array = Dir.glob(File.expand_path(arg))
+        warn "put: #{arg}: no such file or directory" if array.empty?
+        array.map { |path| path.sub(File.dirname(path), File.dirname(arg)) }
+      end
+      args = args.reduce(:+)
+
       args.each do |arg|
         to_path = state.resolve_path(File.basename(arg))
 
         try_and_handle(StandardError) do
-          File.open(File.expand_path(arg), 'rb') do |file|
+          path = File.expand_path(arg)
+          if File.directory?(path)
+            warn "put: #{arg}: cannot put directory"
+            next
+          end
+
+          success = false
+
+          File.open(path, 'rb') do |file|
             if flags.include?('-f') && state.metadata(to_path)
               client.file_delete(to_path)
               state.cache.remove(to_path)
@@ -400,15 +423,18 @@ module Commands
 
             # Chunked upload if file is more than 1M.
             if file.size > 1024 * 1024
-              data = chunked_upload(client, to_path, file,
-                                    flags.include?('-q'), tries)
+              data, success = chunked_upload(client, to_path, file,
+                                             flags.include?('-q'), tries)
             else
               data = client.put_file(to_path, file)
+              success = true
             end
 
             state.cache.add(data)
             puts "#{arg} -> #{data['path']}"
           end
+
+          File.delete(path) if flags.include?('-E') && success
         end
       end
 
@@ -706,12 +732,13 @@ module Commands
     thread = quiet ? nil : Thread.new { monitor_upload(uploader, to_path) }
     tries = -1 if tries == 0
     loop_upload(uploader, thread, tries)
+    success = (uploader.offset == uploader.total_size)
     data = uploader.finish(to_path)
     if thread
       thread.join
       print "\r" + (' ' * (18 + to_path.rpartition('/')[2].size)) + "\r"
     end
-    data
+    [data, success]
   end
 
   # Continuously try to upload until successful or interrupted.

data/lib/droxi/state.rb

@@ -35,6 +35,7 @@ class State
   # Return a +Hash+ of the Dropbox metadata for a file, or +nil+ if the file
   # does not exist.
   def metadata(path, require_contents = true)
+    path = path.downcase
     tokens = path.split('/').drop(1)
 
     (0..tokens.size).each do |i|
@@ -48,16 +49,18 @@ class State
 
   # Return an +Array+ of paths of files in a Dropbox directory.
   def contents(path)
+    path = path.downcase
     path = resolve_path(path)
     metadata(path)
     path = "#{path}/".sub('//', '/')
     @cache.keys.select do |key|
       key.start_with?(path) && key != path && !key.sub(path, '').include?('/')
-    end
+    end.map { |key| @cache[key]['path'] }
   end
 
   # Return +true+ if the Dropbox path is a directory, +false+ otherwise.
   def directory?(path)
+    path = path.downcase
     path = resolve_path(path)
     metadata(File.dirname(path))
     @cache.include?(path) && @cache[path]['is_dir']
@@ -99,7 +102,7 @@ class State
   # Recursively remove directory contents from metadata cache. Yield lines of
   # (error) output if a block is given.
   def forget_contents(partial_path)
-    path = resolve_path(partial_path)
+    path = resolve_path(partial_path).downcase
     if @cache.fetch(path, {}).include?('contents')
       @cache[path]['contents'].dup.each { |m| @cache.remove(m['path']) }
       @cache[path].delete('contents')
@@ -113,7 +116,7 @@ class State
   # Cache metadata for the remote file for a given path. Return +true+ if
   # successful, +false+ otherwise.
   def fetch_metadata(path)
-    data = @client.metadata(path)
+    data = @client.metadata(path.downcase)
     return true if data['is_deleted']
     @cache.add(data)
     true
@@ -124,8 +127,11 @@ class State
   # Return an +Array+ of file paths matching a glob pattern, or a GlobError if
   # no files were matched.
   def get_matches(pattern, path, preserve_root)
+    path = path.downcase
     dir = File.dirname(path)
-    matches = contents(dir).select { |entry| File.fnmatch(path, entry) }
+    matches = contents(dir).select do |entry|
+                File.fnmatch(path, entry.downcase)
+              end
     return GlobError.new(pattern) if matches.empty?
     return matches unless preserve_root
     prefix = pattern.rpartition('/')[0, 2].join

data/lib/droxi.rb

@@ -1,4 +1,10 @@
-require 'dropbox_sdk'
+begin
+  require 'dropbox_sdk'
+rescue LoadError
+  puts "droxi requires the dropbox-sdk gem."
+  puts "Run `gem install dropbox-sdk` to install it."
+  exit
+end
 require 'readline'
 
 require_relative 'droxi/commands'
@@ -10,15 +16,14 @@ require_relative 'droxi/text'
 # Command-line Dropbox client module.
 module Droxi
   # Version number of the program.
-  VERSION = '0.2.3'
+  VERSION = '0.3.1'
 
   # Message to display when invoked with the --help option.
   HELP_TEXT =
     "If you've installed this program using Rake or the AUR package, you " \
-    'should also have the man page installed on your system. `man droxi` ' \
-    "should do the trick. Otherwise--meaning you've probably installed it " \
-    "as a Ruby gem--you don't, which is a shame. In that case, you can " \
-    'access the man page at http://jangler.info/man/droxi in HTML form.'
+    'should also have the man page installed on your system. If you do not ' \
+    'have the man page, you can access it at http://jangler.info/man/droxi ' \
+    'in HTML form.'
 
   # Run the client.
   def self.run(args)
@@ -41,10 +46,12 @@ module Droxi
   # Handles command-line options extracted from an +Array+ and returns an
   # +Array+ of the extracted options.
   def self.handle_options(args)
-    options = args.take_while { |s| s.start_with?('--') }
+    options = args.take_while { |s| s.start_with?('-') }
     puts "droxi v#{VERSION}" if options.include?('--version')
-    Text.wrap(HELP_TEXT).each { |s| puts s } if options.include?('--help')
-    exit if %w(--help --version).any? { |s| options.include?(s) }
+    if options.include?('-h') || options.include?('--help')
+      Text.wrap(HELP_TEXT).each { |s| puts s }
+    end
+    exit if %w(-h --help --version).any? { |s| options.include?(s) }
     options
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droxi
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors:
 - Brandon Mulcahy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk
@@ -30,8 +30,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         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.
+description: A command-line Dropbox interface based on GNU coreutils, GNU ftp, and
+  lftp. Features include smart tab completion, globbing, and interactive help.
 email: brandon@jangler.info
 executables:
 - droxi
@@ -79,9 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: ftp-like command-line interface to Dropbox
+summary: An ftp-like command-line interface to Dropbox
 test_files: []
-has_rdoc: