droxi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 244170f34242a9088ac104e483683219845ac012
-  data.tar.gz: eb1dab3e763e6749171ae587ef288dd466d74700
+  metadata.gz: aa77e9e1c5c65c6d9552b77bee94b0c4395b4a74
+  data.tar.gz: 404cfd0e77d97c811daa867f544b6a2faf440a4a
 SHA512:
-  metadata.gz: 92865a868baf0e3efbbf0bf57cb844c12f89c58f500aa2151eea276d3cf3cd899aade5c80e4c10468e6e6c8bc542141bba88bea7786efcf2e924643ac944f426
-  data.tar.gz: eeda04ec25143e42c8e185aa2e88b71aee7d7be4facbe49e5bd3b2f2c80256a5e44e82e01d1963e05566498fe73368ea9ed8f09f3b71cb737c722a569cdbc1e2
+  metadata.gz: 273cb971fa6a4412c44aafe050e33767063cb4d0c38203858e8b8e6988c19b1884c4c99b688dffdc7cbb661a8e3851a9322ee6fcd2ca3b3f487964eae0a869ac
+  data.tar.gz: 7c18c86aef2cdfb0cb46c571bf01db930ab87b396ac6ee1f6b5e26de758151b4ce0eb16ce3775245b173cb6eb50579c8e3df1f71a14c0985a3978bde474f7123

data/Rakefile

@@ -1,4 +1,4 @@
-task :default => :build
+task default: :build
 
 desc 'run unit tests'
 task :test do
@@ -52,7 +52,7 @@ task :build do
 
   def date(gemspec)
     require 'time'
-    Time.parse(/\d{4}-\d{2}-\d{2}/.match(gemspec)[0]).strftime('%B %Y')
+    Time.parse(gemspec[/\d{4}-\d{2}-\d{2}/]).strftime('%B %Y')
   end
 
   def commands
@@ -66,15 +66,15 @@ task :build do
   def build_page
     gemspec = IO.read('droxi.gemspec')
 
-    contents = IO.read('droxi.1.template').
-      sub('{date}', date(gemspec)).
-      sub('{version}', /\d+\.\d+\.\d+/.match(gemspec)[0]).
-      sub('{commands}', commands)
+    contents = format(IO.read('droxi.1.template'),
+                      date: date(gemspec),
+                      version: gemspec[/\d+\.\d+\.\d+/],
+                      commands: commands)
 
     IO.write('build/droxi.1', contents)
   end
 
-  Dir.mkdir('build') unless Dir.exists?('build')
+  Dir.mkdir('build') unless Dir.exist?('build')
   build_exe
   build_page
 end
@@ -91,7 +91,7 @@ task :install do
     FileUtils.cp('build/droxi', BIN_PATH)
     FileUtils.mkdir_p(MAN_PATH)
     FileUtils.cp('build/droxi.1', MAN_PATH)
-  rescue Exception => error
+  rescue => error
     puts error
   end
 end
@@ -102,7 +102,7 @@ task :uninstall do
   begin
     FileUtils.rm("#{BIN_PATH}/droxi")
     FileUtils.rm("#{MAN_PATH}/droxi.1")
-  rescue Exception => error
+  rescue => error
     puts error
   end
 end

data/droxi.1.template

@@ -1,4 +1,4 @@
-.TH DROXI 1 "{date}" "droxi {version}"
+.TH DROXI 1 "%{date}" "droxi %{version}"
 .SH NAME
 droxi \- ftp-like command-line interface to Dropbox
 .SH SYNOPSIS
@@ -9,6 +9,6 @@ Features include smart tab completion, globbing, and interactive help. If
 invoked without arguments, runs in interactive mode. If invoked with arguments,
 parses the arguments as a command invocation, executes the command, and exits.
 .SH COMMANDS
-{commands}
+%{commands}
 .SH AUTHOR
 Written by Brandon Mulcahy (brandon@jangler.info).

data/droxi.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'droxi'
-  s.version     = '0.1.0'
-  s.date        = '2014-06-05'
+  s.version     = '0.1.1'
+  s.date        = '2014-06-06'
   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

@@ -35,7 +35,7 @@ module Droxi
   # Attempt to authorize the user for app usage.
   def self.authorize
     app_key = '5sufyfrvtro9zp7'
-    app_secret = 'h99ihzv86jyypho'
+    app_secret = 'h99ihzv86jyypho' # Not so secret, is it?
 
     flow = DropboxOAuth2FlowNoRedirect.new(app_key, app_secret)
 
@@ -43,7 +43,7 @@ module Droxi
     code = get_auth_code(authorize_url)
 
     begin
-      Settings[:access_token] = flow.finish(code)[0]
+      Settings[:access_token] = flow.finish(code).first
     rescue DropboxError
       puts 'Invalid authorization code.'
     end
@@ -69,54 +69,24 @@ module Droxi
     init_readline(state)
     with_interrupt_handling { do_interaction_loop(client, state, info) }
 
-    # Set pwd before exiting so that the oldpwd setting is saved to pwd
+    # Set pwd before exiting so that the oldpwd setting is saved to the pwd.
     state.pwd = '/'
   end
 
-  # Return an +Array+ of potential tab-completion options for a given
-  # completion type, word, and client state.
-  def self.completion_options(type, word, state)
-    case type
-    when 'COMMAND'     then Complete.command(word, Commands::NAMES)
-    when 'LOCAL_FILE'  then Complete.local(word)
-    when 'LOCAL_DIR'   then Complete.local_dir(word)
-    when 'REMOTE_FILE' then Complete.remote(word, state)
-    when 'REMOTE_DIR'  then Complete.remote_dir(word, state)
-    else []
+  def self.init_readline(state)
+    Readline.completion_proc = proc do
+      Complete.complete(Readline.line_buffer, state)
     end
-  end
 
