Permalink
Browse files

Update to lastest babushka format, fixes all deprecation warnings

  • Loading branch information...
1 parent a8b9aa2 commit 14cfbd9dced2238187403a15a4d2a93eed978d06 @xaviershay committed Dec 19, 2010
Showing with 24 additions and 46 deletions.
  1. +12 −12 apps.rb
  2. +1 −1 fonts.rb
  3. +6 −28 me.rb
  4. +2 −2 ruby.rb
  5. +1 −1 terminal.rb
  6. +2 −2 vim.rb
View
24 apps.rb
@@ -1,12 +1,12 @@
-app 'MacVim.app' do
+dep 'MacVim.app' do
source 'http://macvim.googlecode.com/files/MacVim-snapshot-52.tbz'
end
-app 'Garmin ANT Agent.app' do
+dep 'Garmin ANT Agent.app' do
source 'http://www8.garmin.com/software/ANTAgentforMac_215.dmg'
end
-app 'Chromium.app' do
+dep 'Chromium.app' do
requires_when_unmet "Chromium.app download cleared"
source L{
"http://build.chromium.org/buildbot/snapshots/chromium-rel-mac/#{version}/chrome-mac.zip"
@@ -25,37 +25,37 @@
meet { in_download_dir { 'chrome-mac.zip'.p.rm } }
end
-app 'Skype.app' do
+dep 'Skype.app' do
source 'http://download.skype.com/macosx/Skype_2.8.0.851.dmg'
end
-app 'Thunderbird.app' do
+dep 'Thunderbird.app' do
# TODO: Determine latest version automatically
source 'http://jp-nii01.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1b2/mac/en-GB/Thunderbird 3.1 Beta 2.dmg'
end
-app 'Gnucash.app' do
+dep 'Gnucash.app' do
source 'http://downloads.sourceforge.net/sourceforge/gnucash/Gnucash-Intel-2.2.9.4.dmg'
end
-app 'Alfred.app' do
+dep 'Alfred.app' do
source 'http://media.alfredapp.com/alfred_0.6.2_beta_23.dmg'
end
-app 'Growl.app' do
+dep 'Growl.app' do
source 'http://growl.cachefly.net/Growl-1.2.dmg'
end
-app 'Dropbox.app' do
+dep 'Dropbox.app' do
source 'https://www.dropbox.com/download?plat=mac'
end
-app 'Things.app' do
+dep 'Things.app' do
source 'http://culturedcode.com/things/download/?e=3102'
end
-pkg 'tig'
+dep 'tig.managed'
-app 'Skitch.app' do
+dep 'Skitch.app' do
source 'http://get.skitch.com/skitch-beta.dmg'
end
View
@@ -14,4 +14,4 @@
end
end
-font('inconsolata') { source 'http://www.levien.com/type/myfonts/Inconsolata.otf' }
+dep('inconsolata.font') { source 'http://www.levien.com/type/myfonts/Inconsolata.otf' }
View
34 me.rb
@@ -29,15 +29,15 @@
requires 'KeyRemap4MacBook'
end
-installer 'KeyRemap4MacBook' do
+dep 'KeyRemap4MacBook.installer' do
source 'http://pqrs.org/macosx/keyremap4macbook/files/KeyRemap4MacBook-6.7.0.pkg.zip'
met? { File.exists?('/Library/PreferencePanes/KeyRemap4MacBook.prefPane') }
end
dep 'user shell setup' do
- requires 'fish', 'dot files'
- met? { File.basename(sudo('echo \$SHELL', :as => var(:username), :su => true)) == 'fish' }
- meet { sudo "chsh -s #{shell('which fish')} #{var(:username)}" }
+ requires 'dot files'
+# met? { File.basename(sudo('echo \$SHELL', :as => var(:username), :su => true)) == 'fish' }
+# meet { sudo "chsh -s #{shell('which fish')} #{var(:username)}" }
end
@@ -71,36 +71,14 @@
}
end
-dep 'fish' do
- requires 'fish default shell'
-end
-
-dep 'fish default shell' do
- requires 'fish shell'
- met? { shell("dscl . -read /Users/`whoami` UserShell").split(' ').last == which('fish') }
- meet { shell "chsh -s #{which('fish')}" }
-end
-
-dep 'fish shell' do
- requires 'fish installed'
- met? { grep which('fish'), '/etc/shells' }
- meet { append_to_file which('fish'), '/etc/shells', :sudo => true }
-end
-
-src 'fish installed' do
- requires 'ncurses', 'coreutils'
- source "git://github.com/benhoskings/fish.git"
- provides 'fish'
-end
-
-pkg 'ncurses' do
+dep 'ncurses.managed' do
installs {
via :apt, 'libncurses5-dev', 'libncursesw5-dev'
via :macports, 'ncurses', 'ncursesw'
}
provides []
end
-pkg 'coreutils', :for => :osx do
+dep 'coreutils.managed', :for => :osx do
provides 'gecho'
after :on => :osx do
in_dir pkg_manager.bin_path do
View
@@ -7,5 +7,5 @@
}
end
-pkg 'coffee-script'
-pkg 'mysql'
+dep 'coffee-script.managed'
+dep 'mysql.managed'
View
@@ -17,7 +17,7 @@
"Startup Window Settings",
"Default Window Settings"
].each do |setting|
- plist_default("Terminal #{setting}") {
+ dep("Terminal #{setting}.plist_default") {
domain 'com.apple.Terminal'
key setting
value 'Novel'
View
4 vim.rb
@@ -77,8 +77,8 @@
def pathogen_plugin(name)
git_repo = "git://github.com/tpope/#{name}.git"
- pathogen_plugin_source("#{name} source cloned") { source(git_repo) }
- pathogen_link_exists("#{name} link exists") { source(git_repo) }
+ dep("#{name} source cloned.pathogen_plugin_source") { source(git_repo) }
+ dep("#{name} link exists.pathogen_link_exists") { source(git_repo) }
dep "#{name} installed" do
requires "vim-pathogen installed", "#{name} source cloned", "#{name} link exists"

0 comments on commit 14cfbd9

Please sign in to comment.