droxi 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad346e735c5106bff58480298a50a5c296e15542
-  data.tar.gz: f565510a170c8ad38066048d4cf7fe10bf09d51e
+  metadata.gz: e18e4d87aac63a2329521ad3914056e04e0050b4
+  data.tar.gz: da3104c02ce7a5c2ea86d68f4800563e7acc5d37
 SHA512:
-  metadata.gz: d14ddec3bd6d7cb7bbd3ad82ece43f7f9cb3811868fa1ef82525fb3dcbf853aaecf30365c960ded970be82fbf26455d454a334e34c27a6b599b7eca50f56cbda
-  data.tar.gz: 337b45f2741a59ac04422264ce0452abcd69e62eea9e2ee38dea7a97dca309fc56e14d4c90b62e2244c7ce11a4e36c82ed9b4541e2505e5ce8a8e5a49a54dcc1
+  metadata.gz: cbf92717523c05adac49d3b7f925bdfea903543697325d6b6468da7ca419e4bf59ee7fb575ab6c27c6fec593ccc711b9567f2eac3b503e2237e1d27292f748b5
+  data.tar.gz: 3442fecd04eb87b3c3afe40086ce4096f459fec58b3b7902426ea9d5c901e998f99998fe67054d32741edbd09c318d39cd2077f2a6fba5b7ead48de50d9adc9e

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        = '2015-05-31'
+  s.date        = '2015-06-04'
   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, \
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Brandon Mulcahy']
   s.email       = 'brandon@jangler.info'
   s.files       = `git ls-files`.split
-  s.homepage    = 'https://github.com/jangler/droxi'
+  s.homepage    = 'http://jangler.info/code/droxi'
   s.license     = 'MIT'
 
   s.executables << 'droxi'

data/lib/droxi/commands.rb

@@ -415,7 +415,7 @@ module Commands
         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 = args.reduce(:+) unless args.empty? # avoid making args nil
 
       args.each do |arg|
         to_path = state.resolve_path(File.basename(arg))

data/lib/droxi.rb

@@ -17,7 +17,7 @@ require_relative 'droxi/text'
 # Command-line Dropbox client module.
 module Droxi
   # Version number of the program.
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 
   # Message to display when invoked with the --help option.
   HELP_TEXT = [
@@ -33,17 +33,17 @@ module Droxi
     reenter = ARGV[0] == 'REENTER'
     ARGV.delete_if { |arg| arg == 'REENTER' }
     original_argv = ARGV.dup
-    options = handle_options
+    options, args = handle_options
     Settings.init
 
     client = DropboxClient.new(access_token)
-    state = State.new(client, ARGV.empty?, original_argv)
+    state = State.new(client, args.empty?, original_argv)
     state.debug_enabled = options[:debug]
 
-    if ARGV.empty?
+    if args.empty?
       run_interactive(client, state, reenter)
     else
-      invoke(ARGV, client, state)
+      invoke(args, client, state)
     end
   rescue DropboxAuthError => error
     warn error
@@ -54,7 +54,8 @@ module Droxi
 
   private
 
-  # Handles command-line options and returns a +Hash+ of the extracted options.
+  # Handles command-line options and returns a +Hash+ of the extracted options,
+  # and an +Array+ of the remaining arguments.
   def self.handle_options
     options = { debug: false }
 
@@ -87,13 +88,15 @@ module Droxi
     end
 
     begin
-      parser.parse!
+      global_opts = ARGV.take_while { |arg| !Commands::NAMES.include?(arg) }
+      num_opts = global_opts.size
+      parser.parse!(global_opts)
     rescue OptionParser::ParseError => err
       warn(err)
       exit(1)
     end
 
-    options
+    [options, global_opts + ARGV.drop(num_opts)]
   end
 
   # Invokes a single command formed by joining an +Array+ of +String+ args.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droxi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Brandon Mulcahy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk
@@ -58,7 +58,7 @@ files:
 - spec/state_spec.rb
 - spec/testutils.rb
 - spec/text_spec.rb
-homepage: https://github.com/jangler/droxi
+homepage: http://jangler.info/code/droxi
 licenses:
 - MIT
 metadata: {}