fxn-unmac 0.2 → 0.3

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007 ASPgems S.L.
+Copyright (c) 2009 Xavier Noria
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -6,6 +6,7 @@ Usage:
 Options:
   -h, --help                       Print this help
   -v, --verbose                    Show processing
+  -p, --pretend                    Show what would be deleted, but don't do it
   -s, --keep-spotlight             Do not delete Spotlight data
   -f, --keep-fsevents              Do not delete Time Machine stuff
   -t, --keep-trashes               Do not delete volume trashes
@@ -29,7 +30,7 @@ Description:
 What's deleted:
   This is just a summary, for more detailed explanations and pointers see the
   comments in unmacer.rb:
-  
+
     * Spotlight leaves a folder called ".Spotlight-V100" in the root directory
       of volumes.
 
@@ -43,21 +44,21 @@ What's deleted:
 
     * Finder and Spotlight data related to each folder gets stored in an
       extra file called ".DS_Store".
-    
+
     * For each file "foo.txt", its resource fork and some additional stuff
       are stored in an accompaining ghost file called "._foo.txt". The pattern
       is to prepend "._" to the original file name.
-  
+
   Some stuff is only found in the root folder of volumes, unmac looks for them
   in any directory you pass as argument, but not on their subdirectories.
 
 Installation:
   unmac is distributed as a Ruby gem. Once you have Ruby and RubyGems installed
   execute
-  
+
     gem sources -a http://gems.github.com # you need this only once
     gem install fxn-unmac
-    
+
   This program is portable.
 
 License:

data/bin/unmac

@@ -14,6 +14,7 @@ Usage:
 Options:
   -h, --help                       Print this help
   -v, --verbose                    Show processing
+  -p, --pretend                    Show what would be deleted, but don't do it
   -s, --keep-spotlight             Do not delete Spotlight data
   -f, --keep-fsevents              Do not delete Time Machine stuff
   -t, --keep-trashes               Do not delete volume trashes
