Merge pull request #6245 from rolandwalker/mass_change_uninstall_delete

Mass Cask change to use `uninstall :delete`

Casks/adium.rb

@@ -7,8 +7,8 @@ class Adium < Cask
   homepage 'https://www.adium.im/'
 
   app 'Adium.app'
-  zap :files => [
-                 '~/Library/Application Support/Adium 2.0',
-                 '~/Library/Preferences/com.adiumX.adiumX.plist',
-                ]
+  zap :delete => [
+                  '~/Library/Application Support/Adium 2.0',
+                  '~/Library/Preferences/com.adiumX.adiumX.plist',
+                 ]
 end

Casks/adobe-photoshop-lightroom.rb

@@ -8,5 +8,5 @@ class AdobePhotoshopLightroom < Cask
   pkg 'Adobe Photoshop Lightroom 5.pkg'
   uninstall :pkgutil => 'com.adobe.Lightroom5',
             :quit => 'com.adobe.Lightroom5',
-            :files => '/Applications/Adobe Photoshop Lightroom 5.app'
+            :delete => '/Applications/Adobe Photoshop Lightroom 5.app'
 end

Casks/atom.rb

@@ -11,14 +11,14 @@ class Atom < Cask
   postflight do
     system '/usr/bin/defaults', 'write', 'com.github.atom', 'moveToApplicationsFolderAlertSuppress', '-bool', 'true'
   end
-  zap :files => [
-                 '~/Library/Preferences/com.github.atom.plist',
-                 '~/.atom/config.cson',
-                 '~/.atom/init.coffee',
-                 '~/.atom/keymap.cson',
-                 '~/.atom/keymaps',
-                 '~/.atom/packages',
-                 '~/.atom/snippets.cson',
-                 '~/.atom/styles.less',
-                ]
+  zap :delete => [
+                  '~/Library/Preferences/com.github.atom.plist',
+                  '~/.atom/config.cson',
+                  '~/.atom/init.coffee',
+                  '~/.atom/keymap.cson',
+                  '~/.atom/keymaps',
+                  '~/.atom/packages',
+                  '~/.atom/snippets.cson',
+                  '~/.atom/styles.less',
+                 ]
 end

Casks/authbuddy.rb

@@ -6,7 +6,7 @@ class Authbuddy < Cask
   homepage 'https://www.dssw.co.uk/authbuddy'
 
   pkg 'DssW authbuddy.pkg'
-  uninstall :files => '/usr/local/bin/authbuddy'
+  uninstall :delete => '/usr/local/bin/authbuddy'
   caveats do
     files_in_usr_local
   end

Casks/authoxy.rb

@@ -7,6 +7,6 @@ class Authoxy < Cask
 
   pkg 'Authoxy (double click me).pkg'
   uninstall :pkgutil => 'net.hrsoftworks.authoxy.*',
-            :files   => '/tmp/authoxyd.pid'
-  zap       :files   => '~/Library/Preferences/net.hrsoftworks.AuthoxyPref.plist'
+            :delete  => '/tmp/authoxyd.pid'
+  zap       :delete   => '~/Library/Preferences/net.hrsoftworks.AuthoxyPref.plist'
 end

Casks/awareness.rb

@@ -6,5 +6,5 @@ class Awareness < Cask
   homepage 'http://iamfutureproof.com/tools/awareness/'
 
   app 'Awareness.app'
-  zap :files => '~/Library/Preferences/com.futureproof.awareness.plist'
+  zap :delete => '~/Library/Preferences/com.futureproof.awareness.plist'
 end

Casks/baiduinput.rb

@@ -8,5 +8,5 @@ class Baiduinput < Cask
 
   pkg '安装百度输入法.pkg'
   uninstall :pkgutil  => 'com.baidu.inputmethod.*',
-            :files    => '/Library/Input Methods/BaiduIM.app'
+            :delete   => '/Library/Input Methods/BaiduIM.app'
 end

Casks/bartender.rb

@@ -12,5 +12,5 @@ class Bartender < Cask
     # Don't ask to move the app bundle to /Applications
     system '/usr/bin/defaults', 'write', 'com.surteesstudios.Bartender', 'moveToApplicationsFolderAlertSuppress', '-bool', 'true'
   end
-  zap :files => '~/Library/Preferences/com.surteesstudios.Bartender.plist'
+  zap :delete => '~/Library/Preferences/com.surteesstudios.Bartender.plist'
 end

Casks/bettertouchtool.rb

@@ -7,8 +7,8 @@ class Bettertouchtool < Cask
   homepage 'http://blog.boastr.net/'
 
   app 'BetterTouchTool.app'
