Permalink
Browse files

Updated deploy deps

  • Loading branch information...
1 parent 88134e0 commit 8b7e4a33befd55e82fb9ebf7fe9f031e2aa433e0 @ivanvanderbyl committed Apr 29, 2012
Showing with 20 additions and 8 deletions.
  1. +11 −7 application_stack.rb
  2. +9 −1 deploy.rb
View
@@ -4,19 +4,23 @@
}
requires [
- 'benhoskings:system',
- 'benhoskings:ruby.src',
- 'benhoskings:user setup for provisioning',
- 'testpilot:core dependencies',
- 'testpilot:build essential installed',
- 'testpilot:postgresql installed']
+ 'benhoskings:system',
+ 'ivanvanderbyl:ruby.src',
+ 'benhoskings:user setup for provisioning',
+ 'testpilot:core dependencies',
+ 'testpilot:build essential installed',
+ 'benhoskings:postgres.managed'
+ ]
}
dep('application deployed'){
setup {
unmeetable! "This dep cannot be run as root." if shell('whoami') == 'root'
}
- requires ['ivanvanderbyl:web repo']
+ requires [
+ 'ivanvanderbyl:web repo',
+ 'postgres access'
+ ]
}
View
@@ -48,9 +48,17 @@
repo.repo_shell "git diff"
}
met? { repo.clean? || unmeetable!("The remote repo has local changes.") }
- meet { repo.reset_hard! }
end
+# dep 'clean.repo' do
+# setup {
+# # Clear git's internal cache, which sometimes says the repo is dirty when it isn't.
+# repo.repo_shell "git diff"
+# }
+# met? { repo.clean? || unmeetable!("The remote repo has local changes.") }
+# meet { repo.reset_hard! }
+# end
+
dep 'branch exists.repo', :branch do
met? {
repo.branches.include? branch

0 comments on commit 8b7e4a3

Please sign in to comment.