@@ -64,6 +65,7 @@ end
 opts = GetoptLong.new(
   ['--help',                      '-h', GetoptLong::NO_ARGUMENT],
   ['--verbose',                   '-v', GetoptLong::NO_ARGUMENT],
+  ['--pretend',                   '-p', GetoptLong::NO_ARGUMENT],
   ['--keep-spotlight',            '-s', GetoptLong::NO_ARGUMENT],
   ['--keep-fsevents',             '-f', GetoptLong::NO_ARGUMENT],
   ['--keep-trashes',              '-t', GetoptLong::NO_ARGUMENT],
@@ -83,6 +85,8 @@ begin
       usage and exit
     when '--verbose'
       unmacer.verbose = true
+    when '--pretend'
+      unmacer.pretend = true
     when /\A--(keep-.*)/
       flag = $1.gsub('-', '_')
       unmacer.send("#{flag}=", true)

data/lib/unmacer.rb

@@ -3,6 +3,7 @@ require 'find'
 
 class Unmacer
   attr_accessor :verbose,
+                :pretend,
                 :keep_spotlight,
                 :keep_fsevents,
                 :keep_trashes,
@@ -19,6 +20,7 @@ class Unmacer
 
   def initialize
     self.verbose                   = false
+    self.pretend                   = false
     self.keep_spotlight            = false
     self.keep_fsevents             = false
     self.keep_trashes              = false
@@ -67,11 +69,16 @@ private
 
   def delete(parent, file_or_directory)
     name = File.join(parent, file_or_directory)
-    FileUtils.rm_r(name)
-  rescue Errno::ENOENT
-    # it does not exist, fine.
-  else
-    puts "deleted #{name}" if verbose
+    if File.exists?(name)
+      if pretend
+        puts "would delete #{name}"
+      else
+        FileUtils.rm_r(name)
+        puts "deleted #{name}" if verbose
+      end
+    end
+  rescue Exception => e
+    $stderr.puts("could not delete #{name}: #{e.message}")
   end
 
   # Spotlight saves all its index-related files in the .Spotlight-V100 directory

data/test/test_unmac.rb

@@ -17,6 +17,7 @@ class TestUnmac < Test::Unit::TestCase
   def test_no_options
     unmacer = call_unmac('dummy')
     assert !unmacer.verbose
+    assert !unmacer.pretend
     assert !unmacer.keep_spotlight
     assert !unmacer.keep_fsevents
     assert !unmacer.keep_trashes
@@ -31,6 +32,23 @@ class TestUnmac < Test::Unit::TestCase
     for opt in ['--verbose', '-v']
       unmacer = call_unmac(opt, 'dummy')
       assert unmacer.verbose
+      assert !unmacer.pretend
+      assert !unmacer.keep_spotlight
+      assert !unmacer.keep_fsevents
+      assert !unmacer.keep_trashes
+      assert !unmacer.keep_macosx
+      assert !unmacer.keep_dsstore
+      assert !unmacer.keep_apple_double
+      assert !unmacer.keep_apple_double_orphans
+      assert_equal %w(dummy), ARGV
+    end
+  end
+
+  def test_pretend
+    for opt in ['--pretend', '-p']
+      unmacer = call_unmac(opt, 'dummy')
+      assert !unmacer.verbose
+      assert unmacer.pretend
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
@@ -46,6 +64,7 @@ class TestUnmac < Test::Unit::TestCase
     for opt in ['--keep-spotlight', '-s']
       unmacer = call_unmac(opt, 'dummy')
       assert !unmacer.verbose
+      assert !unmacer.pretend
       assert unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
@@ -61,6 +80,7 @@ class TestUnmac < Test::Unit::TestCase
     for opt in ['--keep-fsevents', '-f']
       unmacer = call_unmac(opt, 'dummy')
       assert !unmacer.verbose
+      assert !unmacer.pretend
       assert !unmacer.keep_spotlight
       assert unmacer.keep_fsevents
       assert !unmacer.keep_trashes
@@ -76,6 +96,7 @@ class TestUnmac < Test::Unit::TestCase
     for opt in ['--keep-trashes', '-t']
       unmacer = call_unmac(opt, 'dummy')
       assert !unmacer.verbose
+      assert !unmacer.pretend
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert unmacer.keep_trashes
@@ -91,6 +112,7 @@ class TestUnmac < Test::Unit::TestCase
     for opt in ['--keep-macosx', '-m']
       unmacer = call_unmac(opt, 'dummy')
       assert !unmacer.verbose
+      assert !unmacer.pretend
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
@@ -106,6 +128,7 @@ class TestUnmac < Test::Unit::TestCase
     for opt in ['--keep-dsstore', '-r']
       unmacer = call_unmac(opt, 'dummy')
       assert !unmacer.verbose
+      assert !unmacer.pretend
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
@@ -121,6 +144,7 @@ class TestUnmac < Test::Unit::TestCase
     for opt in ['--keep-apple-double', '-d']
       unmacer = call_unmac(opt, 'dummy')
       assert !unmacer.verbose
+      assert !unmacer.pretend
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
@@ -136,6 +160,7 @@ class TestUnmac < Test::Unit::TestCase
     for opt in ['--keep-apple-double-orphans', '-o']
       unmacer = call_unmac(opt, 'dummy')
       assert !unmacer.verbose
+      assert !unmacer.pretend
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
@@ -150,6 +175,7 @@ class TestUnmac < Test::Unit::TestCase
   def test_mix_1
     unmacer = call_unmac(*%w(-v -f -m -d dummy))
     assert unmacer.verbose
+    assert !unmacer.pretend
     assert !unmacer.keep_spotlight
     assert unmacer.keep_fsevents
     assert !unmacer.keep_trashes
@@ -163,6 +189,7 @@ class TestUnmac < Test::Unit::TestCase
   def test_mix_2
     unmacer = call_unmac(*%w(-s -t -r -o dummy))
     assert !unmacer.verbose
+    assert !unmacer.pretend
     assert unmacer.keep_spotlight
     assert !unmacer.keep_fsevents
     assert unmacer.keep_trashes
@@ -174,7 +201,7 @@ class TestUnmac < Test::Unit::TestCase
   end
 
   def test_help
-    buf = ""
+    buf = ''
     $> = StringIO.open(buf, 'w')
     call_unmac('-h')
     $> = $stdout

data/test/test_unmacer.rb

@@ -1,5 +1,6 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
+require 'stringio'
 require 'fileutils'
 require 'set'
 require 'unmacer'
@@ -54,6 +55,22 @@ class TestUnmacer < Test::Unit::TestCase
     assert read_struct.empty?
   end
 
+  def test_pretend
+    dirs = [Unmacer::SPOTLIGHT, Unmacer::FSEVENTS, Unmacer::TRASHES, Unmacer::MACOSX]
+    create_struct(dirs, '._dummy')
+    buf = ''
+    $> = StringIO.new(buf, 'w')
+    @unmacer.pretend = true
+    unmac!
+    $> = $stdout
+    assert Set.new(dirs + ['._dummy']), Set.new(read_struct)
+    assert_match /^would delete.*\.Spotlight/, buf
+    assert_match /^would delete.*\.fsevents/, buf
+    assert_match /^would delete.*\.Trashes/, buf
+    assert_match /^would delete.*__MACOSX/, buf
+    assert_match /^would delete.*\._dummy/, buf
+  end
+
   def test_spotlight
     create_struct(Unmacer::SPOTLIGHT)
     unmac!

data/unmac.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name              = 'unmac'
-  spec.version           = '0.2'
+  spec.version           = '0.3'
   spec.summary           = 'Delete spurious Mac files under a directory or volume'
   spec.homepage          = 'http://github.com/fxn/unmac/tree/master'
   spec.executables       = %w(unmac)
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.test_files = %w(
     test/test_unmacer.rb
-    test/test_unmac.rb    
+    test/test_unmac.rb
   )
 
   spec.files = %w(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fxn-unmac
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Xavier Noria