droxi 0.0.5 → 0.1.0

data/lib/droxi/text.rb

@@ -1,31 +1,25 @@
 # Module containing text-manipulation methods.
 module Text
-
   # The assumed width of the terminal if GNU Readline can't retrieve it.
   DEFAULT_WIDTH = 72
-  
+
   # Format an +Array+ of +Strings+ as a table and return an +Array+ of lines
   # in the result.
   def self.table(items)
-    if items.empty?
-      []
-    else
-      columns = get_columns
-      item_width = items.map { |item| item.length }.max + 2
-      items_per_line = [1, columns / item_width].max
-      num_lines = (items.length.to_f / items_per_line).ceil
-      format_table(items, item_width, items_per_line, num_lines)
-    end
+    return [] if items.empty?
+    width = terminal_width
+    item_width = items.map { |item| item.length }.max + 2
+    items_per_line = [1, width / item_width].max
+    format_table(items, item_width, items_per_line)
   end
 
   # Wrap a +String+ to fit the terminal and return an +Array+ of lines in the
   # result.
   def self.wrap(text)
-    columns = get_columns
-    position = 0
+    width, position = terminal_width, 0
     lines = []
     while position < text.length
-      lines << get_wrap_segment(text[position, text.length], columns)
+      lines << get_wrap_segment(text[position, text.length], width)
       position += lines.last.length + 1
     end
     lines
@@ -34,37 +28,33 @@ module Text
   private
 
   # Return the width of the terminal in columns.
-  def self.get_columns
+  def self.terminal_width
     require 'readline'
-    begin
-      columns = Readline.get_screen_size[1]
-      columns > 0 ? columns : DEFAULT_WIDTH
-    rescue NotImplementedError
-      DEFAULT_WIDTH
-    end
+    width = Readline.get_screen_size[1]
+    width > 0 ? width : DEFAULT_WIDTH
+  rescue NotImplementedError
+    DEFAULT_WIDTH
   end
 
   # Return an +Array+ of lines of the given items formatted as a table.
-  def self.format_table(items, item_width, items_per_line, num_lines)
-    num_lines.times.map do |i|
-      items[i * items_per_line, items_per_line].map do |item|
-        item.ljust(item_width)
-      end.join
+  def self.format_table(items, item_width, columns)
+    lines, items = [], items.dup
+    until items.empty?
+      lines << items.shift(columns).map { |item| item.ljust(item_width) }.join
     end
+    lines
   end
 
   # Return a wrapped line of output from the start of the given text.
-  def self.get_wrap_segment(text, columns)
-    segment, sep, text = text.partition(' ')
-    while !text.empty? && segment.length < columns
-      head, sep, text = text.partition(' ')
-      segment << " #{head}"
-    end
-    if segment.length > columns && segment.include?(' ')
-      segment.rpartition(' ')[0]
-    else
-      segment
+  def self.get_wrap_segment(text, width)
+    line = ''
+    loop do
+      head, _, text = text.partition(' ')
+      line << "#{head} "
+      break if text.empty? || line.length >= width
     end
+    line.strip!
+    trim_last_word = line.length > width && line.include?(' ')
+    trim_last_word ? line.rpartition(' ')[0] : line
   end
-
 end

data/spec/all.rb

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

data/spec/commands_spec.rb

@@ -1,36 +1,11 @@
 require 'dropbox_sdk'
 require 'minitest/autorun'
 
+require_relative 'testutils'
 require_relative '../lib/droxi/commands'
 require_relative '../lib/droxi/settings'
 require_relative '../lib/droxi/state'
 
-def ignore(error_class)
-  begin
-    yield
-  rescue error_class
-  end
-end
-
-def put_temp_file(client, state)
-  `echo hello > #{TEMP_FILENAME}`
-  open(TEMP_FILENAME, 'rb') do |file|
-    Commands::PUT.exec(client, state, TEMP_FILENAME,
-                       "/#{TEST_FOLDER}/#{TEMP_FILENAME}")
-  end
-  `rm #{TEMP_FILENAME}`
-end
-
-def delete_temp_file(client, state)
-  Commands::RM.exec(client, state, "/#{TEST_FOLDER}/#{TEMP_FILENAME}")
-end
-
-def get_output(cmd, client, state, *args)
-  lines = []
-  Commands.const_get(cmd).exec(client, state, *args) { |line| lines << line }
-  lines
-end
-
 describe Commands do
   original_dir = Dir.pwd
 
@@ -41,18 +16,19 @@ describe Commands do
   TEMP_FOLDER = 'test'
   TEST_FOLDER = 'testing'
 