-  # Return a +String+ representing the type of tab-completion that should be
-  # performed, given the current line buffer state.
-  def self.completion_type
-    words = Readline.line_buffer.split
-    index = words.length
-    index += 1 if Readline.line_buffer.end_with?(' ')
-    if index <= 1
-      'COMMAND'
-    elsif Commands::NAMES.include?(words[0])
-      cmd = Commands.const_get(words[0].upcase.to_sym)
-      cmd.type_of_arg(index - 2)
-    end
+    ignore_not_yet_implemented { Readline.completion_append_character = nil }
   end
 
-  # Set up the Readline library's completion capabilities.
-  def self.init_readline(state)
-    Readline.completion_proc = proc do |word|
-      completion_options(completion_type, word, state).map do |option|
-        option.gsub(' ', '\ ').sub(/\\ $/, ' ')
-      end
-    end
-
-    begin
-      Readline.completion_append_character = nil
-    rescue NotImplementedError
-      nil
-    end
+  def self.ignore_not_yet_implemented
+    yield
+  rescue NotImplementedError
+    nil
   end
 
-  # Run the associated block, handling Interrupt errors by printing a blank
-  # line.
   def self.with_interrupt_handling
     yield
   rescue Interrupt
@@ -134,13 +104,9 @@ module Droxi
     puts unless line
   end
 
-  # Instruct the user to enter an authorization code and return the code. If
-  # the user gives EOF, exit the program.
   def self.get_auth_code(url)
-    puts '1. Go to: ' + url
-    puts '2. Click "Allow" (you might have to log in first)'
-    puts '3. Copy the authorization code'
-    print '4. Enter the authorization code here: '
+    puts 'Authorize this app to access your Dropbox at: ' + url
+    print 'Enter authorization code: '
     code = $stdin.gets
     code ? code.strip! : exit
   end

data/lib/droxi/cache.rb

@@ -0,0 +1,40 @@
+# Special +Hash+ of remote file paths to cached file metadata.
+class Cache < Hash
+  # Add a metadata +Hash+ and its contents to the +Cache+ and return the
+  # +Cache+.
+  def add(metadata)
+    path = metadata['path']
+    store(path, metadata)
+    dirname = File.dirname(path)
+    if dirname != path
+      contents = fetch(dirname, {}).fetch('contents', nil)
+      contents << metadata if contents && !contents.include?(metadata)
+    end
+    return self unless metadata.include?('contents')
+    metadata['contents'].each { |content| add(content) }
+    self
+  end
+
+  # Remove a path's metadata from the +Cache+ and return the +Cache+.
+  def remove(path)
+    recursive_remove(path)
+    contents = fetch(File.dirname(path), {}).fetch('contents', nil)
+    contents.delete_if { |item| item['path'] == path } if contents
+    self
+  end
+
+  # Return +true+ if the path's information is cached, +false+ otherwise.
+  def full_info?(path, require_contents = true)
+    info = fetch(path, nil)
+    info && (!require_contents || !info['is_dir'] || info.include?('contents'))
+  end
+
+  private
+
+  # Recursively remove a path and its sub-files and directories.
+  def recursive_remove(path)
+    contents = fetch(path, {}).fetch('contents', nil)
+    contents.each { |item| recursive_remove(item['path']) } if contents
+    delete(path)
+  end
+end

data/lib/droxi/commands.rb

@@ -6,8 +6,7 @@ require_relative 'text'
 module Commands
   # Exception indicating that a client command was given the wrong number of
   # arguments.
-  class UsageError < ArgumentError
-  end
+  UsageError = Class.new(ArgumentError)
 
   # A client command. Contains metadata as well as execution procedure.
   class Command
@@ -34,7 +33,7 @@ module Commands
     # given. Raises a +UsageError+ if an invalid number of command-line
     # arguments is given.
     def exec(client, state, *args)
-      fail UsageError, @usage unless num_args_ok?(args.length)
+      fail UsageError, @usage unless num_args_ok?(args.size)
       block = proc { |line| yield line if block_given? }
       @procedure.yield(client, state, args, block)
     end
@@ -45,7 +44,7 @@ module Commands
     def type_of_arg(index)
       args = @usage.split.drop(1).reject { |arg| arg.include?('-') }
       return nil if args.empty?
-      index = [index, args.length - 1].min
+      index = [index, args.size - 1].min
       args[index].tr('[].', '')
     end
 
@@ -55,11 +54,11 @@ module Commands
     # command, +false+ otherwise.
     def num_args_ok?(num_args)
       args = @usage.split.drop(1)
-      min_args = args.reject { |arg| arg.start_with?('[') }.length
+      min_args = args.reject { |arg| arg.start_with?('[') }.size
       max_args = if args.any? { |arg| arg.end_with?('...') }
                    num_args
                  else
-                   args.length
+                   args.size
                  end
       (min_args..max_args).include?(num_args)
     end
@@ -75,13 +74,13 @@ module Commands
     lambda do |_client, state, args, output|
       case
       when args.empty? then state.pwd = '/'
-      when args[0] == '-' then state.pwd = state.oldpwd
+      when args.first == '-' then state.pwd = state.oldpwd
       else
-        path = state.resolve_path(args[0])
+        path = state.resolve_path(args.first)
         if state.directory?(path)
           state.pwd = path
         else
-          output.call("cd: #{args[0]}: no such directory")
+          output.call("cd: #{args.first}: no such directory")
         end
       end
     end
@@ -114,7 +113,7 @@ module Commands
           output.call(error.inspect)
         end
       else
-        output.call('Debug not enabled.')
+        output.call('debug: not enabled.')
       end
     end
   )
@@ -175,7 +174,7 @@ module Commands
       if args.empty?
         Text.table(NAMES).each { |line| output.call(line) }
       else
-        cmd_name = args[0]
+        cmd_name = args.first
         if NAMES.include?(cmd_name)
           cmd = const_get(cmd_name.upcase.to_s)
           output.call(cmd.usage)
@@ -197,12 +196,12 @@ module Commands
     lambda do |_client, state, args, output|
       path = case
              when args.empty? then File.expand_path('~')
