file_discard 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d198ac94a7993ffcc15a2d4985561d1bee2b94d0
-  data.tar.gz: d2d4305716fc3c960a967c3d10fef7c665faaf63
+  metadata.gz: c7539efaa26ed718413f4770434de5cb04a45d36
+  data.tar.gz: 514b8d987d89790aa7aac1585b878b189afdf6a4
 SHA512:
-  metadata.gz: 215102e583870fe1b07e3b14a477ba60e2dff2e29c7a7ca93f105d7f16e5e07b1e06288f69022408e30d410fd8048648f09d66876a6f99c034fd2fef0c2b2aa8
-  data.tar.gz: dfebe4588ecac6db54049c6193c6f02c56c576a4a02126af40686014a8b7ff8d502768702a5b89c54ccb89356ae370c3c00923333a3415f6f417929f243cab97
+  metadata.gz: 6c1e810875af7e912f85055a77c937c679afaaa8ea374815239150ca48aeaef432e9b7974ccb26fcc83b83aa223953de667a9dda91633f94f039fd14f088a6e1
+  data.tar.gz: 5ac9cd626b81ef753135565cf3ace8865f1dea0c5d82bdb11be5aa5edd2eaefe038c211441f9aa46d52654051ff9b919440df8cca3a83e3f26823537c2b0c3b6

data/README.md

@@ -2,6 +2,14 @@ FileDiscard is a simple helper to make it easy for applications to move files to
 
 ## Getting Started
 
+### Installation
+
+```shell
+> gem install file_discard
+```
+
+[![Gem Version](https://badge.fury.io/rb/file_discard.svg)](http://badge.fury.io/rb/file_discard)
+
 ### Using the Executable
 
 Part of the `file_discard` gem is an executable that can be used as a drop-in replacement for "rm":
@@ -9,6 +17,7 @@ Part of the `file_discard` gem is an executable that can be used as a drop-in re
 ```shell
 > discard
 Usage: discard [options] file ...
+    -f, --force                      when provided twice, permanently remove targets
     -d, --dir                        allow empty directories to be discarded
     -r                               allow directories to be discarded recursively
     -R, --recursive                  allow directories to be discarded recursively
@@ -17,7 +26,6 @@ Usage: discard [options] file ...
         --version                    show version
 
 Options ignored to provide compatibility with "rm":
-    -f
     -i
     -I
 ```

data/Rakefile

@@ -8,7 +8,7 @@ task default: :test
 task spec: :test
 task build: :package
 
-PKG_VERSION = '0.1.5'
+PKG_VERSION = '0.1.6'
 NOW = Time.now.utc
 
 # delay updating the version file unless building the gem or package

data/bin/discard

@@ -55,8 +55,14 @@ FileDiscard.create_trash_when_missing = true
 
 status = 0
 ARGV.each do |file|
+  options.force > 1 and $stderr.puts "Warning: Permanently removing #{file}"
   begin
     FileDiscard.discard(file, options.marshal_dump)
+  rescue FileDiscard::TrashNotPermitted => ex
+    $stderr.puts "#{parser.program_name}: #{file}: #{ex.message}"
+    options.verbose and $stderr.puts ex.backtrace
+    $stderr.puts "Consider using -ff to permanently remove"
+    status = 3
   rescue Errno::EINVAL, Errno::ENOENT => ex
     $stderr.puts "#{parser.program_name}: #{file}: #{ex.message}"
     status = 1

data/lib/file_discard.rb

@@ -85,6 +85,10 @@ module FileDiscard
   # Raised when the configured trash directory for a given mountpoint does not exist.
   class TrashMissing < Errno::ENOENT; end;
 
+  # Raised when the configured trash directory for a given mountpoint does not exist
+  # and user does not have permissions to create it.
+  class TrashNotPermitted < Errno::EACCES; end;
+
   # The core logic for moving files to an appropriate trash directory.
   class Discarder
     SPECIAL_DIRS = ['.','..'] # :nodoc:
@@ -99,6 +103,7 @@ module FileDiscard
     # Request that +obj+ be moved to the trash.
     #
     # +options+ - a hash of any of the following:
+    # * :force - if greater than one, permanently remove +obj+
     # * :directory - allow an empty directory to be discarded
     # * :recursive - allow a directory to be discarded even if not empty
     # * :verbose - report the move operation
@@ -122,7 +127,6 @@ module FileDiscard
       end
 
       if options.key?(:force) && options[:force] > 1
-        $stderr.puts "Warning: Permanently removing #{pn}"
         FileUtils.rm_rf(pn, {verbose: options[:verbose] || false})
         return
       end
@@ -130,7 +134,11 @@ module FileDiscard
       trash = find_trash_for pn
       unless trash.exist?
         FileDiscard.create_trash_when_missing or raise TrashMissing.new(trash.to_s)
-        trash.mkpath
+        begin
+          trash.mkpath
+        rescue Errno::EACCES
+          raise TrashNotPermitted.new("Unable to create #{trash.to_s}")
+        end
       end
 
       move_options = options.has_key?(:verbose) ? {verbose: options[:verbose]} : {}

data/lib/file_discard_version.rb

@@ -1,6 +1,6 @@
 module FileDiscard
   # :nodoc:
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
   # :nodoc:
-  RELEASE = '4441d85:20141102225117'
+  RELEASE = '7e133b5:20141103000654'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_discard
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Brad Robel-Forrest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies: []
 description: Simple helper to move files to the trash folder.
 email: brad+filediscard@gigglewax.com