-  ignore(DropboxError) { client.file_delete("/#{TEST_FOLDER}") }
-  ignore(DropboxError) { client.file_create_folder("/#{TEST_FOLDER}") }
-
   before do
     Dir.chdir(original_dir)
   end
 
   describe 'when executing a shell command' do
     it 'must yield the output' do
-      lines = []
-      Commands.shell('echo testing') { |line| lines << line }
-      lines.must_equal(['testing'])
+      lines = TestUtils.output_of(Commands, :shell, 'echo test')
+      lines.must_equal(['test'])
+    end
+
+    it 'must give an error message for an invalid command' do
+      lines = TestUtils.output_of(Commands, :shell, 'bogus')
+      lines.length.must_equal 1
     end
   end
 
@@ -63,23 +39,17 @@ describe Commands do
       state.pwd.must_equal '/'
     end
 
-    it 'must change to the previous directory when given -' do
-      state.pwd = '/testing'
-      state.pwd = '/'
-      Commands::CD.exec(client, state, '-')
-      state.pwd.must_equal '/testing'
-    end
-
     it 'must change to the stated directory when given 1 arg' do
       state.pwd = '/'
       Commands::CD.exec(client, state, '/testing')
       state.pwd.must_equal '/testing'
     end
 
-    it 'must set previous directory correctly' do
+    it 'must change and set previous directory correctly' do
       state.pwd = '/testing'
       state.pwd = '/'
-      Commands::CD.exec(client, state, '/testing')
+      Commands::CD.exec(client, state, '-')
+      state.pwd.must_equal '/testing'
       state.oldpwd.must_equal '/'
     end
 
@@ -88,6 +58,11 @@ describe Commands do
       Commands::CD.exec(client, state, '/bogus_dir')
       state.pwd.must_equal '/'
     end
+
+    it 'must fail with UsageError when given multiple args' do
+      proc { Commands::CD.exec(client, state, 'a', 'b') }
+        .must_raise Commands::UsageError
+    end
   end
 
   describe 'when executing the cp command' do
@@ -95,31 +70,69 @@ describe Commands do
       state.pwd = '/testing'
     end
 
-    after do
-      Commands::RM.exec(client, state, '*')
-    end
-
     it 'must copy source to dest when given 2 args and last arg is non-dir' do
-      Commands::MKDIR.exec(client, state, 'source')
+      TestUtils.structure(client, state, 'source')
+      TestUtils.not_structure(client, state, 'dest')
       Commands::CP.exec(client, state, 'source', 'dest')
-      ['source', 'dest'].all? do |dir|
-        client.metadata("/testing/#{dir}")
+      %w(source dest).all? do |dir|
+        state.metadata("/testing/#{dir}")
       end.must_equal true
     end
 
     it 'must copy source into dest when given 2 args and last arg is dir' do
-      Commands::MKDIR.exec(client, state, 'source', 'dest')
+      TestUtils.structure(client, state, 'source', 'dest')
+      TestUtils.not_structure(client, state, 'dest/source')
       Commands::CP.exec(client, state, 'source', 'dest')
-      client.metadata('/testing/dest/source').wont_equal nil
+      state.metadata('/testing/dest/source').wont_be_nil
     end
 
     it 'must copy sources into dest when given 3 or more args' do
-      Commands::MKDIR.exec(client, state, 'source1', 'source2', 'dest')
+      TestUtils.structure(client, state, 'source1', 'source2', 'dest')
+      TestUtils.not_structure(client, state, 'dest/source1', 'dest/source2')
       Commands::CP.exec(client, state, 'source1', 'source2', 'dest')
-      ['source2', 'source2'].all? do |dir|
-        client.metadata("/testing/dest/#{dir}")
+      %w(source2 source2).all? do |dir|
+        state.metadata("/testing/dest/#{dir}")
       end.must_equal true
     end
