unmac 0.8 → 0.9

data/Rakefile

@@ -1,9 +1,10 @@
-task :default => [:test]
+require 'rake/testtask'
 
-task :test do
-  Dir['test/test_*.rb'].each do |test|
-    ruby "-Ilib #{test}"
-  end
+task :default => :test
+
+Rake::TestTask.new do |t|
+  t.test_files = Dir.glob('test/test_*.rb')
+  t.verbose = true
 end
 
 task :home do

data/bin/unmac

@@ -18,6 +18,8 @@ Options:
   -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
+  -c, --keep-document-revisions    Do not delete document revisions
+  -b, --keep-mobile-backups        Do not delete mobile backups
   -m, --keep-macosx                Do not delete "__MACOSX" directories
   -r, --keep-dsstore               Do not delete ".DS_Store" files
   -d, --keep-apple-double          Do not delete "._*" ghost files
@@ -49,6 +51,10 @@ What's deleted:
     * A folder called "#{Unmacer::TRASHES}" in the root directory of volumes stores their
       trashes. Those ones are taken into account by the Trash in the Dock.
 
+    * Document revisions are stored in the /.DocumentRevisions-V100 folder. (New in Lion.)
+
+    * Mobile backups are stored in the /.MobileBackups folder. (New in Lion.)
+
     * Some archivers create auxiliary directories called "#{Unmacer::MACOSX}".
 
     * Finder and Spotlight data related to each folder gets stored in an
