file_discard 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80106d989c491a8d79a5b2f6eca34d4a73a12bd1
-  data.tar.gz: 262dc75d7c97871b948ea70064df0f0021f07dcc
+  metadata.gz: baf2cacff4155deb6ead06ec337cd3cbade7b4ab
+  data.tar.gz: e1cf01705708d7ad0d526191288874b705f00066
 SHA512:
-  metadata.gz: e4370a3a0c0228c31b4f402224a1d3edf5d1918f4ee5c502ba6983fefc4bd27abf2e9c8c897f27310713229c4e1f1cbeda65ed2e5c127c4d2334f20550cb0bfb
-  data.tar.gz: 1f84dc4c065f51175c48332aacc3976b29a40c0db72f331bc79498ab6ae2dfcf1cb68aa1f1f94caa3ee54d42feabe59c81964e00eff2fda8af8d406141fd84a3
+  metadata.gz: f769d69f5ccea663f6e6df22b1dc15a7f6f7851ba9fed5880462f0f9805bc09fd57fa0d4d1973220223e951bb5d1c7b85677435031c83a7a43efa83c4d053aa3
+  data.tar.gz: 336a23836b05be91779c45265b535c71fd8d5cb25eff795fa5283910d11854dbbe56b6bb1e6745a074ca6d7e181c0608a5b0a1543e1531419af673d7e9044fe3

data/Rakefile

@@ -8,13 +8,13 @@ task default: :test
 task spec: :test
 task build: :package
 
-PKG_VERSION = '0.1.3'
+PKG_VERSION = '0.1.4'
 NOW = Time.now.utc
 
 # delay updating the version file unless building the gem or package
 VER_FN = 'lib/file_discard_version.rb'
 task :update_version do
-  File.open(VER_FN,'w') do |f|
+  File.open(VER_FN,'w',0644) do |f|
     f.puts <<EOF
 module FileDiscard
   # :nodoc:

data/bin/discard

@@ -2,7 +2,7 @@
 
 require 'optparse'
 require 'ostruct'
-require 'file_discard'
+require_relative '../lib/file_discard'
 
 options = OpenStruct.new
 parser  = OptionParser.new do |opts|
@@ -47,6 +47,8 @@ if ARGV.size < 1
   exit 64 # use same exit status as rm with no files
 end
 
+FileDiscard.create_trash_when_missing = true
+
 status = 0
 ARGV.each do |file|
   begin

data/lib/file_discard.rb

@@ -21,7 +21,6 @@
 # SOFTWARE.
 
 require 'pathname'
-require 'fileutils'
 
 module FileDiscard
 
@@ -139,8 +138,14 @@ module FileDiscard
       end
 
       def find_trash_for(pn)
-        pd = pn.expand_path.realpath.dirname
-        mp = mountpoint_of pd
+        pn_path = pn.expand_path
+        if pn_path.symlink?
+          # Use the containing directory's real path for symbolic links, not the target of the link
+          pd = pn_path.dirname.realpath
+        else
+          pd = pn_path.realpath.dirname
+        end
+        mp = mountpoint_of(pd)
         return @home_trash if mp == @home_mountpoint
         mp.join(@mountpoint_trash_fmt % Process.uid)
       end
@@ -158,8 +163,9 @@ module FileDiscard
       def move(src, dst, options)
         src = src.expand_path
         dst = uniquify(dst.join(src.basename))
-        FileUtils.mv src, dst, options
-        yield src, dst if block_given?
+        puts "#{src} => #{dst}" if options[:verbose]
+        File.rename(src, dst)
+        yield(src, dst) if block_given?
       end
 
       def uniquify(pn)

data/lib/file_discard_version.rb

@@ -1,6 +1,6 @@
 module FileDiscard
   # :nodoc:
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
   # :nodoc:
-  RELEASE = '168a436:20140607032530'
+  RELEASE = '72f0d7a:20141010011727'
 end

data/spec/file_discard_spec.rb

