Merge pull request #42 from boxen/manage-homebrew-revision

Manage homebrew revision

Author: dgoodlad

lib/puppet/provider/homebrew_repo/homebrew.rb

@@ -0,0 +1,94 @@
+require 'puppet/util/errors'
+require 'puppet/util/execution'
+
+Puppet::Type.type(:homebrew_repo).provide :homebrew do
+  include Puppet::Util::Execution
+  include Puppet::Util::Errors
+
+  optional_commands :git => 'git'
+
+  confine :operatingsystem => :darwin
+
+  def self.home
+    if boxen_home = Facter.value(:boxen_home)
+      "#{boxen_home}/homebrew"
+    else
+      raise "The puppet-homebrew module depends on Boxen"
+    end
+  end
+  
+  def check_min_revision
+    result = Dir.chdir @resource[:path] do
+      execute([
+        "/bin/sh", "-c",
+        "#{command(:git)} rev-list #{current_revision} | fgrep #{min_revision}"
+      ], command_opts.merge(:failonfail => false))
+    end
+    result.exitstatus == 0 ? @resource[:min_revision] : current_revision
+  end
+  
+  def brew_update
+    if Puppet.features.bundled_environment?
+      Bundler.with_clean_env do
+        execute(["brew", "update"], brew_command_opts)
+      end
+    else
+      execute(["brew", "update"], brew_command_opts)
+    end
+  end
+  
+  private
+
+  def current_revision
+    @current_revision ||= Dir.chdir @resource[:path] do
+      execute([
+        command(:git), "rev-parse", "HEAD"
+      ], command_opts).chomp
+    end
+  end
+  
+  def min_revision
+    @min_revision ||= Dir.chdir @resource[:path] do
+      execute([
+        command(:git), "rev-list", "--max-count=1", @resource[:min_revision]
+      ], command_opts).chomp
+    end
+  end
+
+  def command_opts
+    @command_opts ||= build_command_opts
+  end
+
+  def build_command_opts
+    default_command_opts.tap do |h|
+      if uid = (@resource[:user] || self.class.default_user)
+        h[:uid] = uid
+      end
+    end
+  end
+
+  def default_command_opts
+    {
+      :combine     => true,
+      :failonfail  => true
+    }
+  end
+
+  def homedir_prefix
+    case Facter[:osfamily].value
+    when "Darwin" then "Users"
+    when "Linux" then "home"
+    else
+      raise "unsupported"
+    end
+  end
+  
+  def brew_command_opts
+    default_command_opts.merge({
+      :custom_environment => {
+        "HOME"            => "/#{homedir_prefix}/#{@resource[:user]}",
+        "PATH"            => "#{self.class.home}/bin:/usr/bin:/usr/sbin:/bin:/sbin",
+      }
+    })
+  end
+end

lib/puppet/type/homebrew_repo.rb

@@ -0,0 +1,29 @@
+Puppet::Type.newtype(:homebrew_repo) do
+  newparam(:path) do
+    isnamevar
+    
+    validate do |v|
+      if v.nil?
+        raise Puppet::ParseError, "Homebrew_repo requires a path parameter!"
+      end
+    end
+  end
+
+  newproperty(:min_revision) do
+    newvalue(/.+/) do
+      provider.brew_update
+    end
+    
+    def retrieve
+      provider.check_min_revision
+    end
+  end
+
+  newparam :user do
+    desc "User to run this operation as."
+
+    defaultto do
+      Facter.value(:boxen_user) || Facter.value(:id) || "root"
+    end
+  end
+end

manifests/config.pp

@@ -15,4 +15,6 @@
   $tapsdir    = "${installdir}/Library/Taps"
 
   $brewsdir   = "${tapsdir}/boxen-brews"
+
+  $min_revision = 'e567009'
 }

manifests/init.pp

@@ -5,14 +5,15 @@
 #   include homebrew
 
 class homebrew(
-  $cachedir    = $homebrew::config::cachedir,
-  $installdir  = $homebrew::config::installdir,
-  $libdir      = $homebrew::config::libdir,
-  $cmddir      = $homebrew::config::cmddir,
-  $tapsdir     = $homebrew::config::tapsdir,
-  $brewsdir    = $homebrew::config::brewsdir,
-  $set_cflags  = true,
-  $set_ldflags = true,
+  $cachedir     = $homebrew::config::cachedir,
+  $installdir   = $homebrew::config::installdir,
+  $libdir       = $homebrew::config::libdir,
+  $cmddir       = $homebrew::config::cmddir,
+  $tapsdir      = $homebrew::config::tapsdir,
+  $brewsdir     = $homebrew::config::brewsdir,
+  $min_revision = $homebrew::config::min_revision,
+  $set_cflags   = true,
+  $set_ldflags  = true,
 ) inherits homebrew::config {
   include boxen::config
   include homebrew::repo

manifests/repo.pp

@@ -3,13 +3,15 @@
 # Examples
 #
 #   include homebrew::repo
-class homebrew::repo {
-  include homebrew
+class homebrew::repo (
+  $installdir   = $homebrew::config::installdir,
+  $min_revision = $homebrew::config::min_revision,
+) {
+  require homebrew
 
   if $::osfamily == 'Darwin' {
-    exec { 'brew update':
-      refreshonly => true,
-      require     => Class['homebrew']
-    }
+    homebrew_repo { $installdir:
+      min_revision => $min_revision,
+    } -> Package <| |>
   }
 }

spec/classes/homebrew__repo_spec.rb

@@ -5,6 +5,5 @@
 
   it do
     should include_class("homebrew")
-    should contain_exec("brew update").with_refreshonly(true)
   end
 end