cleaning up install/uninstall implementation

Casks/virtualbox.rb

@@ -4,5 +4,5 @@ class Virtualbox < Cask
   version '4.2.14-86644'
   sha1 '93c36db799d53acaed7bb18c1402c6f11671f40a'
   install 'VirtualBox.pkg'
-  uninstall 'Virtualbox_Uninstall.tool', :args => %w[--unattended]
+  uninstall 'VirtualBox_Uninstall.tool', :args => %w[--unattended]
 end

lib/cask.rb

@@ -104,7 +104,7 @@ def installers
   end
 
   def uninstallers
-    uninstallables.map { |pkg| Pathname.glob("#{destination_path}/**/#{pkg}").first }
+    uninstallables.map { |file, options| [ Pathname.glob("#{destination_path}/**/#{file}").first, options ] }
   end
 
   def to_s

lib/cask/cli/alfred.rb

@@ -105,9 +105,9 @@ def self.alfred_scopes
 
   def self.alfred_preference(key, value=nil)
     if value
-      @system_command.run(%Q(defaults write #{DOMAIN} #{key} "#{value}"))
+      @system_command.run(%Q(defaults write #{DOMAIN} #{key} "#{value}"), :print => false)
     else
-      @system_command.run("defaults read #{DOMAIN} #{key}")
+      @system_command.run("defaults read #{DOMAIN} #{key}", :print => false)
     end
   end
 

lib/cask/dsl.rb

@@ -58,8 +58,8 @@ def uninstallables
       @uninstallables ||= Set.new
     end
 
-    def uninstall(*files)
-      uninstallables.merge files
+    def uninstall(file, options={})
+      uninstallables.merge [[file, options]]
     end
 
     attr_reader :sums

lib/cask/pkg_installer.rb

@@ -7,14 +7,17 @@ def initialize(cask, command=Cask::SystemCommand)
   def install
     @cask.installers.each do |installer|
       ohai "Running installer for #{@cask}; your password may be necessary."
-      @command.run("sudo installer -pkg '#{installer}' -target /")
+      @command.run("installer", {
+        :sudo => true,
+        :args => %W[-pkg #{installer} -target /]
+      })
     end
   end
 
   def uninstall
-    @cask.uninstallers.each do |uninstaller|
+    @cask.uninstallers.each do |uninstaller, options|
       ohai "Running uninstaller for #{@cask}; your password may be necessary."
-      @command.run("sudo '#{uninstaller}'")
+      @command.run(uninstaller, options.merge(:sudo => true))
     end
   end
 end

lib/cask/system_command.rb

@@ -1,11 +1,31 @@
 class Cask::SystemCommand
-  def self.run(command, input='')
+  def self.run(command, options={})
+    command = _process_options(command, options)
+    output = ''
     IO.popen("#{command} 2>&1", 'r+') do |pipe|
-      pipe.puts input
+      if options[:input]
+        options[:input].each { |line| pipe.puts line }
+      end
       pipe.close_write
       while line = pipe.gets
-        ohai line.chomp
+        output << line
+        ohai line.chomp if options.fetch(:print, true)
       end
     end
+    output 
+  end
+
+  def self._process_options(command, options)
+    if options[:sudo]
+      command = "sudo #{_quote(command)}"
+    end
+    if options[:args]
+      command = "#{command} #{options[:args].map { |arg| _quote(arg) }.join(' ')}"
+    end
+    command
+  end
+
+  def self._quote(string)
+    %Q('#{string}')
   end
 end

test/cask/pkg_installer_test.rb

@@ -18,7 +18,7 @@
     it 'runs the system installer on the specified pkgs' do
       pkg_installer = Cask::PkgInstaller.new(@cask, Cask::FakeSystemCommand)
 
-      expected_command = "sudo installer -pkg '#{@cask.destination_path/'MyFancyPkg'/'Fancy.pkg'}' -target /"
+      expected_command = "sudo 'installer' '-pkg' '#{@cask.destination_path/'MyFancyPkg'/'Fancy.pkg'}' '-target' '/'"
       Cask::FakeSystemCommand.fake_response_for(expected_command)
 
       shutup do
@@ -28,4 +28,19 @@
       Cask::FakeSystemCommand.system_calls[expected_command].must_equal 1
     end
   end
+
+  describe 'uninstall' do
+    it 'runs the specified uninstaller for the cask' do
+      pkg_installer = Cask::PkgInstaller.new(@cask, Cask::FakeSystemCommand)
+
+      expected_command = "sudo '#{@cask.destination_path/'MyFancyPkg'/'FancyUninstaller.tool'}' '--please'"
+      Cask::FakeSystemCommand.fake_response_for(expected_command)
+
+      shutup do
+        pkg_installer.uninstall
+      end
+
+      Cask::FakeSystemCommand.system_calls[expected_command].must_equal 1
+    end
+  end
 end

test/support/Casks/with-installable.rb

@@ -2,6 +2,7 @@ class WithInstallable < TestCask
   url TestHelper.local_binary('MyFancyPkg.zip')
   homepage 'http://example.com/fancy-pkg'
   version '1.2.3'
-  sha1 'd3540d05a48518cc808ad854a8ab64da94b635b7'
+  sha1 '8588bd8175a54b8e0a1310cc18e6567d520ab7c4'
   install 'Fancy.pkg'
+  uninstall 'FancyUninstaller.tool', :args => %w[--please]
 end

test/support/fake_system_command.rb

@@ -17,7 +17,8 @@ def self.clear
     @system_calls = Hash.new(0)
   end
 
-  def self.run(command)
+  def self.run(command, options={})
+    command = Cask::SystemCommand._process_options(command, options)
     @responses ||= {}
     @system_calls ||= Hash.new(0)
     unless @responses.key?(command)