droxi 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db93fae1cb4f2b8945d7bac19ad38940817f2f6e
-  data.tar.gz: 8a8d36e14900fefebba6a090dae94df16cbe7c64
+  metadata.gz: 55c2e238628368cdd91abd0fb76a31cb0b217159
+  data.tar.gz: bf2bec767b3e0b80bf264a2784fc9b2c3cda15a6
 SHA512:
-  metadata.gz: 8212f5b0d45da0538697258becc8d3f7e6971c6e9b72e66b2fee4aa001c78a4831fc3fe1358384e1a0b574c423a46bc5ebf4264ef647dc359150035a28aaeddb
-  data.tar.gz: 99355ccb042b1f05b784d19e4c8ba723c248ce51c292514be89575d1d6ba2a34a3ec468e05c3eafcc77b5ff8af79b3986ed52931b9333b9beea14a51cf031833
+  metadata.gz: 18f9cad5986b95260f0c9743231bff2c5a9bc634d7fa61a39ead74664d8c61a2a803b31a91bfd96df2a7acbecf381aa04c8d13c378ad2aaa0d08e94fdbf94f0d
+  data.tar.gz: 0414164a2564a94de66d758422ef65e213909952a3dc69f4fb1dd10265f01cb000f7d5debb10afd302116d55f47979656720bf4b9866dc5db859d059272a7a2b

data/Rakefile

@@ -65,10 +65,11 @@ task :build do
 
   def build_page
     gemspec = IO.read('droxi.gemspec')
+    main = IO.read('lib/droxi.rb')
 
     contents = format(IO.read('droxi.1.template'),
                       date: date(gemspec),
-                      version: gemspec[/\d+\.\d+\.\d+/],
+                      version: main[/\d+\.\d+\.\d+/],
                       commands: commands)
 
     IO.write('build/droxi.1', contents)

data/droxi.1.template

@@ -9,6 +9,9 @@ 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
+.TP
+!STRING
+Pass a string to be executed by the local shell.
 %{commands}
 .SH OPTIONS
 .TP

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-06-07'
+  s.date        = '2014-06-08'
   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/commands.rb

@@ -61,6 +61,22 @@ module Commands
     end
   end
 
