droxi 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e18e4d87aac63a2329521ad3914056e04e0050b4
-  data.tar.gz: da3104c02ce7a5c2ea86d68f4800563e7acc5d37
+  metadata.gz: 7e6d4d129c264dd4d931b1b41244d98c4116a458
+  data.tar.gz: f911f97cc7ebb970dd3073595da5bb1adefec5b8
 SHA512:
-  metadata.gz: cbf92717523c05adac49d3b7f925bdfea903543697325d6b6468da7ca419e4bf59ee7fb575ab6c27c6fec593ccc711b9567f2eac3b503e2237e1d27292f748b5
-  data.tar.gz: 3442fecd04eb87b3c3afe40086ce4096f459fec58b3b7902426ea9d5c901e998f99998fe67054d32741edbd09c318d39cd2077f2a6fba5b7ead48de50d9adc9e
+  metadata.gz: e51bcc3b49d0d5c2c3307e175bc5b9ac10d3b18399009896fa85bd7d17a5a01ecacbff36e0aab07b36198baafa9cd7b6453766ff941c8a1a72e92269282491d7
+  data.tar.gz: b87e9923bedb52bb3893c75542d571af9529eacc4dc61655b7ad80ab5650de1badefd42a86fe6e52f511b4abb4a51a28f01a3c8939bf19f0e0049f035f534290

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 Brandon Mulcahy
+Copyright (c) 2014-2016 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/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-06-04'
+  s.date        = '2016-12-23'
   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, \

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.1'
+  VERSION = '0.5.0'
 
   # Message to display when invoked with the --help option.
   HELP_TEXT = [
@@ -47,9 +47,11 @@ module Droxi
     end
   rescue DropboxAuthError => error
     warn error
+    state.exit_status = 1
     Settings.delete(:access_token)
   ensure
     Settings.save
+    exit state.exit_status
   end
 
   private
@@ -153,6 +155,10 @@ module Droxi
 
     # Set pwd before exiting so that the oldpwd setting is saved to the pwd.
     state.pwd = '/'
+
+    # Set exit status to zero even if the last command had an error, since
+    # we're in interactive mode and quitting correctly.
+    state.exit_status = 0
   end
 
   def self.init_readline(state)

data/lib/droxi/commands.rb

@@ -70,6 +70,7 @@ module Commands
       state.expand_patterns(args).each do |path|
         if path.is_a?(GlobError)
           warn "cat: #{path}: no such file or directory"
+          state.exit_status = 1
         else
           puts client.get_file(path)
         end
@@ -95,6 +96,7 @@ module Commands
           state.pwd = path
         else
           warn "cd: #{args.first}: no such directory"
+          state.exit_status = 1
         end
       end
     end
@@ -126,11 +128,14 @@ module Commands
           # rubocop:enable Lint/Eval
         rescue SyntaxError => error
           warn error
+          state.exit_status = 1
         rescue => error
           warn error.inspect
+          state.exit_status = 1
         end
       else
         warn 'debug: not enabled.'
+        state.exit_status = 1
       end
     end
   )
@@ -171,7 +176,10 @@ module Commands
         state.cache.clear
       else
         args.each do |arg|
-          state.forget_contents(arg) { |line| warn line }
+          state.forget_contents(arg) do |line|
+            warn line
+            state.exit_status = 1
+          end
         end
       end
     end
@@ -190,6 +198,7 @@ module Commands
       state.expand_patterns(args).each do |path|
         if path.is_a?(GlobError)
           warn "get: #{path}: no such file or directory"
+          state.exit_status = 1
         else
           basename = File.basename(path)
           try_and_handle(DropboxError) do
@@ -203,6 +212,7 @@ module Commands
               puts "#{basename} <- #{path}"
             else
               warn "get: #{basename}: local file already exists"
+              state.exit_status = 1
             end
           end
         end
@@ -228,6 +238,7 @@ module Commands
           Text.wrap(cmd.description).each { |line| puts line }
         else
           warn "help: #{cmd_name}: no such command"
+          state.exit_status = 1
         end
       end
     end
@@ -244,6 +255,7 @@ module Commands
       path = state.resolve_path(args.first)
       if !state.metadata(path) || state.directory?(path)
         warn "history: #{args.first}: no such file"
+        state.exit_status = 1
       else
         try_and_handle(DropboxError) do
           client.revisions(path).each do |rev|
@@ -283,6 +295,7 @@ module Commands
         Dir.chdir(path)
       else
         warn "lcd: #{args.first}: no such directory"
+        state.exit_status = 1
       end
     end
   )
@@ -303,6 +316,7 @@ module Commands
       state.expand_patterns(args, true).each do |path|
         if path.is_a?(GlobError)
           warn "ls: #{path}: no such file or directory"