@@ -16,19 +16,29 @@ load File.expand_path(File.join(File.dirname(__FILE__),'..','lib','file_discard.
 describe FileDiscard do
 
   describe :Discarder do
-    before do
-      @base = Pathname.new(Dir.mktmpdir(File.basename(__FILE__,'.rb') + '_'))
-      @home = @base.join('home')
-      @home.mkdir
-      @home_trash = '.Trash'
+    let(:base) { Pathname.new(Dir.mktmpdir(File.basename(__FILE__,'.rb') + '_')) }
+    let(:home) do
+      h = base.join('home')
+      h.mkdir
+      h
+    end
+
+    let(:home_trash) { '.Trash' }
+    let(:trash) do
+      t = home.join(home_trash)
+      t.mkdir
+      t
+    end
+
+    let(:discarder) { FileDiscard::OsxDiscarder.new(home) }
 
-      @discarder = FileDiscard::OsxDiscarder.new(@home)
-      FileDiscard.discarder = @discarder
+    before do
+      FileDiscard.discarder = discarder
       FileDiscard.create_trash_when_missing = false
     end
 
     after do
-      @base.rmtree if @base && @base.exist?
+      base.rmtree
     end
 
     it 'should not allow removal of special directories' do
@@ -49,35 +59,34 @@ describe FileDiscard do
       end
 
       it 'should fail without trash' do
-        f = File.new(@base.join('file.txt').to_s, 'w')
+        f = File.new(base.join('file.txt').to_s, 'w')
         ->{ f.discard }.must_raise FileDiscard::TrashMissing
       end
 
       it 'should support creating missing trash' do
         FileDiscard.create_trash_when_missing = true
-        f = File.new(@base.join('file.txt').to_s, 'w')
+        f = File.new(base.join('file.txt').to_s, 'w')
         f.discard
       end
 
       describe 'with trash in the home' do
-        before do
-          @trash = @home.join(@home_trash)
-          @trash.mkdir
+        def sorted_trash
+          trash.children(false).collect(&:to_s).sort
         end
 
-        def sorted_trash
-          @trash.children(false).collect(&:to_s).sort
+        before do
+          trash # ensure trash is created, but as late as possible for let-overrides
         end
 
         it 'should conditionally allow removal of empty directories' do
-          d = @base.join('foozy')
+          d = base.join('foozy')
           d.mkdir
           ->{ FileDiscard.discard(d) }.must_raise Errno::EISDIR
           FileDiscard.discard(d, directory: true)
         end
 
         it 'should conditionally allow removal of non-empty directories' do
-          d = @base.join('foozy')
+          d = base.join('foozy')
           d.mkdir
           f = d.join('stuff.txt')
           f.open('w') {|io| io.puts 'stuff'}
@@ -86,18 +95,44 @@ describe FileDiscard do
         end
 
         it 'should discard a file' do
-          f = File.new(@base.join('file.txt').to_s, 'w')
+          f = File.new(base.join('file.txt').to_s, 'w')
           f.discard
           sorted_trash.must_equal ['file.txt']
         end
 
         it 'should discard a pathname' do
-          f = @base.join('file.txt')
+          f = base.join('file.txt')
           f.open('w') {|io| io.puts 'nothing'}
           f.discard
           sorted_trash.must_equal ['file.txt']
         end
 
+        describe 'with a symbolic links' do
+          let(:target) do
+            t = base.join('target')
+            t.open('w') {|io| io.puts 'nothing'}
+            t
+          end
+
+          let(:file) do
+            f = home.join('pointer')
+            f.make_symlink(target)
+            f
+          end
+
+          it 'should leave the target untouched' do
+            file.discard
+            sorted_trash.must_equal ['pointer']
+            target.exist?.must_equal true
+          end
+
+          it 'should not fail when target is missing' do
+            target.unlink
+            file.discard
+            sorted_trash.must_equal ['pointer']
+          end
+        end
+
         describe 'with control over time' do
           before do
             # replace Time's strftime which FileDiscard relies on for uniquify
@@ -120,10 +155,10 @@ describe FileDiscard do
           end
 
           it 'should not overwite other trashed files' do
-            f = @trash.join('file.txt')
+            f = trash.join('file.txt')
             f.open('w') {|io| io.puts 'nothing'}
 
-            f = @base.join('file.txt')
+            f = base.join('file.txt')
             f.open('w') {|io| io.puts 'nothing'}
             FileDiscard.discard(f.to_s)
             sorted_trash.must_equal ['file 9.8.1.txt','file.txt']
@@ -131,11 +166,11 @@ describe FileDiscard do
 
           it 'should use increasing precision for collisions' do
             3.times do |i|
-              f = @trash.join(%{file#{i == 0 ? '' : " 9.8.#{i}"}.txt})
+              f = trash.join(%{file#{i == 0 ? '' : " 9.8.#{i}"}.txt})
               f.open('w') {|io| io.puts 'nothing'}
             end
 
-            f = @base.join('file.txt')
+            f = base.join('file.txt')
             f.open('w') {|io| io.puts 'nothing'}
             File.discard(f.to_s)
             sorted_trash
@@ -151,15 +186,11 @@ describe FileDiscard do
             end
           end
 
-          before do
-            @trash = @base.join('mytrash-%s' % Process.uid)
-            @trash.mkdir
-            @discarder = MyDiscarder.new(@home, 'mytrash', 'mytrash-%s')
-            FileDiscard.discarder = @discarder
-          end
+          let(:home_trash) { base.join('mytrash-%s' % Process.uid) }
+          let(:discarder)  { MyDiscarder.new(home, 'mytrash', 'mytrash-%s') }
 
           it 'should not use the home trash' do
-            f = @base.join('file.txt')
+            f = base.join('file.txt')
             f.open('w') {|io| io.puts 'nothing'}
             f.discard
             sorted_trash.must_equal ['file.txt']

metadata

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