file_discard 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf2cacff4155deb6ead06ec337cd3cbade7b4ab
-  data.tar.gz: e1cf01705708d7ad0d526191288874b705f00066
+  metadata.gz: d198ac94a7993ffcc15a2d4985561d1bee2b94d0
+  data.tar.gz: d2d4305716fc3c960a967c3d10fef7c665faaf63
 SHA512:
-  metadata.gz: f769d69f5ccea663f6e6df22b1dc15a7f6f7851ba9fed5880462f0f9805bc09fd57fa0d4d1973220223e951bb5d1c7b85677435031c83a7a43efa83c4d053aa3
-  data.tar.gz: 336a23836b05be91779c45265b535c71fd8d5cb25eff795fa5283910d11854dbbe56b6bb1e6745a074ca6d7e181c0608a5b0a1543e1531419af673d7e9044fe3
+  metadata.gz: 215102e583870fe1b07e3b14a477ba60e2dff2e29c7a7ca93f105d7f16e5e07b1e06288f69022408e30d410fd8048648f09d66876a6f99c034fd2fef0c2b2aa8
+  data.tar.gz: dfebe4588ecac6db54049c6193c6f02c56c576a4a02126af40686014a8b7ff8d502768702a5b89c54ccb89356ae370c3c00923333a3415f6f417929f243cab97

data/Rakefile

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

data/bin/discard

@@ -4,11 +4,15 @@ require 'optparse'
 require 'ostruct'
 require_relative '../lib/file_discard'
 
-options = OpenStruct.new
+options = OpenStruct.new(force: 0)
 parser  = OptionParser.new do |opts|
   Version = FileDiscard::VERSION
   Release = FileDiscard::RELEASE
 
+  opts.on('-f', '--force', 'when provided twice, permanently remove targets') do
+    options.force += 1
+  end
+
   opts.on('-d', '--dir', 'allow empty directories to be discarded') do |v|
     options.directory = v
   end
@@ -35,7 +39,7 @@ parser  = OptionParser.new do |opts|
 
   opts.separator('')
   opts.separator('Options ignored to provide compatibility with "rm":')
-  [?f,?i,?I].each {|o| opts.on("-#{o}")}
+  [?i,?I].each {|o| opts.on("-#{o}")}
 
   opts.banner << ' file ...'
 end
@@ -58,7 +62,7 @@ ARGV.each do |file|
     status = 1
   rescue Exception => ex
     $stderr.puts "#{parser.program_name}: #{file}: #{ex.class} #{ex.message}"
-    $stderr.puts ex.backtrace if options.verbose
+    options.verbose and $stderr.puts ex.backtrace
     status = 2
   end
 end

data/lib/file_discard.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'pathname'
+require 'fileutils'
 
 module FileDiscard
 
@@ -112,18 +113,23 @@ module FileDiscard
     def discard(obj, options = {})
       pn = pathname_for obj
       if pn.directory?
-        if SPECIAL_DIRS.include?(pn.basename.to_s)
+        SPECIAL_DIRS.include?(pn.basename.to_s) and
           raise Errno::EINVAL.new(SPECIAL_DIRS.join(' and ') << ' may not be removed')
-        end
         unless options[:recursive]
-          raise Errno::EISDIR.new(pn.to_s)    unless options[:directory]
-          raise Errno::ENOTEMPTY.new(pn.to_s) if pn.children.any?
+          options[:directory] or raise Errno::EISDIR.new(pn.to_s)
+          pn.children.any? and raise Errno::ENOTEMPTY.new(pn.to_s)
         end
       end
 
+      if options.key?(:force) && options[:force] > 1
+        $stderr.puts "Warning: Permanently removing #{pn}"
+        FileUtils.rm_rf(pn, {verbose: options[:verbose] || false})
+        return
+      end
+
       trash = find_trash_for pn
       unless trash.exist?
-        raise TrashMissing.new(trash.to_s) unless FileDiscard.create_trash_when_missing
+        FileDiscard.create_trash_when_missing or raise TrashMissing.new(trash.to_s)
         trash.mkpath
       end
 
@@ -163,13 +169,13 @@ module FileDiscard
       def move(src, dst, options)
         src = src.expand_path
         dst = uniquify(dst.join(src.basename))
-        puts "#{src} => #{dst}" if options[:verbose]
+        options[:verbose] and puts "#{src} => #{dst}"
         File.rename(src, dst)
-        yield(src, dst) if block_given?
+        block_given? and yield(src, dst)
       end
 
       def uniquify(pn)
-        return pn unless pn.exist?
+        pn.exist? or return pn
 
         dn   = pn.dirname
         ext  = pn.extname
@@ -180,7 +186,7 @@ module FileDiscard
         10.times do |i|
           ts = Time.now.strftime(fmt)
           pn = dn.join("#{base} #{ts}#{ext}")
-          return pn unless pn.exist?
+          pn.exist? or return pn
           fmt = bfmt + ".%#{i}N" # use fractional seconds, with increasing precision
         end
 
@@ -204,7 +210,9 @@ module FileDiscard
     private
       def move(*args)
         super do |src, dst|
-          dst.dirname.dirname.join('info',"#{dst.basename}.trashinfo").open('w') do |io|
+          infodir = dst.dirname.dirname.join('info')
+          infodir.directory? or infodir.mkpath
+          infodir.join("#{dst.basename}.trashinfo").open('w') do |io|
             io.write <<EOF
 [Trash Info]
 Path=#{src}

data/lib/file_discard_version.rb

@@ -1,6 +1,6 @@
 module FileDiscard
   # :nodoc:
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
   # :nodoc:
-  RELEASE = '72f0d7a:20141010011727'
+  RELEASE = '4441d85:20141102225117'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_discard
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Brad Robel-Forrest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies: []
 description: Simple helper to move files to the trash folder.
 email: brad+filediscard@gigglewax.com
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Move files to the trash.