Merge pull request #50 from boxen/leave-management-to-homebrew

Remove Homebrew management from Brewcask

Author: jacobbednarz

lib/facter/brewcask_root.rb

@@ -1,8 +1,7 @@
 require "puppet/provider/package"
 require "puppet/util/execution"
 
-Puppet::Type.type(:package).provide :brewcask,
-  :parent => Puppet::Provider::Package do
+Puppet::Type.type(:package).provide :brewcask, :parent => Puppet::Provider::Package do
   include Puppet::Util::Execution
 
   confine :operatingsystem => :darwin
@@ -20,14 +19,26 @@ def self.home
   end
 
   def self.caskroom
-    "#{Facter[:brewcask_root].value}/Caskroom"
+    if legacy_caskroom.exist?
+      legacy_caskroom.to_s
+    else
+      new_caskroom.to_s
+    end
   end
 
   def self.current(name)
     caskdir = Pathname.new "#{caskroom}/#{name}"
     caskdir.directory? && caskdir.children.size >= 1 && caskdir.children.sort.last.to_s
   end
 
+  def self.legacy_caskroom
+    @legacy_caskroom ||= Pathname.new('/opt/homebrew-cask/Caskroom')
+  end
+
+  def self.new_caskroom
+    @new_caskroom ||= Pathname.new("#{home}/Caskroom")
+  end
+
   def query
     return unless version = self.class.current(resource[:name])
     { :ensure => version, :name => resource[:name] }
@@ -85,7 +96,6 @@ def command_opts
       :custom_environment    => {
         "HOME"               => "/Users/#{default_user}",
         "PATH"               => "#{self.class.home}/bin:/usr/bin:/usr/sbin:/bin:/sbin",
-        "HOMEBREW_CASK_OPTS" => "--caskroom=#{self.class.caskroom}",
         "HOMEBREW_NO_EMOJI"  => "Yes",
       },
       :failonfail            => true,

lib/puppet/provider/package/brewcask.rb

@@ -1,29 +1,8 @@
-# Public: Install and configure brewcask for use with Boxen.
-#
-# Examples
-#
-#   include brewcask
-
 class brewcask {
+  include boxen::config
   require homebrew
 
-  $cask_home = $::brewcask_root
-  $cask_room = "${cask_home}/Caskroom"
-
-  homebrew::tap { 'caskroom/cask': }
-
-  file { $cask_home:
-    ensure => directory
-  }
-
-  # This prevents typing root password the first time a cask is installed
-  file { $cask_room:
-    ensure  => directory,
-    require => File[$cask_home]
-  }
-
-  boxen::env_script { 'brewcask':
-    content  => template('brewcask/env.sh.erb'),
-    priority => highest,
+  file { "${boxen::config::envdir}/10_brewcask.sh":
+    ensure => 'absent'
   }
 }

manifests/init.pp

@@ -2,18 +2,4 @@
 
 describe 'brewcask' do
   let(:facts) { default_test_facts }
-
-  it do
-    should contain_class('homebrew')
-    should contain_homebrew__tap('caskroom/cask')
-  end
-
-  it do
-    should contain_file('/test/custom/homebrew-cask').with_ensure('directory')
-    should contain_file('/test/custom/homebrew-cask/Caskroom').with_ensure('directory')
-  end
-
-  it do
-    should contain_boxen__env_script('brewcask').with_ensure('present')
-  end
 end

spec/classes/brewcask_spec.rb

@@ -12,6 +12,5 @@ def default_test_facts
     :boxen_home    => "/test/boxen",
     :boxen_srcdir  => "/test/boxen/src",
     :boxen_user    => "testuser",
-    :brewcask_root => "/test/custom/homebrew-cask"
   }
 end