+  # Print the contents of remote files.
+  CAT = Command.new(
+    'cat REMOTE_FILE...',
+    'Print the concatenated contents of remote files.',
+    lambda do |client, state, args|
+      extract_flags('cat', args, '')
+      state.expand_patterns(args).each do |path|
+        if path.is_a?(GlobError)
+          warn "cat: #{path}: no such file or directory"
+        else
+          puts client.get_file(path)
+        end
+      end
+    end
+  )
+
   # Change the remote working directory.
   CD = Command.new(
     'cd [REMOTE_DIR]',
@@ -314,29 +330,26 @@ module Commands
 
   # Upload a local file.
   PUT = Command.new(
-    'put [-f] LOCAL_FILE [REMOTE_FILE]',
-    "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 unless \
+    'put [-f] 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. When given only a local file path, the remote path defaults \
-     to a file of the same name in the remote working directory.",
+     overwritten.",
     lambda do |client, state, args|
       flags = extract_flags('put', args, '-f')
-      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(StandardError) do
-        File.open(File.expand_path(from_path), 'rb') do |file|
-          if flags.include?('-f') && state.metadata(to_path)
-            client.file_delete(to_path)
-            state.cache.remove(to_path)
+      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|
+            if flags.include?('-f') && state.metadata(to_path)
+              client.file_delete(to_path)
+              state.cache.remove(to_path)
+            end
+            data = client.put_file(to_path, file)
+            state.cache.add(data)
+            puts "#{arg} -> #{data['path']}"
           end
-          data = client.put_file(to_path, file)
-          state.cache.add(data)
-          puts "#{from_path} -> #{data['path']}"
         end
       end
     end

data/lib/droxi.rb

@@ -9,7 +9,7 @@ require_relative 'droxi/state'
 # Command-line Dropbox client module.
 module Droxi
   # Version number of the program.
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   # Run the client.
   def self.run(args)

data/spec/commands_spec.rb

@@ -31,6 +31,36 @@ describe Commands do
     end
   end
 
+  describe 'when executing the cat command' do
+    before do
+      state.pwd = TestUtils::TEST_ROOT
+      @cat = proc do |*args|
+        capture_io { Commands::CAT.exec(client, state, *args) }
+      end
+    end
+
+    it 'must print the contents of existing remote files' do
+      `echo hello > hello.txt`
+      `echo world > world.txt`
+      capture_io do
+        Commands::PUT.exec(client, state, 'hello.txt', 'world.txt')
+      end
+      out, _ = @cat.call('hello.txt', 'world.txt')
+      out.must_equal("hello\nworld\n")
+      `rm hello.txt world.txt`
+    end
+
+    it 'must give an error message if trying to cat a bogus file' do
+      _, err = @cat.call('bogus')
+      err.lines.size.must_equal 1
+      err.start_with?('cat: ').must_equal true
+    end
+
+    it 'must fail with UsageError when given no args' do
+      proc { @cat.call }.must_raise Commands::UsageError
+    end
+  end
+
   describe 'when executing the cd command' do
     before do
       @cd = proc do |*args|
@@ -148,6 +178,12 @@ describe Commands do
       out.must_equal("1\n")
     end
 
+    it 'must handle syntax errors' do
+      ARGV << '--debug'
+      _, err = @debug.call('"x')
+      err.lines.size.must_equal 1
+    end
+
     it 'must print the resulting exception if given exceptional input' do
       ARGV << '--debug'
       _, err = @debug.call('x')
@@ -410,28 +446,13 @@ describe Commands do
       end
     end
 
-    it 'must put a file of the same name when given 1 arg' do
-      TestUtils.not_structure(client, state, 'test.txt')
-      `echo hello > test.txt`
-      @put.call('test.txt')
-      `rm 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')
-      `echo hello > test.txt`
-      @put.call('test.txt', 'dest.txt')
-      `rm test.txt`
-      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')
-      `touch test.txt`
-      @put.call('test.txt', '/testing')
-      `rm test.txt`
-      state.metadata('/testing/test.txt').wont_be_nil
+    it 'must put multiple files' do
+      TestUtils.not_structure(client, state, 'file1.txt', 'file2.txt')
+      `touch file1.txt file2.txt`
+      @put.call('file1.txt', 'file2.txt')
+      `rm file1.txt file2.txt`
+      state.metadata('/testing/file1.txt').wont_be_nil
+      state.metadata('/testing/file2.txt').wont_be_nil
     end
 
     it 'must not overwrite without -f option' do
@@ -574,7 +595,7 @@ describe Commands do
     end
 
     it 'must fail with error if remote directory not empty' do
-      TestUtils.structure(client, state, 'test', 'test/file.txt')
+      TestUtils.structure(client, state, 'test', 'test/subtest')
       _, err = @rmdir.call('/testing/test')
       err.lines.size.must_equal 1
       err.start_with?('rmdir: ').must_equal true
@@ -650,12 +671,12 @@ describe Commands do
     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'
+      Commands::MV.type_of_arg(0).must_equal 'REMOTE_FILE'
+      Commands::MV.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'
+      Commands::PUT.type_of_arg(3).must_equal 'LOCAL_FILE'
     end
   end
 end

data/spec/complete_spec.rb

@@ -68,7 +68,7 @@ describe Complete 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
+      Complete.complete('get thing ', state).sort.must_equal entries.sort
     end
   end
 

data/spec/testutils.rb

@@ -64,7 +64,9 @@ module TestUtils
     `touch testing/#{basename}`
     real_stdout = $stdout
     $stdout = StringIO.new
-    Commands::PUT.exec(client, state, "testing/#{basename}", path)
+    prev_pwd, state.pwd = state.pwd, '/testing'
+    Commands::PUT.exec(client, state, "testing/#{basename}")
+    state.pwd = prev_pwd
     $stdout = real_stdout
     `rm -rf testing`
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droxi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Brandon Mulcahy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk