Merge pull request #3075 from rolandwalker/mkpath_on_demand

create target directories on-demand

lib/cask.rb

@@ -56,9 +56,6 @@ class Cask
         system '/usr/bin/sudo', '--', '/usr/sbin/chown', '-R', '--', "#{current_user}:staff", caskroom.parent
       end
     end
-    appdir.mkpath unless appdir.exist?
-    qlplugindir.mkpath unless qlplugindir.exist?
-    screen_saverdir.mkpath unless screen_saverdir.exist?
   end
 
   def self.load(query)

lib/cask/artifact/hardlinked.rb

@@ -9,6 +9,7 @@ class Cask::Artifact::Hardlinked < Cask::Artifact::Symlinked
   end
 
   def create_filesystem_link(source, target)
+    Pathname.new(target).dirname.mkpath
     @command.run!('/bin/ln', :args => ['-hf', '--', source, target])
   end
 

lib/cask/artifact/symlinked.rb

@@ -8,6 +8,7 @@ class Cask::Artifact::Symlinked < Cask::Artifact::Base
   end
 
   def create_filesystem_link(source, target)
+    Pathname.new(target).dirname.mkpath
     @command.run!('/bin/ln', :args => ['-hfs', '--', source, target])
   end
 

test/cask/cli_test.rb

@@ -14,14 +14,6 @@ describe Cask::CLI do
   end
 
   describe "process" do
-    it "creates the appdir if it does not exist" do
-      Cask.appdir.rmdir
-      shutup {
-          Cask::CLI.process('doctor')
-      }
-      Cask.appdir.directory?.must_equal true
-    end
-
     it "respects the env variable when choosing what appdir to create, not touching the default appdir" do
       default_applications_dir = Cask.appdir
       default_applications_dir.rmdir
@@ -34,7 +26,7 @@ describe Cask::CLI do
       begin
         ENV['HOMEBREW_CASK_OPTS'] = "--appdir=#{custom_applications_dir}"
         shutup {
-          Cask::CLI.process('doctor')
+          Cask::CLI.process(['install', 'local-caffeine'])
         }
       ensure
         ENV.delete 'HOMEBREW_CASK_OPTS'
@@ -44,36 +36,6 @@ describe Cask::CLI do
       custom_applications_dir.directory?.must_equal true
     end
 
-    it "creates the qlplugindir if it does not exist" do
-      Cask.qlplugindir.rmdir
-      shutup {
-        Cask::CLI.process('doctor')
-      }
-      Cask.qlplugindir.directory?.must_equal true
-    end
-
-    it "respects the env variable when choosing what qlplugindir to create, not touching the default qlplugindir" do
-      default_qlplugin_dir = Cask.qlplugindir
-      default_qlplugin_dir.rmdir
-      custom_qlplugin_dir = Pathname(Dir.mktmpdir('custom_qlplugin_dir'))
-      custom_qlplugin_dir.rmdir
-
-      default_qlplugin_dir.directory?.must_equal false
-      custom_qlplugin_dir.directory?.must_equal false
-
-      begin
-        ENV['HOMEBREW_CASK_OPTS'] = "--qlplugindir=#{custom_qlplugin_dir}"
-        shutup {
-          Cask::CLI.process('doctor')
-        }
-      ensure
-        ENV.delete 'HOMEBREW_CASK_OPTS'
-      end
-
-      default_qlplugin_dir.directory?.must_equal false
-      custom_qlplugin_dir.directory?.must_equal true
-    end
-
     it "respects the ENV variable when choosing a non-default Caskroom location" do
       default_caskroom_dir = Cask.caskroom
       default_caskroom_dir.rmdir