@@ -72,6 +78,8 @@ opts = GetoptLong.new(
   ['--keep-spotlight',            '-s', GetoptLong::NO_ARGUMENT],
   ['--keep-fsevents',             '-f', GetoptLong::NO_ARGUMENT],
   ['--keep-trashes',              '-t', GetoptLong::NO_ARGUMENT],
+  ['--keep-document-revisions',   '-c', GetoptLong::NO_ARGUMENT],
+  ['--keep-mobile-backups',       '-b', GetoptLong::NO_ARGUMENT],
   ['--keep-macosx',               '-m', GetoptLong::NO_ARGUMENT],
   ['--keep-dsstore',              '-r', GetoptLong::NO_ARGUMENT],
   ['--keep-apple-double',         '-d', GetoptLong::NO_ARGUMENT],

data/lib/unmacer.rb

@@ -7,6 +7,8 @@ class Unmacer
                 :keep_spotlight,
                 :keep_fsevents,
                 :keep_trashes,
+                :keep_document_revisions,
+                :keep_mobile_backups,
                 :keep_macosx,
                 :keep_dsstore,
                 :keep_apple_double,
@@ -16,6 +18,8 @@ class Unmacer
   SPOTLIGHT = '.Spotlight-V100'
   FSEVENTS  = '.fseventsd'
   TRASHES   = '.Trashes'
+  REVISIONS = '.DocumentRevisions-V100'
+  MBACKUPS  = '.MobileBackups'
   MACOSX    = '__MACOSX'
   DSSTORE   = '.DS_Store'
   ICON      = "Icon\cM"
@@ -26,6 +30,8 @@ class Unmacer
     self.keep_spotlight            = false
     self.keep_fsevents             = false
     self.keep_trashes              = false
+    self.keep_document_revisions   = false
+    self.keep_mobile_backups       = false
     self.keep_macosx               = false
     self.keep_dsstore              = false
     self.keep_apple_double         = false
@@ -62,6 +68,8 @@ private
     delete_spotlight(dirname) unless keep_spotlight
     delete_fsevents(dirname) unless keep_fsevents
     delete_trashes(dirname) unless keep_trashes
+    delete_document_revisions(dirname) unless keep_document_revisions
+    delete_mobile_backups(dirname) unless keep_mobile_backups
   end
 
   def unmac_folder(dirname)
@@ -112,6 +120,21 @@ private
     delete(dirname, TRASHES)
   end
 
+  # Document revisions are stored in the /.DocumentRevisions-V100 folder, within
+  # SQLite databases. (New in Lion.)
+  #
+  # See http://arstechnica.com/apple/reviews/2011/07/mac-os-x-10-7.ars/14#versioning-internals.
+  def delete_document_revisions(dirname)
+    delete(dirname, REVISIONS)
+  end
+
+  # Mobile backups are stored in the /.MobileBackups folder. (New in Lion.)
+  #
+  # See http://arstechnica.com/apple/reviews/2011/07/mac-os-x-10-7.ars/18#mobile-time-machine.
+  def delete_mobile_backups(dirname)
+    delete(dirname, MBACKUPS)
+  end
+
   # Apple's builtin Zip archiver stores some metadata in a directory called
   # "__MACOSX".
   #

data/test/test_unmac.rb

@@ -1,11 +1,9 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'stringio'
 require 'unmacer'
 require 'test/unit'
 
-UNMAC_RB    = File.join(File.dirname(__FILE__), '..', 'bin', 'unmac')
-UNMAC_SRC   = File.open(UNMAC_RB) { |f| f.read }
+UNMAC_RB  = File.join(File.dirname(__FILE__), '..', 'bin', 'unmac')
+UNMAC_SRC = File.open(UNMAC_RB) { |f| f.read }
 
 class TestUnmac < Test::Unit::TestCase
   def call_unmac(*args)
@@ -21,6 +19,8 @@ class TestUnmac < Test::Unit::TestCase
     assert !unmacer.keep_spotlight
     assert !unmacer.keep_fsevents
     assert !unmacer.keep_trashes
+    assert !unmacer.keep_document_revisions
+    assert !unmacer.keep_mobile_backups
     assert !unmacer.keep_macosx
     assert !unmacer.keep_dsstore
     assert !unmacer.keep_apple_double
@@ -37,6 +37,8 @@ class TestUnmac < Test::Unit::TestCase
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
+      assert !unmacer.keep_document_revisions
+      assert !unmacer.keep_mobile_backups
       assert !unmacer.keep_macosx
       assert !unmacer.keep_dsstore
       assert !unmacer.keep_apple_double
@@ -54,6 +56,8 @@ class TestUnmac < Test::Unit::TestCase
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
+      assert !unmacer.keep_document_revisions
+      assert !unmacer.keep_mobile_backups
       assert !unmacer.keep_macosx
       assert !unmacer.keep_dsstore
       assert !unmacer.keep_apple_double
@@ -71,6 +75,8 @@ class TestUnmac < Test::Unit::TestCase
       assert unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
+      assert !unmacer.keep_document_revisions
+      assert !unmacer.keep_mobile_backups
       assert !unmacer.keep_macosx
       assert !unmacer.keep_dsstore
       assert !unmacer.keep_apple_double
@@ -88,6 +94,8 @@ class TestUnmac < Test::Unit::TestCase
       assert !unmacer.keep_spotlight
       assert unmacer.keep_fsevents
       assert !unmacer.keep_trashes
+      assert !unmacer.keep_document_revisions
+      assert !unmacer.keep_mobile_backups
       assert !unmacer.keep_macosx
       assert !unmacer.keep_dsstore
       assert !unmacer.keep_apple_double
@@ -105,6 +113,27 @@ class TestUnmac < Test::Unit::TestCase
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert unmacer.keep_trashes
+      assert !unmacer.keep_document_revisions
+      assert !unmacer.keep_mobile_backups
+      assert !unmacer.keep_macosx
+      assert !unmacer.keep_dsstore
+      assert !unmacer.keep_apple_double
+      assert !unmacer.keep_apple_double_orphans
+      assert !unmacer.keep_custom_folder_icons
+      assert_equal %w(dummy), ARGV
+    end
+  end
+
+  def test_document_revisions
+    for opt in ['--keep-document-revisions', '-c']
+      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_document_revisions
+      assert !unmacer.keep_mobile_backups
       assert !unmacer.keep_macosx
       assert !unmacer.keep_dsstore
       assert !unmacer.keep_apple_double
@@ -122,6 +151,8 @@ class TestUnmac < Test::Unit::TestCase
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
+      assert !unmacer.keep_document_revisions
+      assert !unmacer.keep_mobile_backups
       assert unmacer.keep_macosx
       assert !unmacer.keep_dsstore
       assert !unmacer.keep_apple_double
@@ -139,6 +170,8 @@ class TestUnmac < Test::Unit::TestCase
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
+      assert !unmacer.keep_document_revisions
+      assert !unmacer.keep_mobile_backups
       assert !unmacer.keep_macosx
       assert unmacer.keep_dsstore
       assert !unmacer.keep_apple_double
@@ -156,6 +189,8 @@ class TestUnmac < Test::Unit::TestCase
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
+      assert !unmacer.keep_document_revisions
+      assert !unmacer.keep_mobile_backups
       assert !unmacer.keep_macosx
       assert !unmacer.keep_dsstore
       assert unmacer.keep_apple_double
@@ -173,6 +208,8 @@ class TestUnmac < Test::Unit::TestCase
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
+      assert !unmacer.keep_document_revisions
+      assert !unmacer.keep_mobile_backups
       assert !unmacer.keep_macosx
       assert !unmacer.keep_dsstore
       assert !unmacer.keep_apple_double
@@ -190,6 +227,8 @@ class TestUnmac < Test::Unit::TestCase
       assert !unmacer.keep_spotlight
       assert !unmacer.keep_fsevents
       assert !unmacer.keep_trashes
+      assert !unmacer.keep_document_revisions
+      assert !unmacer.keep_mobile_backups
       assert !unmacer.keep_macosx
       assert !unmacer.keep_dsstore
       assert !unmacer.keep_apple_double
@@ -206,6 +245,8 @@ class TestUnmac < Test::Unit::TestCase
     assert !unmacer.keep_spotlight
     assert unmacer.keep_fsevents
     assert !unmacer.keep_trashes
+    assert !unmacer.keep_document_revisions
+    assert !unmacer.keep_mobile_backups
     assert unmacer.keep_macosx
     assert !unmacer.keep_dsstore
     assert unmacer.keep_apple_double
@@ -221,6 +262,8 @@ class TestUnmac < Test::Unit::TestCase
     assert unmacer.keep_spotlight
     assert !unmacer.keep_fsevents
     assert unmacer.keep_trashes
+    assert !unmacer.keep_document_revisions
+    assert !unmacer.keep_mobile_backups
     assert !unmacer.keep_macosx
     assert unmacer.keep_dsstore
     assert !unmacer.keep_apple_double
@@ -234,8 +277,8 @@ class TestUnmac < Test::Unit::TestCase
     $> = StringIO.open(buf, 'w')
     call_unmac('-h')
     $> = $stdout
-    assert_match /^unmac\b/, buf
-    assert_match /^Usage\b/, buf
+    assert_match %r{^unmac\b}, buf
+    assert_match %r{^Usage\b}, buf
     assert ARGV.empty?
   end
 end

data/test/test_unmacer.rb

@@ -1,5 +1,3 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'stringio'
 require 'fileutils'
 require 'set'
@@ -64,11 +62,11 @@ class TestUnmacer < Test::Unit::TestCase
     unmac!
     $> = $stdout
     assert_equal 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
+    assert_match %r{^would delete.*\.Spotlight}, buf
+    assert_match %r{^would delete.*\.fsevents}, buf
+    assert_match %r{^would delete.*\.Trashes}, buf
+    assert_match %r{^would delete.*__MACOSX}, buf
+    assert_match %r{^would delete.*\._dummy}, buf
   end
 
   def test_spotlight
@@ -117,6 +115,18 @@ class TestUnmacer < Test::Unit::TestCase
     assert read_struct.empty?
   end
 
+  def test_document_revisions
+    create_struct(Unmacer::REVISIONS)
+    unmac!
+    assert read_struct.empty?
+  end
+
+  def test_mobile_backups
+    create_struct(Unmacer::MBACKUPS)
+    unmac!
+    assert read_struct.empty?
+  end
+
   def test_trashes_ignored_if_not_in_root
     fake = File.join('dummy', Unmacer::TRASHES)
     create_struct(fake)

data/unmac.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name              = 'unmac'
-  spec.version           = '0.8'
+  spec.version           = '0.9'
   spec.summary           = 'Delete spurious Mac files under a directory or volume'
   spec.homepage          = 'http://github.com/fxn/unmac/tree/master'
   spec.executables       = %w(unmac)

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: unmac
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
-  - 8
-  version: "0.8"
+  - 9
+  version: "0.9"
 platform: ruby
 authors: 
 - Xavier Noria
@@ -13,8 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +02:00
-default_executable: 
+date: 2011-08-11 00:00:00 Z
 dependencies: []
 
 description: 
@@ -34,7 +34,6 @@ files:
 - lib/unmacer.rb
 - test/test_unmacer.rb
 - test/test_unmac.rb
-has_rdoc: true
 homepage: http://github.com/fxn/unmac/tree/master
 licenses: []
 
@@ -48,6 +47,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -56,13 +56,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: unmac
-rubygems_version: 1.3.7
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Delete spurious Mac files under a directory or volume