-             when args[0] == '-' then state.local_oldpwd
+             when args.first == '-' then state.local_oldpwd
              else
                begin
-                 File.expand_path(args[0])
+                 File.expand_path(args.first)
                rescue ArgumentError
-                 args[0]
+                 args.first
                end
              end
 
@@ -210,7 +209,7 @@ module Commands
         state.local_oldpwd = Dir.pwd
         Dir.chdir(path)
       else
-        output.call("lcd: #{args[0]}: no such file or directory")
+        output.call("lcd: #{args.first}: no such file or directory")
       end
     end
   )
@@ -238,17 +237,17 @@ module Commands
 
       dirs << state.pwd if args.empty?
 
-      # First list files
+      # First list files.
       list(state, files, files, long) { |line| output.call(line) }
       output.call('') unless dirs.empty? || files.empty?
 
-      # Then list directory contents
+      # Then list directory contents.
       dirs.each_with_index do |dir, i|
-        output.call(dir + ':') if dirs.length + files.length > 1
+        output.call(dir + ':') if dirs.size + files.size > 1
         contents = state.contents(dir)
         names = contents.map { |path| File.basename(path) }
         list(state, contents, names, long) { |line| output.call(line) }
-        output.call('') if i < dirs.length - 1
+        output.call('') if i < dirs.size - 1
       end
     end
   )
