Merge pull request #70 from boxen/custom-homebrew-root

Configure homebrew's root directory in facts

Author: dgoodlad

Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "cardboard", "~> 1.0"
+gem "cardboard", "~> 2.1"

Gemfile.lock

@@ -1,75 +1,80 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.4)
+    CFPropertyList (2.2.8)
+    addressable (2.3.6)
     ansi (1.4.3)
-    boxen (1.3.0)
+    boxen (2.7.0)
       ansi (~> 1.4)
       hiera (~> 1.0)
       highline (~> 1.6)
       json_pure (>= 1.7.7, < 2.0)
-      librarian-puppet (~> 0.9.9)
-      octokit (~> 1.15)
-      puppet (~> 3.0)
-    cardboard (1.0.4)
-      boxen (~> 1.0)
+      librarian-puppet (~> 1.0.0)
+      octokit (~> 2.7, >= 2.7.1)
+      puppet (~> 3.7)
+    cardboard (2.1.0)
+      boxen (~> 2.1)
       puppet-lint (~> 0.3)
       puppetlabs_spec_helper (~> 0.4)
-      rspec-puppet (~> 0.1)
-    diff-lcs (1.2.4)
-    facter (1.7.1)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    hashie (2.0.5)
-    hiera (1.2.1)
+      rspec-puppet (~> 1.0)
+    diff-lcs (1.2.5)
+    facter (2.3.0)
+      CFPropertyList (~> 2.2.6)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    hiera (1.3.4)
       json_pure
-    highline (1.6.19)
-    json (1.8.0)
-    json_pure (1.8.0)
-    librarian-puppet (0.9.9)
-      json
+    highline (1.6.21)
+    json (1.8.1)
+    json_pure (1.8.1)
+    librarian (0.1.2)
+      highline
       thor (~> 0.15)
-    metaclass (0.0.1)
-    mocha (0.14.0)
+    librarian-puppet (1.0.9)
+      json
+      librarian (>= 0.1.2)
+    metaclass (0.0.4)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.4)
-    multipart-post (1.2.0)
-    netrc (0.7.7)
-    octokit (1.24.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 2.0)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
-    puppet (3.2.1)
-      facter (~> 1.6)
+    multipart-post (2.0.0)
+    octokit (2.7.2)
+      sawyer (~> 0.5.2)
+    puppet (3.7.3)
+      facter (> 1.6, < 3)
       hiera (~> 1.0)
-      rgen (~> 0.6)
+      json_pure
     puppet-lint (0.3.2)
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
+    puppet-syntax (1.3.0)
       rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.0.4)
-    rgen (0.6.2)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    rspec-puppet (0.1.6)
+    puppetlabs_spec_helper (0.8.2)
+      mocha
+      puppet-lint
+      puppet-syntax
+      rake
+      rspec
+      rspec-puppet
+    rake (10.4.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-puppet (1.0.1)
       rspec
-    thor (0.18.1)
+    rspec-support (3.1.2)
+    sawyer (0.5.5)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cardboard (~> 1.0)
+  cardboard (~> 2.1)

lib/facter/homebrew_root.rb

@@ -0,0 +1,8 @@
+Facter.add(:homebrew_root) do
+  confine :operatingsystem => 'Darwin'
+
+  # Explicit, low weight makes this easily overridable
+  has_weight 1
+
+  setcode { "#{Facter.value(:boxen_home)}/homebrew" }
+end

lib/puppet/provider/package/homebrew.rb

@@ -14,11 +14,7 @@
   # A list of `ensure` values that aren't explicit versions.
 
   def self.home
-    if boxen_home = Facter.value(:boxen_home)
-      "#{boxen_home}/homebrew"
-    else
-      "/usr/local/homebrew"
-    end
+    Facter.value(:homebrew_root)
   end
 
   def self.cache
@@ -29,7 +25,7 @@ def self.cache
     end
   end
 
-  confine  :operatingsystem => :darwin
+  confine :operatingsystem => :darwin
 
   def self.active?(name, version)
     current(name) == version

manifests/config.pp

@@ -8,7 +8,7 @@
   include boxen::config
 
   $cachedir   = "${boxen::config::cachedir}/homebrew"
-  $installdir = "${boxen::config::home}/homebrew"
+  $installdir = $::homebrew_root
   $libdir     = "${installdir}/lib"
 
   $cmddir     = "${installdir}/Library/Homebrew/cmd"

spec/classes/homebrew__repo_spec.rb

@@ -4,6 +4,6 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class("homebrew")
+    should contain_class("homebrew")
   end
 end

spec/classes/homebrew_spec.rb

@@ -3,7 +3,7 @@
 describe "homebrew" do
   let(:facts) { default_test_facts }
 
-  let(:dir) { "#{facts[:boxen_home]}/homebrew" }
+  let(:dir) { facts[:homebrew_root] }
   let(:cmddir) { "#{dir}/Library/Homebrew/cmd" }
 
   it do

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/homebrew-brews" }
+  let(:tapdir) { "#{facts[:homebrew_root]}/Library/Taps/boxen/homebrew-brews" }
 
   context "with source provided" do
     let(:params) do

spec/spec_helper.rb

@@ -11,6 +11,7 @@ def default_test_facts
   {
     :boxen_home                  => "/test/boxen",
     :boxen_user                  => "testuser",
+    :homebrew_root               => "/test/boxen/custom/homebrew",
     :macosx_productversion_major => "10.8",
     :osfamily                    => "Darwin",
   }