Merge pull request #34 from boxen/mavericks-fix

Fix recovery_message on Mavericks
boxen · Nov 3, 2013 · d07ee23 · d07ee23
2 parents de49eda + 53c5980
commit d07ee23
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -130,7 +130,6 @@ class { 'osx::dock::icon_size':
 ## Required Puppet Modules
 
 * boxen
-* property_list_key
 
 ## Developing
 

diff --git a/manifests/recovery_message.pp b/manifests/recovery_message.pp
@@ -40,9 +40,9 @@
 
   if $ensure == 'present' {
     if $value != undef {
-      property_list_key { 'Set OS X Recovery Message':
+      boxen::osx_defaults { 'Set OS X Recovery Message':
         ensure => present,
-        path   => '/Library/Preferences/com.apple.loginwindow.plist',
+        domain => '/Library/Preferences/com.apple.loginwindow.plist',
         key    => 'LoginwindowText',
         value  => $value,
         notify => [
@@ -60,9 +60,9 @@
       fail('Cannot set an OS X recovery message without a value')
     }
   } else {
-    property_list_key { 'Remove OS X Recovery Message':
+    boxen::osx_defaults { 'Remove OS X Recovery Message':
       ensure => absent,
-      path   => '/Library/Preferences/com.apple.loginwindow.plist',
+      domain => '/Library/Preferences/com.apple.loginwindow.plist',
       key    => 'LoginwindowText',
       notify => [
         Exec['Refresh system kext cache'],

diff --git a/spec/defines/recovery_message_spec.rb b/spec/defines/recovery_message_spec.rb
@@ -25,9 +25,9 @@
     let(:title) { 'If this Mac is found, please call 123-123-1234' }
 
     it do
-      should contain_property_list_key('Set OS X Recovery Message').with({
+      should contain_boxen__osx_defaults('Set OS X Recovery Message').with({
         :ensure => 'present',
-        :path   => '/Library/Preferences/com.apple.loginwindow.plist',
+        :domain => '/Library/Preferences/com.apple.loginwindow.plist',
         :key    => 'LoginwindowText',
         :value  => title
       })
@@ -45,9 +45,9 @@
     let(:params) { {:ensure => 'absent'} }
 
     it do
-      should contain_property_list_key('Remove OS X Recovery Message').with({
+      should contain_boxen__osx_defaults('Remove OS X Recovery Message').with({
         :ensure => 'absent',
-        :path   => '/Library/Preferences/com.apple.loginwindow.plist',
+        :domain => '/Library/Preferences/com.apple.loginwindow.plist',
         :key    => 'LoginwindowText',
       })
 

diff --git a/spec/fixtures/Puppetfile b/spec/fixtures/Puppetfile
@@ -1,2 +1 @@
 mod "boxen", "2.0.0", :github_tarball => "boxen/puppet-boxen"
-mod "property_list_key", "0.1.0",  :github_tarball => "glarizza/puppet-property_list_key"
diff --git a/spec/fixtures/Puppetfile.lock b/spec/fixtures/Puppetfile.lock
@@ -3,12 +3,6 @@ GITHUBTARBALL
   specs:
     boxen (2.0.0)
 
-GITHUBTARBALL
-  remote: glarizza/puppet-property_list_key
-  specs:
-    property_list_key (0.1.0)
-
 DEPENDENCIES
   boxen (= 2.0.0)
-  property_list_key (= 0.1.0)