@@ -302,14 +301,16 @@ module Commands
   # Upload a local file.
   PUT = Command.new(
     'put LOCAL_FILE [REMOTE_FILE]',
-    "Upload a local file to a remote path. If a remote file of the same name \
-     already exists, Dropbox will rename the upload. When given only a local \
-     file path, the remote path defaults to a file of the same name in the \
-     remote working directory.",
+    "Upload a local file to a remote path. If the remote path names a \
+     directory, the file will be placed in that directory. If a remote file \
+     of the same name already exists, Dropbox will rename the upload. When \
+     given only a local file path, the remote path defaults to a file of the \
+     same name in the remote working directory.",
     lambda do |client, state, args, output|
-      from_path = args[0]
-      to_path = (args.length == 2) ? args[1] : File.basename(from_path)
+      from_path = args.first
+      to_path = (args.size == 2) ? args[1] : File.basename(from_path)
       to_path = state.resolve_path(to_path)
+      to_path << "/#{from_path}" if state.directory?(to_path)
 
       try_and_handle(Exception, output) do
         File.open(File.expand_path(from_path), 'rb') do |file|
@@ -373,10 +374,10 @@ module Commands
   # Parse and execute a line of user input in the given context.
   def self.exec(input, client, state)
     if input.start_with?('!')
-      shell(input[1, input.length - 1]) { |line| puts line }
+      shell(input[1, input.size - 1]) { |line| puts line }
     elsif !input.empty?
-      tokens = tokenize(input)
-      cmd, args = tokens[0], tokens.drop(1)
+      tokens = Text.tokenize(input)
+      cmd, args = tokens.first, tokens.drop(1)
       try_command(cmd, args, client, state)
     end
   end
@@ -406,18 +407,6 @@ module Commands
     end
   end
 
-  # Split a +String+ into tokens, allowing for backslash-escaped spaces, and
-  # return the resulting +Array+.
-  def self.tokenize(string)
-    string.split.reduce([]) do |list, token|
-      list << if !list.empty? && list.last.end_with?('\\')
-                "#{list.pop.chop} #{token}"
-              else
-                token
-              end
-    end
-  end
-
   # Return a +String+ of information about a remote file for ls -l.
   def self.long_info(state, path, name)
     meta = state.metadata(state.resolve_path(path), false)
@@ -470,18 +459,18 @@ module Commands
       metadata = client.send(method, from_path, to_path)
       state.cache.remove(from_path) if method == :file_move
       state.cache.add(metadata)
-      output.call("#{args[0]} -> #{args[1]}")
+      output.call("#{args.first} -> #{args[1]}")
     end
   end
 
   # Execute a 'mv' or 'cp' operation depending on arguments given.
   def self.cp_mv(client, state, args, output, cmd)
-    sources = expand(state, args.take(args.length - 1), true, output, cmd)
+    sources = expand(state, args.take(args.size - 1), true, output, cmd)
     method = (cmd == 'cp') ? :file_copy : :file_move
     dest = state.resolve_path(args.last)
 
-    if sources.length == 1 && !state.directory?(dest)
-      copy_move(method, [sources[0], args.last], client, state, output)
+    if sources.size == 1 && !state.directory?(dest)
+      copy_move(method, [sources.first, args.last], client, state, output)
     else
       cp_mv_to_dir(args, client, state, cmd, output)
     end
@@ -489,7 +478,7 @@ module Commands
 
   # Copies or moves files into a directory.
   def self.cp_mv_to_dir(args, client, state, cmd, output)
-    sources = expand(state, args.take(args.length - 1), true, nil, cmd)
+    sources = expand(state, args.take(args.size - 1), true, nil, cmd)
     method = (cmd == 'cp') ? :file_copy : :file_move
     if state.metadata(state.resolve_path(args.last))
       sources.each do |source|

data/lib/droxi/complete.rb

@@ -1,16 +1,58 @@
+require_relative 'commands'
+require_relative 'text'
+
 # Module containing tab-completion logic and methods.
 module Complete
+  # Return an +Array+ of completion options for the given input line and
+  # client state.
+  def self.complete(line, state)
+    tokens = Text.tokenize(line, include_empty: true)
+    type = completion_type(tokens)
+    completion_options(type, tokens.last, state).map do |option|
+      option.gsub(' ', '\ ').sub(/\\ $/, ' ')
+        .split.drop(tokens.last.count(' ')).join(' ')
+        .sub(/[^\\\/]$/, '\0 ')
+    end
+  end
+
+  private
+
+  # Return an +Array+ of potential tab-completion options for a given
+  # completion type, word, and client state.
+  def self.completion_options(type, word, state)
+    case type
+    when 'COMMAND'     then command(word, Commands::NAMES)
+    when 'LOCAL_FILE'  then local(word)
+    when 'LOCAL_DIR'   then local_dir(word)
+    when 'REMOTE_FILE' then remote(word, state)
+    when 'REMOTE_DIR'  then remote_dir(word, state)
+    else []
+    end
+  end
+
+  # Return a +String+ representing the type of tab-completion that should be
+  # performed, given the current line buffer state.
+  def self.completion_type(tokens)
+    index = tokens.size
+    if index <= 1
+      'COMMAND'
+    elsif Commands::NAMES.include?(tokens.first)
+      cmd = Commands.const_get(tokens.first.upcase.to_sym)
+      cmd.type_of_arg(index - 2)
+    end
+  end
+
   # Return an +Array+ of potential command name tab-completions for a +String+.
   def self.command(string, names)
     names.select { |n| n.start_with?(string) }.map { |n| n + ' ' }
   end
 
   # Return the directory in which to search for potential local tab-completions
-  # for a +String+. Defaults to working directory in case of bogus input.
+  # for a +String+.
   def self.local_search_path(string)
     File.expand_path(strip_filename(string))
   rescue ArgumentError
-    Dir.pwd
+    string
   end
 
   # Return an +Array+ of potential local tab-completions for a +String+.
@@ -18,9 +60,13 @@ module Complete
     dir = local_search_path(string)
     basename = basename(string)
 
-    matches = Dir.entries(dir).select { |entry| match?(basename, entry) }
-    matches.map do |entry|
-      final_match(string, entry, File.directory?(dir + '/' + entry))
+    begin
+      matches = Dir.entries(dir).select { |entry| match?(basename, entry) }
+      matches.map do |entry|
+        final_match(string, entry, File.directory?(dir + '/' + entry))
+      end
+    rescue Errno::ENOENT
+      []
     end
   end
 
@@ -60,14 +106,12 @@ module Complete
     remote(string, state).select { |result| result.end_with?('/') }
   end
 
-  private
-
   def self.basename(string)
     string.end_with?('/') ? '' : File.basename(string)
   end
 
   def self.match?(prefix, candidate)
-    candidate.start_with?(prefix) && !/^\.\.?$/.match(candidate)
+    candidate.start_with?(prefix) && !candidate[/^\.\.?$/]
   end
 
   def self.final_match(string, candidate, is_dir)

data/lib/droxi/state.rb

@@ -1,53 +1,8 @@
+require_relative 'cache'
 require_relative 'settings'
 
 # Represents a failure of a glob expression to match files.
-class GlobError < ArgumentError
-end
-
-# Special +Hash+ of remote file paths to cached file metadata.
-class Cache < Hash
-  # Add a metadata +Hash+ and its contents to the +Cache+ and return the
-  # +Cache+.
-  def add(metadata)
-    store(metadata['path'], metadata)
-    dirname = File.dirname(metadata['path'])
-    if dirname != metadata['path']
-      contents = fetch(dirname, {}).fetch('contents', nil)
-      contents << metadata if contents && !contents.include?(metadata)
-    end
-    return self unless metadata.include?('contents')
-    metadata['contents'].each { |content| add(content) }
-    self
-  end
-
-  # Remove a path from the +Cache+ and return the +Cache+.
-  def remove(path)
-    recursive_remove(path)
-
-    dir = File.dirname(path)
-    return self unless fetch(dir, {}).include?('contents')
-    fetch(dir)['contents'].delete_if { |item| item['path'] == path }
-
-    self
-  end
-
-  # Return +true+ if the path's information is cached, +false+ otherwise.
-  def full_info?(path, require_contents = true)
-    info = fetch(path, nil)
-    info && (!require_contents || !info['is_dir'] || info.include?('contents'))
-  end
-
-  private
-
-  # Recursively remove a path and its sub-files and directories.
-  def recursive_remove(path)
-    if fetch(path, {}).include?('contents')
-      fetch(path)['contents'].each { |item| recursive_remove(item['path']) }
-    end
-
-    delete(path)
-  end
-end
+GlobError = Class.new(ArgumentError)
 
 # Encapsulates the session state of the client.
 class State
@@ -82,7 +37,7 @@ class State
   def metadata(path, require_contents = true)
     tokens = path.split('/').drop(1)
 
-    (0..tokens.length).each do |i|
+    (0..tokens.size).each do |i|
       partial_path = '/' + tokens.take(i).join('/')
       next if @cache.full_info?(partial_path, require_contents)
       return nil unless fetch_metadata(partial_path)
@@ -117,26 +72,28 @@ class State
 
   # Expand a Dropbox file path and return the result.
   def resolve_path(arg)
+    # REVIEW: See if we can do this in fewer lines (e.g. without two gsub!s).
     path = arg.start_with?('/') ? arg.dup : "#{@pwd}/#{arg}"
     path.gsub!('//', '/')
     nil while path.sub!(%r{/([^/]+?)/\.\.}, '')
     nil while path.sub!('./', '')
     path.sub!(/\/\.$/, '')
     path.chomp!('/')
+    path.gsub!('//', '/')
     path.empty? ? '/' : path
   end
 
   # Expand an +Array+ of file globs into an an +Array+ of Dropbox file paths
   # and return the result.
   def expand_patterns(patterns, preserve_root = false)
-    patterns.map do |pattern|
+    patterns.flat_map do |pattern|
       path = resolve_path(pattern)
       if directory?(path)
         preserve_root ? pattern : path
       else
         get_matches(pattern, path, preserve_root)
       end
-    end.flatten
+    end
   end
 
   # Recursively remove directory contents from metadata cache. Yield lines of

data/lib/droxi/text.rb

@@ -8,7 +8,7 @@ module Text
   def self.table(items)
     return [] if items.empty?
     width = terminal_width
-    item_width = items.map { |item| item.length }.max + 2
+    item_width = items.map { |item| item.size }.max + 2
     items_per_line = [1, width / item_width].max
     format_table(items, item_width, items_per_line)
   end
@@ -18,13 +18,27 @@ module Text
   def self.wrap(text)
     width, position = terminal_width, 0
     lines = []
-    while position < text.length
-      lines << get_wrap_segment(text[position, text.length], width)
-      position += lines.last.length + 1
+    while position < text.size
+      lines << get_wrap_segment(text[position, text.size], width)
+      position += lines.last.size + 1
     end
     lines
   end
 
+  # Split a +String+ into tokens, allowing for backslash-escaped spaces, and
+  # return the resulting +Array+.
+  def self.tokenize(string, include_empty: false)
+    tokens = string.split
+    tokens << '' if include_empty && (string.empty? || string.end_with?(' '))
+    tokens.reduce([]) do |list, token|
+      list << if !list.empty? && list.last.end_with?('\\')
+                "#{list.pop.chop} #{token}"
+              else
+                token
+              end
+    end
+  end
+
   private
 
   # Return the width of the terminal in columns.
@@ -51,10 +65,10 @@ module Text
     loop do
       head, _, text = text.partition(' ')
       line << "#{head} "
-      break if text.empty? || line.length >= width
+      break if text.empty? || line.size >= width
     end
     line.strip!
-    trim_last_word = line.length > width && line.include?(' ')
-    trim_last_word ? line.rpartition(' ')[0] : line
+    trim_last_word = line.size > width && line.include?(' ')
+    trim_last_word ? line.rpartition(' ').first : line
   end
 end

data/spec/all.rb

@@ -1,4 +1,4 @@
-# Use SimpleCov coverage-tracking library if available
+# Use SimpleCov coverage-tracking library if available.
 begin
   require 'simplecov'
   SimpleCov.start do
@@ -8,7 +8,7 @@ rescue LoadError
   nil
 end
 
-# Run all spec tests
+# Run all spec tests.
 Dir.glob('spec/*_spec.rb').each do |spec|
   require_relative File.basename(spec, '.rb')
 end

data/spec/commands_spec.rb

@@ -28,7 +28,7 @@ describe Commands do
 
     it 'must give an error message for an invalid command' do
       lines = TestUtils.output_of(Commands, :shell, 'bogus')
-      lines.length.must_equal 1
+      lines.size.must_equal 1
     end
   end
 
@@ -104,16 +104,17 @@ describe Commands do
     it 'must give an error message if trying to copy a bogus file' do
       lines = TestUtils.output_of(Commands::CP, :exec, client, state,
                                   'bogus', '/testing')
-      lines.length.must_equal 1
-      lines[0].start_with?('cp: ').must_equal true
+      lines.size.must_equal 1
+      lines.first.start_with?('cp: ').must_equal true
     end
   end
 
   describe 'when executing the debug command' do
     it 'must fail with an error message if debug mode is not enabled' do
       ARGV.clear
-      TestUtils.output_of(Commands::DEBUG, :exec, client, state, '1')
-        .must_equal(['Debug not enabled.'])
+      lines = TestUtils.output_of(Commands::DEBUG, :exec, client, state, '1')
+      lines.size.must_equal 1
+      lines.first.start_with?('debug: ').must_equal true
     end
 
     it 'must evaluate the string if debug mode is enabled' do
@@ -125,8 +126,8 @@ describe Commands do
     it 'must print the resulting exception if given exceptional input' do
       ARGV << '--debug'
       lines = TestUtils.output_of(Commands::DEBUG, :exec, client, state, 'x')
-      lines.length.must_equal 1
-      lines[0].must_match(/^#<.+>$/)
+      lines.size.must_equal 1
+      lines.first.must_match(/^#<.+>$/)
     end
 
     it 'must fail with UsageError when given no args' do
@@ -145,13 +146,13 @@ describe Commands do
     it 'must accept multiple arguments' do
       args = %w(bogus1, bogus2)
       TestUtils.output_of(Commands::FORGET, :exec, client, state, *args)
-        .length.must_equal 2
+        .size.must_equal 2
     end
 
     it 'must recursively clear contents of directory argument' do
       Commands::LS.exec(client, state, '/', '/testing')
       Commands::FORGET.exec(client, state, '/')
-      state.cache.length.must_equal 1
+      state.cache.size.must_equal 1
     end
   end
 
@@ -170,8 +171,8 @@ describe Commands do
 
     it 'must give an error message if trying to get a bogus file' do
       lines = TestUtils.output_of(Commands::GET, :exec, client, state, 'bogus')
-      lines.length.must_equal 1
-      lines[0].start_with?('get: ').must_equal true
+      lines.size.must_equal 1
+      lines.first.start_with?('get: ').must_equal true
     end
   end
 
@@ -235,14 +236,14 @@ describe Commands do
       TestUtils.exact_structure(client, state, 'test')
       lines = TestUtils.output_of(Commands::LS, :exec, client, state,
                                   '-l', '/testing')
-      lines.length.must_equal 1
-      /d +0 \w{3} .\d \d\d:\d\d test/.match(lines[0]).wont_be_nil
+      lines.size.must_equal 1
+      lines.first[/d +0 \w{3} .\d \d\d:\d\d test/].wont_be_nil
     end
 
     it 'must give an error message if trying to list a bogus file' do
       lines = TestUtils.output_of(Commands::LS, :exec, client, state, 'bogus')
-      lines.length.must_equal 1
-      lines[0].start_with?('ls: ').must_equal true
+      lines.size.must_equal 1
+      lines.first.start_with?('ls: ').must_equal true
     end
   end
 
@@ -251,15 +252,15 @@ describe Commands do
       TestUtils.structure(client, state, 'test.txt')
       path = '/testing/test.txt'
       lines = TestUtils.output_of(Commands::MEDIA, :exec, client, state, path)
-      lines.length.must_equal 1
-      %r{https://.+\..+/}.match(lines[0]).wont_be_nil
+      lines.size.must_equal 1
+      %r{https://.+\..+/}.match(lines.first).wont_be_nil
     end
 
     it 'must fail with error when given directory path' do
       lines = TestUtils.output_of(Commands::MEDIA, :exec, client, state,
                                   '/testing')
-      lines.length.must_equal 1
-      %r{https://.+\..+/}.match(lines[0]).must_be_nil
+      lines.size.must_equal 1
+      %r{https://.+\..+/}.match(lines.first).must_be_nil
     end
 
     it 'must fail with UsageError when given no args' do
@@ -269,8 +270,8 @@ describe Commands do
 
     it 'must give an error message if trying to link a bogus file' do
       lines = TestUtils.output_of(Commands::MEDIA, :exec, client, state, '%')
-      lines.length.must_equal 1
-      lines[0].start_with?('media: ').must_equal true
+      lines.size.must_equal 1
+      lines.first.start_with?('media: ').must_equal true
     end
   end
 
@@ -327,7 +328,7 @@ describe Commands do
     it 'must give an error message if trying to move a bogus file' do
       lines = TestUtils.output_of(Commands::MV, :exec, client, state,
                                   'bogus1', 'bogus2', 'bogus3')
-      lines.length.must_equal 3
+      lines.size.must_equal 3
       lines.all? { |line| line.start_with?('mv: ') }.must_equal true
     end
   end
@@ -351,6 +352,15 @@ describe Commands do
       state.metadata('/testing/dest.txt').wont_be_nil
     end
 
+    it 'must put file in directory if second arg is directory' do
+      TestUtils.not_structure(client, state, 'test.txt')
+      state.pwd = '/'
+      `touch test.txt`
+      Commands::PUT.exec(client, state, 'test.txt', 'testing')
+      `rm test.txt`
+      state.metadata('/testing/test.txt').wont_be_nil
+    end
+
     it 'must fail with UsageError when given no args' do
       proc { Commands::PUT.exec(client, state) }
         .must_raise Commands::UsageError
@@ -362,8 +372,8 @@ describe Commands do
       TestUtils.structure(client, state, 'test.txt')
       lines = TestUtils.output_of(Commands::SHARE, :exec, client, state,
                                   '/testing/test.txt')
-      lines.length.must_equal 1
-      %r{https://.+\..+/}.match(lines[0]).wont_be_nil
+      lines.size.must_equal 1
+      %r{https://.+\..+/}.match(lines.first).wont_be_nil
     end
 
     it 'must fail with UsageError when given no args' do
@@ -373,8 +383,8 @@ describe Commands do
 
     it 'must give an error message if trying to share a bogus file' do
       lines = TestUtils.output_of(Commands::SHARE, :exec, client, state, '%')
-      lines.length.must_equal 1
-      lines[0].start_with?('share: ').must_equal true
+      lines.size.must_equal 1
+      lines.first.start_with?('share: ').must_equal true
     end
   end
 
@@ -400,27 +410,27 @@ describe Commands do
 
     it 'must give an error message if trying to remove a bogus file' do
       lines = TestUtils.output_of(Commands::RM, :exec, client, state, 'bogus')
-      lines.length.must_equal 1
-      lines[0].start_with?('rm: ').must_equal true
+      lines.size.must_equal 1
+      lines.first.start_with?('rm: ').must_equal true
     end
   end
 
   describe 'when executing the help command' do
     it 'must print a list of commands when given no args' do
       TestUtils.output_of(Commands::HELP, :exec, client, state)
-        .join.split.length.must_equal Commands::NAMES.length
+        .join.split.size.must_equal Commands::NAMES.size
     end
 
     it 'must print help for a command when given it as an arg' do
       lines = TestUtils.output_of(Commands::HELP, :exec, client, state, 'help')
-      lines.length.must_be :>=, 2
-      lines[0].must_equal Commands::HELP.usage
+      lines.size.must_be :>=, 2
+      lines.first.must_equal Commands::HELP.usage
       lines.drop(1).join(' ').must_equal Commands::HELP.description
     end
 
     it 'must print an error message if given a bogus name as an arg' do
       TestUtils.output_of(Commands::HELP, :exec, client, state, 'bogus')
-        .length.must_equal 1
+        .size.must_equal 1
     end
 
     it 'must fail with UsageError when given multiple args' do

data/spec/complete_spec.rb

@@ -1,175 +1,123 @@
-require 'dropbox_sdk'
 require 'minitest/autorun'
 
 require_relative 'testutils'
 require_relative '../lib/droxi/commands'
 require_relative '../lib/droxi/complete'
-require_relative '../lib/droxi/settings'
-require_relative '../lib/droxi/state'
 
 describe Complete do
   CHARACTERS = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
 
+  _, state = TestUtils.create_client_and_state
+
   def random_string(length)
     rand(length).times.map { CHARACTERS.sample }.join
   end
 
-  describe 'when resolving a local search path' do
-    it 'must resolve unqualified string to working directory' do
-      Complete.local_search_path('').must_equal Dir.pwd
-      Complete.local_search_path('f').must_equal Dir.pwd
-    end
-
-    it 'must resolve / to root directory' do
-      Complete.local_search_path('/').must_equal '/'
-      Complete.local_search_path('/f').must_equal '/'
-    end
-
-    it 'must resolve directory name to named directory' do
-      Complete.local_search_path('/home/').must_equal '/home'
-      Complete.local_search_path('/home/f').must_equal '/home'
-    end
-
-    it 'must resolve ~/ to home directory' do
-      Complete.local_search_path('~/').must_equal Dir.home
-      Complete.local_search_path('~/f').must_equal Dir.home
-    end
-
-    it 'must resolve ./ to working directory' do
-      Complete.local_search_path('./').must_equal Dir.pwd
-      Complete.local_search_path('./f').must_equal Dir.pwd
-    end
-
-    it 'must resolve ../ to parent directory' do
-      Complete.local_search_path('../').must_equal File.dirname(Dir.pwd)
-      Complete.local_search_path('../f').must_equal File.dirname(Dir.pwd)
-    end
-
-    it 'must resolve a bogus string to working directory' do
-      Complete.local_search_path('~bogus/bogus').must_equal Dir.pwd
+  def remote_contents(state, path)
+    state.contents(path).map do |entry|
+      entry += (state.directory?(entry) ? '/' : ' ')
+      entry[1, entry.size].gsub(' ', '\\ ').sub(/\\ $/, ' ')
     end
   end
 
-  describe 'when finding potential local tab completions' do
-    def check(path)
-      100.times.all? do
-        prefix = path + random_string(5)
-        Complete.local(prefix).all? { |match| match.start_with?(prefix) }
-      end.must_equal true
-      1000.times.any? do
-        prefix = path + random_string(5)
-        !Complete.local(prefix).empty?
-      end.must_equal true
-    end
-
-    it 'seed must prefix results for unqualified string' do
-      check('')
-    end
-
-    it 'seed must prefix results for /' do
-      check('/')
-    end
-
-    it 'seed must prefix results for named directory' do
-      check('/home/')
-    end
-
-    it 'seed must prefix results for ~/' do
-      check('~/')
-    end
-
-    it 'seed must prefix results for ./' do
-      check('./')
+  def local_contents
+    files = Dir.entries(Dir.pwd).map do |entry|
+      entry << (File.directory?(entry) ? '/' : ' ')
     end
+    files.reject { |file| file[/^\.\.?\/$/] }
+  end
 
-    it 'seed must prefix results for ../' do
-      check('../')
+  describe 'when given an empty string or whitespace' do
+    it 'lists all command names' do
+      names = Commands::NAMES.map { |n| "#{n} " }
+      Complete.complete('', state).must_equal names
+      Complete.complete('  ', state).must_equal names
     end
+  end
 
-    it "won't raise an exception on a bogus string" do
-      Complete.local('~bogus')
+  describe 'when given a letter' do
+    it 'lists all command names starting with that letter' do
+      letter = 'c'
+      names = Commands::NAMES.map { |n| "#{n} " }
+      matches = names.select { |n| n.start_with?(letter) }
+      Complete.complete(letter, state).sort.must_equal matches.sort
     end
   end
 
-  describe 'when finding local directory tab completions' do
-    it 'must include all directories and only directories' do
-      entries = Dir.entries(Dir.pwd).select do |entry|
-        File.directory?(entry) && !/^..?$/.match(entry)
-      end
-      matches = Complete.local_dir('').map { |match| match.chomp('/') }
-      matches.sort.must_equal entries.sort
+  describe 'when given a context for local files' do
+    it 'lists all local files except . and .. and end with correct char' do
+      Complete.complete('put ', state).sort.must_equal local_contents.sort
     end
+  end
 
-    it 'must append a / to the end of options' do
-      Complete.local_dir('').all? { |option| option.end_with?('/') }
+  describe 'when given a context for local directories' do
+    it 'lists all local dirs except . and .. and end with correct char' do
+      dirs = local_contents.reject { |entry| entry.end_with?(' ') }
+      Complete.complete('lcd ', state).sort.must_equal dirs.sort
     end
   end
 
-  describe 'when resolving a remote search path' do
-    client = DropboxClient.new(Settings[:access_token])
-    TestUtils.ignore(DropboxError) { client.file_create_folder('/testing') }
-    state = State.new(client)
-    state.pwd = '/testing'
-
-    it 'must resolve unqualified string to working directory' do
-      Complete.remote_search_path('', state).must_equal state.pwd
-      Complete.remote_search_path('f', state).must_equal state.pwd
+  describe 'when given local context and faulty path' do
+    it 'must return empty list' do
+      Complete.complete('put bogus/', state).must_equal [] # fictional
+      Complete.complete('put ~bogus/', state).must_equal [] # malformed
     end
+  end
 
-    it 'must resolve / to root directory' do
-      Complete.remote_search_path('/', state).must_equal '/'
-      Complete.remote_search_path('/f', state).must_equal '/'
+  describe 'when given an implicit context for remote files' do
+    it 'lists all remote files and end with correct char' do
+      state.pwd = '/'
+      entries = remote_contents(state, '/')
+      Complete.complete('put thing ', state).sort.must_equal entries.sort
     end
+  end
 
-    it 'must resolve directory name to named directory' do
-      Complete.remote_search_path('/testing/', state).must_equal '/testing'
-      Complete.remote_search_path('/testing/f', state).must_equal '/testing'
-    end
+  describe 'when given an explicit, absolute context for remote files' do
+    it 'lists all remote files in path and end with correct char' do
+      state.pwd = '/'
 
-    it 'must resolve ./ to working directory' do
-      Complete.remote_search_path('./', state).must_equal state.pwd
-      Complete.remote_search_path('./f', state).must_equal state.pwd
-    end
+      entries = remote_contents(state, '/testing').map { |e| "/#{e}" }
+      Complete.complete('ls /testing/', state).sort.must_equal entries.sort
 
-    it 'must resolve ../ to parent directory' do
-      parent = File.dirname(state.pwd)
-      Complete.remote_search_path('../', state).must_equal parent
-      Complete.remote_search_path('../f', state).must_equal parent
+      entries.map! { |e| e.sub('/testing/', '/testing/../testing/./') }
+      Complete.complete('ls /testing/../testing/./', state).sort
+        .must_equal entries.sort
     end
   end
 
-  describe 'when finding remote tab completions' do
-    client = DropboxClient.new(Settings[:access_token])
-    state = State.new(client)
-    state.pwd = '/testing'
-    Commands::RM.exec(client, state, '/testing/*')
-    %w(/testing /testing/one /testing/two).each do |dir|
-      Commands::MKDIR.exec(client, state, dir) unless state.metadata(dir)
-    end
-    `echo hello > test.txt`
-    Commands::PUT.exec(client, state, 'test.txt')
-    `rm test.txt`
+  describe 'when given an explicit, relative context for remote files' do
+    it 'lists all remote files in path and end with correct char' do
+      state.pwd = '/'
 
-    it 'must return only matches of which the string is a prefix' do
-      Complete.remote('t', state).must_equal ['two/', 'test.txt ']
-    end
+      entries = remote_contents(state, '/testing')
+      Complete.complete('ls testing/', state).sort.must_equal entries.sort
 
-    it 'must return only directories if requested' do
-      Complete.remote_dir('', state).must_equal %w(one/ two/)
+      entries.map! { |e| e.sub('testing/', 'testing/../testing/./') }
+      Complete.complete('ls testing/../testing/./', state).sort
+        .must_equal entries.sort
     end
   end
 
-  describe 'when resolving command names' do
-    before do
-      @words = %w(plank plague plonk lake lag lock)
+  describe 'when given a context for remote directories' do
+    it 'lists all remote dirs and end with correct char' do
+      state.pwd = '/'
+      dirs = remote_contents(state, '/').select { |e| e.end_with?('/') }
+      Complete.complete('cd ', state).sort.must_equal dirs.sort
     end
+  end
 
-    it 'must return matches if and only if the string is a prefix' do
-      Complete.command('pla', @words).length.must_equal 2
+  describe 'when given name with spaces' do
+    it 'must continue to match correctly' do
+      `touch a\\ b\\ c`
+      matches = local_contents.select { |entry| entry.start_with?('a\\ ') }
+      Complete.complete('lcd a\\ ', state).sort.must_equal matches.sort
+      `rm a\\ b\\ c`
     end
+  end
 
-    it 'must return matches that end with a space' do
-      Complete.command('plank', @words).must_equal ['plank ']
+  describe 'when given an unworkable context' do
+    it 'lists nothing' do
+      Complete.complete('debug ', state).must_equal []
     end
   end
 end

data/spec/state_spec.rb

@@ -65,18 +65,18 @@ describe State do
     end
 
     it 'must yield an error for a bogus path' do
-      TestUtils.output_of(state, :forget_contents, 'bogus').length.must_equal 1
+      TestUtils.output_of(state, :forget_contents, 'bogus').size.must_equal 1
     end
 
     it 'must yield an error for a non-directory path' do
       TestUtils.output_of(state, :forget_contents, '/dir/file0')
-        .length.must_equal 1
+        .size.must_equal 1
     end
 
     it 'must yield an error for an already forgotten path' do
       state.forget_contents('/dir')
       TestUtils.output_of(state, :forget_contents, '/dir')
-        .length.must_equal 1
+        .size.must_equal 1
     end
 
     it 'must forget contents of given directory' do
@@ -91,7 +91,7 @@ describe State do
       state.forget_contents('/')
       state.cache['/'].include?('contents').must_equal false
       state.cache.keys.any? do |key|
-        key.length > 1
+        key.size > 1
       end.must_equal false
     end
   end

data/spec/testutils.rb

@@ -1,4 +1,8 @@
+require 'dropbox_sdk'
+
 require_relative '../lib/droxi/commands'
+require_relative '../lib/droxi/settings'
+require_relative '../lib/droxi/state'
 
 # Module of helper methods for testing.
 module TestUtils
@@ -6,13 +10,6 @@ module TestUtils
   # take place.
   TEST_ROOT = '/testing'
 
-  # Run the attached block, rescuing the given +Exception+ class.
-  def self.ignore(error_class)
-    yield
-  rescue error_class
-    nil
-  end
-
   # Call the method on the reciever with the given args and return an +Array+
   # of lines of output from the method.
   def self.output_of(receiver, method, *args)
@@ -52,6 +49,12 @@ module TestUtils
     Commands::RM.exec(client, state, *dead_paths)
   end
 
+  # Returns a new +DropboxClient+ and +State+.
+  def self.create_client_and_state
+    client = DropboxClient.new(Settings[:access_token])
+    [client, State.new(client)]
+  end
+
   private
 
   # Creates a remote file at the given path.

data/spec/text_spec.rb

@@ -23,19 +23,19 @@ describe Text do
   describe 'when wrapping text' do
     it "won't return any line larger than the screen width if unnecessary" do
       Text.wrap(@paragraph).all? do |line|
-        line.length <= @columns
+        line.size <= @columns
       end.must_equal true
     end
 
     it "won't split a word larger than the screen width" do
-      Text.wrap(@big_word).length.must_equal 1
+      Text.wrap(@big_word).size.must_equal 1
     end
   end
 
   describe 'when tabulating text' do
     it 'must space items equally' do
       lines = Text.table(@paragraph.split)
-      lines = lines[0, lines.length - 1]
+      lines = lines[0, lines.size - 1]
 
       space_positions = [0]
       while lines.first.index(/  \S/, space_positions.last + 3)
@@ -43,18 +43,18 @@ describe Text do
       end
 
       space_positions.drop(1).all? do |position|
-        lines.all? { |line| /  \S/.match(line[position, 3]) }
+        lines.all? { |line| line[position, 3][/  \S/] }
       end.must_equal true
     end
 
     it "won't return any line larger than the screen width if unnecessary" do
       Text.table(@paragraph.split).all? do |line|
-        line.length <= @columns
+        line.size <= @columns
       end.must_equal true
     end
 
     it "won't split a word larger than the screen width" do
-      Text.table([@big_word]).length.must_equal 1
+      Text.table([@big_word]).size.must_equal 1
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droxi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Brandon Mulcahy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk
@@ -45,6 +45,7 @@ files:
 - droxi.1.template
 - droxi.gemspec
 - lib/droxi.rb
+- lib/droxi/cache.rb
 - lib/droxi/commands.rb
 - lib/droxi/complete.rb
 - lib/droxi/settings.rb