Merge pull request #46 from boxen/use-new-tap-directory

Support new tap directory naming convention

Author: dgoodlad

manifests/config.pp

@@ -16,5 +16,5 @@
 
   $brewsdir   = "${tapsdir}/boxen-brews"
 
-  $min_revision = 'e567009'
+  $min_revision = 'e07584e3fbdc88327bafe23b9c40c904d0fff0a1'
 }

manifests/formula.pp

@@ -10,13 +10,16 @@
     default => $source
   }
 
-  ensure_resource('file', "${homebrew::tapsdir}/boxen-brews", {
+  $boxen_tapdir = "${homebrew::tapsdir}/boxen/homebrew-brews"
+
+  ensure_resource('file', $boxen_tapdir, {
     'ensure' => 'directory',
     'owner'  => $::boxen_user,
     'group'  => 'staff'
   })
 
-  file { "${homebrew::config::tapsdir}/boxen-brews/${name}.rb":
-    source  => $formula_source
+  file { "${boxen_tapdir}/${name}.rb":
+    source  => $formula_source,
+    require => File[$boxen_tapdir]
   }
 }

spec/defines/homebrew__formula_spec.rb

@@ -4,7 +4,7 @@
   let(:facts) { default_test_facts }
   let(:title) { "clojure" }
 
-  let(:tapdir) { "#{facts[:boxen_home]}/homebrew/Library/Taps/boxen-brews" }
+  let(:tapdir) { "#{facts[:boxen_home]}/homebrew/Library/Taps/boxen/homebrew-brews" }
 
   context "with source provided" do
     let(:params) do