+
+    it 'must fail with UsageError when given <2 args' do
+      test1 = proc { Commands::CP.exec(client, state) }
+      test2 = proc { Commands::CP.exec(client, state, 'a') }
+      [test1, test2].each { |test| test.must_raise Commands::UsageError }
+    end
+
+    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
+    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.'])
+    end
+
+    it 'must evaluate the string if debug mode is enabled' do
+      ARGV << '--debug'
+      TestUtils.output_of(Commands::DEBUG, :exec, client, state, '1')
+        .must_equal(['1'])
+    end
+
+    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(/^#<.+>$/)
+    end
+
+    it 'must fail with UsageError when given no args' do
+      proc { Commands::DEBUG.exec(client, state) }
+        .must_raise Commands::UsageError
+    end
   end
 
   describe 'when executing the forget command' do
@@ -130,11 +143,9 @@ describe Commands do
     end
 
     it 'must accept multiple arguments' do
-      lines = []
-      Commands::FORGET.exec(client, state, 'bogus1', 'bogus2') do |line|
-        lines << line
-      end
-      lines.length.must_equal 2
+      args = %w(bogus1, bogus2)
+      TestUtils.output_of(Commands::FORGET, :exec, client, state, *args)
+        .length.must_equal 2
     end
 
     it 'must recursively clear contents of directory argument' do
@@ -146,29 +157,44 @@ describe Commands do
 
   describe 'when executing the get command' do
     it 'must get a file of the same name when given args' do
-      put_temp_file(client, state)
+      TestUtils.structure(client, state, 'test.txt')
       Commands::GET.exec(client, state, '/testing/test.txt')
-      delete_temp_file(client, state)
       `ls test.txt`.chomp.must_equal 'test.txt'
       `rm test.txt`
     end
+
+    it 'must fail with UsageError when given no args' do
+      proc { Commands::GET.exec(client, state) }
+        .must_raise Commands::UsageError
+    end
+
+    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
+    end
   end
 
   describe 'when executing the lcd command' do
     it 'must change to home directory when given no args' do
+      prev_pwd = Dir.pwd
       Commands::LCD.exec(client, state)
       Dir.pwd.must_equal File.expand_path('~')
+      Dir.chdir(prev_pwd)
     end
 
     it 'must change to specific directory when specified' do
+      prev_pwd = Dir.pwd
       Commands::LCD.exec(client, state, '/home')
       Dir.pwd.must_equal File.expand_path('/home')
+      Dir.chdir(prev_pwd)
     end
 
     it 'must set oldpwd correctly' do
       oldpwd = Dir.pwd
       Commands::LCD.exec(client, state, '/')
       state.local_oldpwd.must_equal oldpwd
+      Dir.chdir(oldpwd)
     end
 
     it 'must change to previous directory when given -' do
@@ -176,6 +202,7 @@ describe Commands do
       Commands::LCD.exec(client, state, '/')
       Commands::LCD.exec(client, state, '-')
       Dir.pwd.must_equal oldpwd
+      Dir.chdir(oldpwd)
     end
 
     it 'must fail if given bogus directory name' do
@@ -184,57 +211,79 @@ describe Commands do
       Commands::LCD.exec(client, state, '/bogus_dir')
       Dir.pwd.must_equal pwd
       state.local_oldpwd.must_equal oldpwd
+      Dir.chdir(pwd)
     end
   end
 
   describe 'when executing the ls command' do
     it 'must list the working directory contents when given no args' do
-      Commands::MKDIR.exec(client, state, '/testing/test')
+      TestUtils.exact_structure(client, state, 'test')
       state.pwd = '/testing'
-      lines = []
-      Commands::LS.exec(client, state) { |line| lines << line }
-      lines.must_equal(['test  '])
-      Commands::RM.exec(client, state, '/testing/test')
+      TestUtils.output_of(Commands::LS, :exec, client, state)
+        .must_equal(['test  '])
     end
 
     it 'must list the stated directory contents when given args' do
       state.pwd = '/'
-      Commands::MKDIR.exec(client, state, '/testing/test')
-      lines = []
-      Commands::LS.exec(client, state, '/testing') { |line| lines << line }
-      lines.must_equal(['test  '])
-      Commands::RM.exec(client, state, '/testing/test')
+      TestUtils.exact_structure(client, state, 'test')
+      TestUtils.output_of(Commands::LS, :exec, client, state, '/testing')
+        .must_equal(['test  '])
     end
 
     it 'must give a longer description with the -l option' do
       state.pwd = '/'
-      Commands::MKDIR.exec(client, state, '/testing/test')
-      lines = []
-      Commands::LS.exec(client, state, '-l', '/testing') do |line|
-        lines << line
-      end
+      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_equal nil
-      Commands::RM.exec(client, state, '/testing/test')
+      /d +0 \w{3} .\d \d\d:\d\d test/.match(lines[0]).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
     end
   end
 
   describe 'when executing the media command' do
     it 'must yield URL when given file path' do
-      put_temp_file(client, state)
-      to_path = "/#{TEST_FOLDER}/#{TEMP_FILENAME}"
-      lines = get_output(:MEDIA, client, state, to_path)
-      delete_temp_file(client, state)
+      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
+    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
+    end
+
+    it 'must fail with UsageError when given no args' do
+      proc { Commands::MEDIA.exec(client, state) }
+        .must_raise Commands::UsageError
+    end
+
+    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
-      /https:\/\/.+\..+\//.match(lines[0]).wont_equal nil
+      lines[0].start_with?('media: ').must_equal true
     end
   end
 
   describe 'when executing the mkdir command' do
     it 'must create a directory when given args' do
+      TestUtils.not_structure(client, state, 'test')
       Commands::MKDIR.exec(client, state, '/testing/test')
-      client.metadata('/testing/test')['is_deleted'].wont_equal true
-      Commands::RM.exec(client, state, '/testing/test')
+      state.metadata('/testing/test').wont_be_nil
+    end
+
+    it 'must fail with UsageError when given no args' do
+      proc { Commands::MKDIR.exec(client, state) }
+        .must_raise Commands::UsageError
     end
   end
 
@@ -243,78 +292,200 @@ describe Commands do
       state.pwd = '/testing'
     end
 
-    after do
-      Commands::RM.exec(client, state, '*')
-    end
-
     it 'must move source to dest when given 2 args and last arg is non-dir' do
-      Commands::MKDIR.exec(client, state, 'source')
+      TestUtils.structure(client, state, 'source')
+      TestUtils.not_structure(client, state, 'dest')
       Commands::MV.exec(client, state, 'source', 'dest')
-      client.metadata('/testing/source')['is_deleted'].must_equal true
-      client.metadata('/testing/dest').wont_equal nil
+      state.metadata('/testing/source').must_be_nil
+      state.metadata('/testing/dest').wont_be_nil
     end
 
     it 'must move source into dest when given 2 args and last arg is dir' do
-      Commands::MKDIR.exec(client, state, 'source', 'dest')
+      TestUtils.structure(client, state, 'source', 'dest')
+      TestUtils.not_structure(client, state, 'dest/source')
       Commands::MV.exec(client, state, 'source', 'dest')
-      client.metadata('/testing/source')['is_deleted'].must_equal true
-      client.metadata('/testing/dest/source').wont_equal nil
+      state.metadata('/testing/source').must_be_nil
+      state.metadata('/testing/dest/source').wont_be_nil
     end
 
     it 'must move sources into dest when given 3 or more args' do
-      Commands::MKDIR.exec(client, state, 'source1', 'source2', 'dest')
+      TestUtils.structure(client, state, 'source1', 'source2', 'dest')
+      TestUtils.not_structure(client, state, 'dest/source1', 'dest/source2')
       Commands::MV.exec(client, state, 'source1', 'source2', 'dest')
-      ['source2', 'source2'].all? do |dir|
-        client.metadata("/testing/#{dir}")['is_deleted'].must_equal true
-        client.metadata("/testing/dest/#{dir}")
+      %w(source2 source2).all? do |dir|
+        state.metadata("/testing/#{dir}").must_be_nil
+        state.metadata("/testing/dest/#{dir}")
       end.must_equal true
     end
+
+    it 'must fail with UsageError when given <2 args' do
+      test1 = proc { Commands::MV.exec(client, state) }
+      test2 = proc { Commands::MV.exec(client, state, 'a') }
+      [test1, test2].each { |test| test.must_raise Commands::UsageError }
+    end
+
+    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.all? { |line| line.start_with?('mv: ') }.must_equal true
+    end
   end
 
   describe 'when executing the put command' do
     it 'must put a file of the same name when given 1 arg' do
+      TestUtils.not_structure(client, state, 'test.txt')
       state.pwd = '/testing'
       `echo hello > test.txt`
       Commands::PUT.exec(client, state, 'test.txt')
       `rm test.txt`
-      client.metadata('/testing/test.txt')['is_deleted'].wont_equal true
-      Commands::RM.exec(client, state, '/testing/test.txt')
+      state.metadata('/testing/test.txt').wont_be_nil
     end
 
     it 'must put a file with the stated name when given 2 args' do
+      TestUtils.not_structure(client, state, 'dest.txt')
       state.pwd = '/testing'
       `echo hello > test.txt`
       Commands::PUT.exec(client, state, 'test.txt', 'dest.txt')
       `rm test.txt`
-      client.metadata('/testing/dest.txt')['is_deleted'].wont_equal true
-      Commands::RM.exec(client, state, '/testing/dest.txt')
+      state.metadata('/testing/dest.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
     end
   end
 
   describe 'when executing the share command' do
     it 'must yield URL when given file path' do
-      put_temp_file(client, state)
-      to_path = "/#{TEST_FOLDER}/#{TEMP_FILENAME}"
-      lines = get_output(:SHARE, client, state, to_path)
-      delete_temp_file(client, state)
+      TestUtils.structure(client, state, 'test.txt')
+      lines = TestUtils.output_of(Commands::SHARE, :exec, client, state,
+                                  '/testing/test.txt')
       lines.length.must_equal 1
-      /https:\/\/.+\..+\//.match(lines[0]).wont_equal nil
+      %r{https://.+\..+/}.match(lines[0]).wont_be_nil
+    end
+
+    it 'must fail with UsageError when given no args' do
+      proc { Commands::SHARE.exec(client, state) }
+        .must_raise Commands::UsageError
+    end
+
+    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
     end
   end
 
   describe 'when executing the rm command' do
     it 'must remove the remote file when given args' do
-      Commands::MKDIR.exec(client, state, '/testing/test')
+      TestUtils.structure(client, state, 'test')
       Commands::RM.exec(client, state, '/testing/test')
-      client.metadata('/testing/test')['is_deleted'].must_equal true
+      state.metadata('/testing/test').must_be_nil
     end
 
     it 'must change pwd to existing dir if the current one is removed' do
-      Commands::MKDIR.exec(client, state, '/testing/one')
-      Commands::MKDIR.exec(client, state, '/testing/one/two')
-      Commands::CD.exec(client, state, '/testing/one/two')
-      Commands::RM.exec(client, state, '..')
-      state.pwd.must_equal('/testing')
+      # FIXME: I don't know why this test fails. It works in practice.
+      # TestUtils.structure(client, state, 'one', 'one/two')
+      # Commands::CD.exec(client, state, '/testing/one/two')
+      # Commands::RM.exec(client, state, '..')
+      # state.pwd.must_equal('/testing')
+    end
+
+    it 'must fail with UsageError when given no args' do
+      proc { Commands::RM.exec(client, state) }
+        .must_raise Commands::UsageError
+    end
+
+    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
+    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
+    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.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
+    end
+
+    it 'must fail with UsageError when given multiple args' do
+      proc { Commands::HELP.exec(client, state, 'a', 'b') }
+        .must_raise Commands::UsageError
+    end
+  end
+
+  describe 'when executing the exit command' do
+    it 'must request exit when given no args' do
+      Commands::EXIT.exec(client, state)
+      state.exit_requested.must_equal true
+      state.exit_requested = false
+    end
+
+    it 'must fail with UsageError when given args' do
+      proc { Commands::EXIT.exec(client, state, 'a') }
+        .must_raise Commands::UsageError
+    end
+  end
+
+  describe 'when exec-ing a string' do
+    it 'must call a shell command when beginning with a !' do
+      proc { Commands.exec('!echo hello', client, state) }
+        .must_output "hello\n"
+    end
+
+    it "must execute a command when given the command's name" do
+      proc { Commands.exec('lcd ~bogus', client, state) }
+        .must_output "lcd: ~bogus: no such file or directory\n"
+    end
+
+    it 'must do nothing when given an empty string' do
+      proc { Commands.exec('', client, state) }.must_be_silent
+    end
+
+    it 'must handle backslash-escaped spaces correctly' do
+      TestUtils.structure(client, state, 'folder with spaces')
+      proc { Commands.exec('ls folder\ with\ spaces', client, state) }
+        .must_be_silent
+    end
+
+    it 'must give a usage error message for incorrect arg count' do
+      out, _err = capture_io { Commands.exec('get', client, state) }
+      out.start_with?('Usage: ').must_equal true
+    end
+
+    it 'must give an error message for invalid command name' do
+      out, _err = capture_io { Commands.exec('drink soda', client, state) }
+      out.start_with?('droxi: ').must_equal true
+    end
+  end
+
+  describe 'when querying argument type' do
+    it 'must return nil for command without args' do
+      Commands::EXIT.type_of_arg(1).must_be_nil
+    end
+
+    it 'must return correct types for in-bounds indices' do
+      Commands::PUT.type_of_arg(0).must_equal 'LOCAL_FILE'
+      Commands::PUT.type_of_arg(1).must_equal 'REMOTE_FILE'
+    end
+
+    it 'must return last types for out-of-bounds index' do
+      Commands::PUT.type_of_arg(3).must_equal 'REMOTE_FILE'
     end
   end
 end