fxn-unmac 0.4 → 0.5

data/README

@@ -14,6 +14,7 @@ Options:
   -r, --keep-dsstore               Do not delete ".DS_Store" files
   -d, --keep-apple-double          Do not delete "._*" ghost files
   -o, --keep-apple-double-orphans  Delete "._foo.txt" only if "foo.txt" exists
+  -i, --keep-custom-folder-icons   Delete custom folder icons
 
 Description:
   When a Mac copies files to volumes that have a different file system it adds
@@ -48,6 +49,8 @@ What's deleted:
     * 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.
+    
+    * If a folder has a custom icon you get a file Icon^M (that's a hard CR).
 
   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.

data/bin/unmac

@@ -22,6 +22,7 @@ Options:
   -r, --keep-dsstore               Do not delete ".DS_Store" files
   -d, --keep-apple-double          Do not delete "._*" ghost files
   -o, --keep-apple-double-orphans  Delete "._foo.txt" only if "foo.txt" exists
+  -i, --keep-custom-folder-icons   Delete custom folder icons
 
 Description:
   When a Mac copies files to volumes that have a different file system it adds
@@ -56,6 +57,8 @@ What's deleted:
     * 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.
+    
+    * If a folder has a custom icon you get a file Icon^M (that's a hard CR).
 
   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.
@@ -73,6 +76,7 @@ opts = GetoptLong.new(
   ['--keep-dsstore',              '-r', GetoptLong::NO_ARGUMENT],
   ['--keep-apple-double',         '-d', GetoptLong::NO_ARGUMENT],
   ['--keep-apple-double-orphans', '-o', GetoptLong::NO_ARGUMENT],
+  ['--keep-custom-folder-icons',  '-i', GetoptLong::NO_ARGUMENT],
   ['--test',                            GetoptLong::NO_ARGUMENT]
 )
 

data/lib/unmacer.rb

@@ -10,13 +10,15 @@ class Unmacer
                 :keep_macosx,
                 :keep_dsstore,
                 :keep_apple_double,
-                :keep_apple_double_orphans
+                :keep_apple_double_orphans,
+                :keep_custom_folder_icons
 
   SPOTLIGHT = '.Spotlight-V100'
   FSEVENTS  = '.fseventsd'
   TRASHES   = '.Trashes'
   MACOSX    = '__MACOSX'
   DSSTORE   = '.DS_Store'
+  ICON      = "Icon\cM"
 
   def initialize
     self.verbose                   = false
@@ -28,6 +30,7 @@ class Unmacer
     self.keep_dsstore              = false
     self.keep_apple_double         = false
     self.keep_apple_double_orphans = false
+    self.keep_custom_folder_icons  = false
   end
 
   def unmac!(dirnames)
@@ -65,6 +68,7 @@ private
     delete_macosx(dirname) unless keep_macosx
     delete_dsstore(dirname) unless keep_dsstore
     delete_apple_double(dirname) unless keep_apple_double
+    delete_custom_folder_icon(dirname) unless keep_custom_folder_icons
   end
 
   def delete(parent, file_or_directory)
@@ -149,4 +153,8 @@ private
       delete(dirname, basename)
     end
   end
+
+  def delete_custom_folder_icon(dirname)
+    delete(dirname, ICON)
+  end
 end

data/test/test_unmac.rb

@@ -25,6 +25,7 @@ class TestUnmac < Test::Unit::TestCase
     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
 
@@ -40,6 +41,7 @@ class TestUnmac < Test::Unit::TestCase
       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
@@ -56,6 +58,7 @@ class TestUnmac < Test::Unit::TestCase
       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
@@ -72,6 +75,7 @@ class TestUnmac < Test::Unit::TestCase
       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
@@ -88,6 +92,7 @@ class TestUnmac < Test::Unit::TestCase
       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
@@ -104,6 +109,7 @@ class TestUnmac < Test::Unit::TestCase
       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
@@ -120,6 +126,7 @@ class TestUnmac < Test::Unit::TestCase
       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
@@ -136,6 +143,7 @@ class TestUnmac < Test::Unit::TestCase
       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
@@ -152,6 +160,7 @@ class TestUnmac < Test::Unit::TestCase
       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
@@ -168,12 +177,30 @@ class TestUnmac < Test::Unit::TestCase
       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_custom_folder_icons
+    for opt in ['--keep-custom-folder-icons', '-i']
+      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 unmacer.keep_custom_folder_icons
       assert_equal %w(dummy), ARGV
     end
   end
 
   def test_mix_1
-    unmacer = call_unmac(*%w(-v -f -m -d dummy))
+    unmacer = call_unmac(*%w(-v -f -m -d -i dummy))
     assert unmacer.verbose
     assert !unmacer.pretend
     assert !unmacer.keep_spotlight
@@ -183,6 +210,7 @@ class TestUnmac < Test::Unit::TestCase
     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
 
@@ -197,6 +225,7 @@ class TestUnmac < Test::Unit::TestCase
     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
 

data/test/test_unmacer.rb

@@ -190,6 +190,19 @@ class TestUnmacer < Test::Unit::TestCase
     assert_equal %w(._foo.txt), read_struct
   end
 
+  def test_custom_folder_icons
+    create_struct([], Unmacer::ICON)
+    unmac!
+    assert read_struct.empty?
+  end
+
+  def test_keep_custom_folder_icons
+    create_struct([], Unmacer::ICON)
+    @unmacer.keep_custom_folder_icons = true
+    unmac!
+    assert_equal [Unmacer::ICON], read_struct
+  end
+
   def test_a_handful_of_files
     dummy  = 'dummy'
     dummy2 = File.join(dummy, 'dummy2')
@@ -208,6 +221,8 @@ class TestUnmacer < Test::Unit::TestCase
       File.join(dummy2, Unmacer::DSSTORE),
       File.join(dummy,  Unmacer::MACOSX),
       File.join(dummy2, Unmacer::MACOSX),
+      File.join(dummy,  Unmacer::ICON),
+      File.join(dummy2, Unmacer::ICON),
       'foo.txt',
       '._foo.txt',
       ghost,

data/unmac.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name              = 'unmac'
-  spec.version           = '0.4'
+  spec.version           = '0.5'
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fxn-unmac
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - Xavier Noria