-  zap :files => [
-                 '~/Library/Preferences/com.hegenberg.BetterTouchTool.plist',
-                 '~/Library/Application Support/BetterTouchTool',
-                ]
+  zap :delete => [
+                  '~/Library/Preferences/com.hegenberg.BetterTouchTool.plist',
+                  '~/Library/Application Support/BetterTouchTool',
+                 ]
 end

Casks/bibdesk.rb

@@ -7,8 +7,8 @@ class Bibdesk < Cask
   homepage 'http://bibdesk.sourceforge.net/'
 
   app 'BibDesk.app'
-  zap :files => [
-                 '~/Library/Preferences/edu.ucsd.cs.mmccrack.bibdesk.plist',
-                 '~/Library/Application Support/BibDesk',
-                ]
+  zap :delete => [
+                  '~/Library/Preferences/edu.ucsd.cs.mmccrack.bibdesk.plist',
+                  '~/Library/Application Support/BibDesk',
+                 ]
 end

Casks/brackets.rb

@@ -6,8 +6,8 @@ class Brackets < Cask
   homepage 'http://brackets.io'
 
   app 'Brackets.app'
-  zap :files => [
-                 '~/Library/Application Support/Brackets',
-                 '~/Library/Preferences/io.brackets.appshell.plist',
-                ]
+  zap :delete => [
+                  '~/Library/Application Support/Brackets',
+                  '~/Library/Preferences/io.brackets.appshell.plist',
+                 ]
 end

Casks/brytonbridge.rb

@@ -8,6 +8,6 @@ class Brytonbridge < Cask
   pkg 'BrytonBridge2.pkg'
   uninstall :pkgutil => 'com.brytonsport.pkg.BrytonBridge2',
             :quit    => 'com.yourcompany.BrytonBridge',
-            :files   => '/Applications/BrytonBridge2'
-  zap       :files   => '~/Library/Saved Application State/com.yourcompany.BrytonBridge.savedState'
+            :delete  => '/Applications/BrytonBridge2'
+  zap       :delete   => '~/Library/Saved Application State/com.yourcompany.BrytonBridge.savedState'
 end

Casks/caffeine.rb

@@ -6,5 +6,5 @@ class Caffeine < Cask
   homepage 'http://lightheadsw.com/caffeine/'
 
   app 'Caffeine.app'
-  zap :files => '~/Library/Preferences/com.lightheadsw.Caffeine.plist'
+  zap :delete => '~/Library/Preferences/com.lightheadsw.Caffeine.plist'
 end

Casks/carlson-minot.rb

@@ -7,7 +7,7 @@ class CarlsonMinot < Cask
 
   pkg 'arm-2013.05-24-arm-none-linux-gnueabi.osx.intelx86.bin.pkg'
   uninstall :pkgutil => 'com.carlson-minot.arm-2013.05-24-arm-none-linux-gnueabi.pkg',
-            :files   => '/usr/local/carlson-minot'
+            :delete  => '/usr/local/carlson-minot'
   caveats do
     files_in_usr_local
   end

Casks/charles.rb

@@ -6,8 +6,8 @@ class Charles < Cask
   homepage 'http://www.charlesproxy.com/'
 
   app 'Charles.app'
-  zap :files => [
-                 '~/Library/Application Support/Charles',
-                 '~/Library/Preferences/com.xk72.charles.config',
-                ]
+  zap :delete => [
+                  '~/Library/Application Support/Charles',
+                  '~/Library/Preferences/com.xk72.charles.config',
+                 ]
 end

Casks/chefdk.rb

@@ -7,7 +7,7 @@ class Chefdk < Cask
 
   pkg "chefdk-#{version}.pkg"
   uninstall :pkgutil => 'com.getchef.pkg.chefdk',
-            :files   => [
+            :delete  => [
                          '/opt/chefdk/',
                          '/usr/bin/berks',
                          '/usr/bin/chef',
@@ -24,6 +24,6 @@ class Chefdk < Cask
                          '/usr/bin/rubocop',
                          '/usr/bin/shef',
                          '/usr/bin/strain',
-                         '/usr/bin/strainer'
+                         '/usr/bin/strainer',
                         ]
 end

Casks/chicken.rb

@@ -7,5 +7,5 @@ class Chicken < Cask
   homepage 'http://sourceforge.net/projects/chicken/'
 
   app 'Chicken.app'
-  zap :files => '~/Library/Preferences/net.sourceforge.chicken.plist'
+  zap :delete => '~/Library/Preferences/net.sourceforge.chicken.plist'
 end

Casks/clementine.rb

@@ -7,5 +7,5 @@ class Clementine < Cask
   homepage 'http://www.clementine-player.org/'
 
   app 'clementine.app'
-  zap :files => '~/Library/Preferences/org.clementine-player.Clementine.plist'
+  zap :delete => '~/Library/Preferences/org.clementine-player.Clementine.plist'
 end

Casks/clipmenu.rb

@@ -7,8 +7,8 @@ class Clipmenu < Cask
   homepage 'http://www.clipmenu.com/'
 
   app 'ClipMenu.app'
-  zap :files => [
-                 '~/Library/Application Support/ClipMenu',
-                 '~/Library/Preferences/com.naotaka.ClipMenu.plist',
-                ]
+  zap :delete => [
+                  '~/Library/Application Support/ClipMenu',
+                  '~/Library/Preferences/com.naotaka.ClipMenu.plist',
+                 ]
 end

Casks/cloud.rb

@@ -6,5 +6,5 @@ class Cloud < Cask
   homepage 'http://getcloudapp.com/'
 
   app 'Cloud.app'
-  zap :files => '~/Library/Preferences/com.linebreak.CloudAppMacOSX.plist'
+  zap :delete => '~/Library/Preferences/com.linebreak.CloudAppMacOSX.plist'
 end

Casks/cocoaspell.rb

@@ -7,15 +7,15 @@ class Cocoaspell < Cask
 
   pkg 'cocoAspell.pkg'
   uninstall :pkgutil => 'net.leuski.cocoaspell.*',
-            :files   => [
+            :delete  => [
                          '/Application Support/cocoAspell/aspell6-en-6.0-0',
-                         '/Library/PreferencePanes/Spelling.prefPane'
+                         '/Library/PreferencePanes/Spelling.prefPane',
                         ]
   caveats <<-EOS.undent
     Non-English dictionaries must be installed separately.  For more information,
     see http://people.ict.usc.edu/~leuski/cocoaspell/install_dict.php .
     EOS
-  zap :files => [
+  zap :delete => [
                  '~/.aspell.conf',
                  '~/.aspell.en.prepl',
                  # Debatable. The Pws holds user-created content, though typically

Casks/coda.rb

@@ -7,8 +7,8 @@ class Coda < Cask
   homepage 'https://panic.com/Coda/'
 
   app 'Coda 2.app'
-  zap :files => [
-                 '~/Library/Application Support/Coda 2',
-                 '~/Library/Preferences/com.panic.Coda2.plist',
-                ]
+  zap :delete => [
+                  '~/Library/Application Support/Coda 2',
+                  '~/Library/Preferences/com.panic.Coda2.plist',
+                 ]
 end

Casks/colloquy.rb

@@ -7,8 +7,8 @@ class Colloquy < Cask
   homepage 'http://colloquy.info/'
 
   app 'Colloquy.app'
-  zap :files => [
-                 '~/Library/Preferences/info.colloquy.plist',
-                 '~/Library/Application Support/Colloquy',
-                ]
+  zap :delete => [
+                  '~/Library/Preferences/info.colloquy.plist',
+                  '~/Library/Application Support/Colloquy',
+                 ]
 end

Casks/concentrate.rb

@@ -7,5 +7,5 @@ class Concentrate < Cask
   homepage 'http://www.getconcentrating.com/'
 
   app 'Concentrate.app'
-  zap :files => '~/Library/Application Support/Concentrate/Concentrate.sqlite3'
+  zap :delete => '~/Library/Application Support/Concentrate/Concentrate.sqlite3'
 end

Casks/controlplane.rb

@@ -7,5 +7,5 @@ class Controlplane < Cask
   homepage 'http://www.controlplaneapp.com/'
 
   app 'ControlPlane.app'
-  zap :files => '~/Library/Preferences/com.dustinrue.ControlPlane.plist'
+  zap :delete => '~/Library/Preferences/com.dustinrue.ControlPlane.plist'
 end

Casks/cord.rb

@@ -7,5 +7,5 @@ class Cord < Cask
   homepage 'http://cord.sourceforge.net/'
 
   app 'CoRD.app'
-  zap :files => '~/Library/Application Support/CoRD'
+  zap :delete => '~/Library/Application Support/CoRD'
 end

Casks/craftstudio.rb

@@ -9,7 +9,7 @@ class Craftstudio < Cask
 
   uninstall :quit => 'com.sparklinlabs.CraftStudioLauncher',
             :pkgutil => 'com.sparklinlabs.CraftStudioLauncher'
-  zap       :files => '~/Library/CraftStudio'
+  zap       :delete => '~/Library/CraftStudio'
 
   caveats do
     "Requires mono-mre. You can install this by running brew cask install mono-mre."

Casks/cyberduck.rb

@@ -7,8 +7,8 @@ class Cyberduck < Cask
   homepage 'http://cyberduck.io/'
 
   app 'Cyberduck.app'
-  zap :files => [
-                 '~/Library/Application Support/Cyberduck',
-                 '~/Library/Preferences/ch.sudo.cyberduck.plist',
-                ]
+  zap :delete => [
+                  '~/Library/Application Support/Cyberduck',
+                  '~/Library/Preferences/ch.sudo.cyberduck.plist',
+                 ]
 end

Casks/cycling74-max.rb

@@ -7,5 +7,5 @@ class Cycling74Max < Cask
 
   pkg 'Max 6.1 Installer.pkg'
   uninstall :pkgutil => 'com.cycling74.Max*',
-            :files   => '/Applications/Max 6.1'
+            :delete  => '/Applications/Max 6.1'
 end

Casks/dash.rb

@@ -12,8 +12,8 @@ class Dash < Cask
     # Don't ask to move the app bundle to /Applications
     system '/usr/bin/defaults', 'write', 'com.kapeli.dash', 'moveToApplicationsFolderAlertSuppress', '-bool', 'true'
   end
-  zap :files => [
-                 '~/Library/Application Support/Dash/library.dash',
-                 '~/Library/Preferences/com.kapeli.dash.plist',
-                ]
+  zap :delete => [
+                  '~/Library/Application Support/Dash/library.dash',
+                  '~/Library/Preferences/com.kapeli.dash.plist',
+                 ]
 end

Casks/default-folder-x.rb

@@ -9,9 +9,9 @@ class DefaultFolderX < Cask
   caveats do
     manual_installer 'Default Folder X Installer.app'
   end
-  zap :files => [
-                 '~/Library/Preferences/com.stclairsoft.DefaultFolderX.favorites.plist',
-                 '~/Library/Preferences/com.stclairsoft.DefaultFolderX.plist',
-                 '~/Library/Preferences/com.stclairsoft.DefaultFolderX.settings.plist',
-                ]
+  zap :delete => [
+                  '~/Library/Preferences/com.stclairsoft.DefaultFolderX.favorites.plist',
+                  '~/Library/Preferences/com.stclairsoft.DefaultFolderX.plist',
+                  '~/Library/Preferences/com.stclairsoft.DefaultFolderX.settings.plist',
+                 ]
 end

Casks/displaylink.rb

@@ -21,7 +21,7 @@ class Displaylink < Cask
             # :script => {
             #   :executable => 'DisplayLink Software Uninstaller.app/Contents/MacOS/DisplayLink Software Uninstaller'
             # },
-            # :files => ['/Applications/DisplayLink Software Uninstaller.app']
+            # :delete => '/Applications/DisplayLink Software Uninstaller.app'
   caveats <<-EOS.undent
     Installing this Cask means you have AGREED to the DisplayLink
     Software License Agreement at

Casks/divvy.rb

@@ -7,8 +7,8 @@ class Divvy < Cask
   homepage 'http://mizage.com/divvy/'
 
   app 'Divvy.app'
-  zap :files => [
-                 '~/Library/Preferences/com.mizage.direct.Divvy.plist',
-                 '~/Library/Preferences/com.mizage.Divvy.plist',
-                ]
+  zap :delete => [
+                  '~/Library/Preferences/com.mizage.direct.Divvy.plist',
+                  '~/Library/Preferences/com.mizage.Divvy.plist',
+                 ]
 end

Casks/dolphin.rb

@@ -6,8 +6,8 @@ class Dolphin < Cask
   homepage 'http://www.dolphin-emu.org/'
 
   app 'Dolphin.app'
-  zap :files => [
-                 '~/Library/Application Support/Dolphin',
-                 '~/Library/Preferences/org.dolphin-emu.dolphin.plist',
-                ]
+  zap :delete => [
+                  '~/Library/Application Support/Dolphin',
+                  '~/Library/Preferences/org.dolphin-emu.dolphin.plist',
+                 ]
 end

Casks/droplr.rb

@@ -7,5 +7,5 @@ class Droplr < Cask
   homepage 'https://www.droplr.com/'
 
   app 'Droplr.app'
-  zap :files => '~/Library/Preferences/com.droplr.droplr-mac.plist'
+  zap :delete => '~/Library/Preferences/com.droplr.droplr-mac.plist'
 end

Casks/eagle.rb

@@ -7,5 +7,5 @@ class Eagle < Cask
 
   pkg "eagle-#{version}.pkg"
   uninstall :pkgutil => 'com.CadSoftComputerGmbH.EAGLE',
-            :files => "/Applications/EAGLE-#{version}"
+            :delete => "/Applications/EAGLE-#{version}"
 end

Casks/enjoyable.rb

@@ -7,5 +7,5 @@ class Enjoyable < Cask
   homepage 'http://yukkurigames.com/enjoyable/'
 
   app 'Enjoyable.app'
-  zap :files => '~/Library/Preferences/com.yukkurigames.Enjoyable.plist'
+  zap :delete => '~/Library/Preferences/com.yukkurigames.Enjoyable.plist'
 end