+          state.exit_status = 1
         else
           type = state.directory?(path) ? dirs : files
           type << path
@@ -336,6 +350,7 @@ module Commands
       state.expand_patterns(args).each do |path|
         if path.is_a?(GlobError)
           warn "media: #{path}: no such file or directory"
+          state.exit_status = 1
         else
           try_and_handle(DropboxError) do
             url = client.media(path)['url']
@@ -402,6 +417,7 @@ module Commands
           state.pwd = state.resolve_path(dest_path)
         else
           warn "put: #{dest_path}: no such directory"
+          state.exit_status = 1
           return
         end
       end
@@ -413,6 +429,7 @@ module Commands
       args.map! do |arg|
         array = Dir.glob(File.expand_path(arg))
         warn "put: #{arg}: no such file or directory" if array.empty?
+        state.exit_status = 1
         array.map { |path| path.sub(File.dirname(path), File.dirname(arg)) }
       end
       args = args.reduce(:+) unless args.empty? # avoid making args nil
@@ -424,6 +441,7 @@ module Commands
           path = File.expand_path(arg)
           if File.directory?(path)
             warn "put: #{arg}: cannot put directory"
+            state.exit_status = 1
             next
           end
 
@@ -466,6 +484,7 @@ module Commands
       path = state.resolve_path(args.first)
       if !state.metadata(path) || state.directory?(path)
         warn "restore: #{args.first}: no such file"
+        state.exit_status = 1
       else
         try_and_handle(DropboxError) do
           client.restore(path, args.last)
@@ -484,9 +503,11 @@ module Commands
       state.expand_patterns(args).each do |path|
         if path.is_a?(GlobError)
           warn "rm: #{path}: no such file or directory"
+          state.exit_status = 1
         else
           if state.directory?(path) && !flags.include?('-r')
             warn "rm: #{path}: is a directory"
+            state.exit_status = 1
             next
           end
           try_and_handle(DropboxError) do
@@ -508,14 +529,17 @@ module Commands
       state.expand_patterns(args).each do |path|
         if path.is_a?(GlobError)
           warn "rmdir: #{path}: no such file or directory"
+          state.exit_status = 1
         else
           unless state.directory?(path)
             warn "rmdir: #{path}: not a directory"
+            state.exit_status = 1
             next
           end
           contents = state.metadata(path)['contents']
           if contents && !contents.empty?
             warn "rmdir: #{path}: directory not empty"
+            state.exit_status = 1
             next
           end
           try_and_handle(DropboxError) do
@@ -538,6 +562,7 @@ module Commands
       path = state.resolve_path(args.first)
       unless state.directory?(path)
         warn "search: #{args.first}: no such directory"
+        state.exit_status = 1
         return
       end
       query = args.drop(1).join(' ')
@@ -559,6 +584,7 @@ module Commands
       state.expand_patterns(args).each do |path|
         if path.is_a?(GlobError)
           warn "share: #{path}: no such file or directory"
+          state.exit_status = 1
         else
           try_and_handle(DropboxError) do
             url = client.shares(path)['url']
@@ -608,9 +634,11 @@ module Commands
         command.exec(client, state, *args) { |line| puts line }
       rescue UsageError => error
         warn "Usage: #{error}"
+        state.exit_status = 1
       end
     else
       warn "droxi: #{command_name}: command not found"
+      state.exit_status = 1
     end
   end
 
@@ -651,6 +679,7 @@ module Commands
     state.expand_patterns(paths, preserve_root).map do |item|
       if item.is_a?(GlobError)
         warn "#{cmd}: #{item}: no such file or directory" if output
+        state.exit_status = 1
         nil
       else
         item
@@ -701,6 +730,7 @@ module Commands
       end
     else
       warn "#{cmd}: #{args.last}: no such directory"
+      state.exit_status = 1
     end
   end
 

data/lib/droxi/state.rb

@@ -30,6 +30,9 @@ class State
   # +true+ if the --debug option was given, +false+ otherwise.
   attr_accessor :debug_enabled
 
+  # integer.
+  attr_accessor :exit_status
+
   # Return a new application state that uses the given client. Starts at the
   # Dropbox root and with an empty cache.
   def initialize(client, interactive = true, argv = ARGV)
@@ -42,6 +45,7 @@ class State
     @pwd = '/'
     @oldpwd = Settings[:oldpwd] || '/'
     @local_oldpwd = Dir.pwd
+    @exit_status = 0
   end
 
   # Return a +Hash+ of the Dropbox metadata for a file, or +nil+ if the file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droxi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Brandon Mulcahy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: An ftp-like command-line interface to Dropbox