Permalink
Browse files

merge deps_remoter_merge branch.

This brings in the several core changes:
# Provides a properties_hash which represents the defined state of our pool.
# First phase of chef support
# New, simpler bootstrapping and provisioning system
# Redesigned remoter_bases to more easily add alternate remoter bases thru subclassing of the base RemoterBase class.
# break out specific functionality into gems where possible
## dslify
## parenting
## Suitcase, a new gem for packaging up dependencies to a directory or tarball
  • Loading branch information...
1 parent c56fac3 commit 18ba929f769d7b5ace2da030c6a1c8caf70cdf3b @fairchild fairchild committed with Apr 1, 2009
Showing with 6,048 additions and 6,796 deletions.
  1. +8 −2 .gitignore
  2. +9 −0 .gitmodules
  3. +1 −1 License.txt
  4. +0 −404 Manifest.txt
  5. +1 −1 README.txt
  6. +13 −37 Rakefile
  7. +6 −0 TODO.textile
  8. +4 −0 VERSION.yml
  9. +21 −0 bin/cloud-bootstrap
  10. +11 −6 bin/cloud-configure
  11. 0 bin/{pool-console → cloud-console}
  12. +9 −12 bin/cloud-list
  13. +13 −23 bin/cloud-provision
  14. +2 −1 bin/cloud-spec
  15. +11 −3 bin/cloud-ssh
  16. +26 −22 bin/cloud-start
  17. +1 −1 bin/cloud-terminate
  18. +23 −0 bin/ec2-list-active
  19. +1 −1 bin/server-become-master
  20. +1 −1 bin/server-clean-cert-for
  21. +1 −2 bin/server-ensure-provisioning
  22. +9 −12 bin/server-get-load
  23. +9 −13 bin/server-list-active
  24. +0 −24 bin/server-list-responding
  25. +1 −1 bin/server-query-agent
  26. +1 −1 bin/server-rerun
  27. +1 −1 bin/server-update-hosts
  28. +1 −1 bin/server-write-new-nodes
  29. +0 −116 config/hoe.rb
  30. +40 −0 config/jeweler.rb
  31. +1 −9 config/requirements.rb
  32. +9 −6 examples/basic.rb
  33. +22 −0 examples/default.rb
  34. +56 −0 examples/fairchild.rb
  35. +34 −0 examples/suspenders.conf.erb
  36. +1 −9 generators/poolspec/poolspec_generator.rb
  37. +1 −1 lib/erlang/messenger/Rakefile
  38. +1 −1 lib/erlang/messenger/src/pm_node.erl
  39. +0 −1 lib/erlang/messenger/src/utils.erl
  40. +69 −17 lib/poolparty.rb
  41. +32 −29 lib/poolparty/base_packages/haproxy.rb
  42. +45 −62 lib/poolparty/base_packages/heartbeat.rb
  43. +76 −86 lib/poolparty/base_packages/poolparty.rb
  44. +4 −4 lib/poolparty/base_packages/ruby.rb
  45. +1 −1 lib/poolparty/base_packages/runit.rb
  46. +2 −1 lib/poolparty/capistrano.rb
  47. +9 −3 lib/poolparty/core/array.rb
  48. +16 −12 lib/poolparty/core/hash.rb
  49. +12 −8 lib/poolparty/core/kernel.rb
  50. +20 −21 lib/poolparty/core/object.rb
  51. +39 −13 lib/poolparty/core/string.rb
  52. +49 −0 lib/poolparty/dependencies.rb
  53. +0 −12 lib/poolparty/dependency_resolutions/base.rb
  54. +37 −0 lib/poolparty/dependency_resolver/dependency_resolver.rb
  55. +28 −0 lib/poolparty/dependency_resolver/dependency_resolver_cloud_extensions.rb
  56. +29 −28 lib/poolparty/{dependency_resolutions → dependency_resolver}/puppet.rb
  57. +162 −0 lib/poolparty/dependency_resolver/puppet_resolver.rb
  58. +5 −0 lib/poolparty/exceptions/dependency_resolver_exception.rb
  59. +7 −0 lib/poolparty/exceptions/package_exception.rb
  60. +7 −7 lib/poolparty/extra/deployments.rb
  61. +6 −7 lib/poolparty/helpers/binary.rb
  62. +1 −5 lib/poolparty/helpers/display.rb
  63. +44 −0 lib/poolparty/helpers/hash_printer.rb
  64. +26 −19 lib/poolparty/helpers/optioner.rb
  65. +13 −0 lib/poolparty/lite.rb
  66. +6 −0 lib/poolparty/modules/cloud_dsl.rb
  67. +48 −112 lib/poolparty/modules/cloud_resourcer.rb
  68. +0 −36 lib/poolparty/modules/configurable.rb
  69. +1 −1 lib/poolparty/modules/daemonizable.rb
  70. +7 −10 lib/poolparty/modules/definable_resource.rb
  71. +13 −13 lib/poolparty/modules/file_writer.rb
  72. +0 −58 lib/poolparty/modules/method_missing_sugar.rb
  73. +1 −1 lib/poolparty/modules/pretty_printer.rb
  74. +25 −44 lib/poolparty/modules/resourcing_dsl.rb
  75. +2 −10 lib/poolparty/monitors/base_monitor.rb
  76. +11 −0 lib/poolparty/net/init.rb
  77. +1 −18 lib/poolparty/net/messenger.rb
  78. +0 −38 lib/poolparty/net/remote.rb
  79. +21 −0 lib/poolparty/net/remote_bases.rb
  80. +35 −27 lib/poolparty/net/remote_instance.rb
  81. +0 −313 lib/poolparty/net/remoter.rb
  82. +233 −0 lib/poolparty/net/remoter/cloud_control.rb
  83. +164 −0 lib/poolparty/net/remoter/connections.rb
  84. +121 −0 lib/poolparty/net/remoter/interactive.rb
  85. +12 −0 lib/poolparty/net/remoter/lists.rb
  86. +41 −124 lib/poolparty/net/remoter_base.rb
  87. +67 −43 lib/poolparty/net/{remote_bases → remoter_bases/ec2}/ec2.rb
  88. +53 −0 lib/poolparty/net/remoter_bases/ec2/ec2_remote_instance.rb
  89. 0 lib/poolparty/net/{remote_bases → remoter_bases}/ec2/ec2_response_object.rb
  90. +119 −0 lib/poolparty/plugins/chef.rb
  91. +12 −11 lib/poolparty/plugins/deploydirectory.rb
  92. +17 −16 lib/poolparty/plugins/git.rb
  93. +0 −77 lib/poolparty/plugins/line.rb
  94. +2 −3 lib/poolparty/plugins/rsyncmirror.rb
  95. +141 −97 lib/poolparty/poolparty/cloud.rb
  96. +2 −2 lib/poolparty/poolparty/custom_resource.rb
  97. +41 −16 lib/poolparty/poolparty/{base.rb → default.rb}
  98. +48 −0 lib/poolparty/poolparty/key.rb
  99. +28 −27 lib/poolparty/poolparty/loggable.rb
  100. +69 −0 lib/poolparty/poolparty/neighborhoods.rb
  101. +39 −19 lib/poolparty/poolparty/plugin.rb
  102. +18 −21 lib/poolparty/poolparty/plugin_model.rb
  103. +23 −24 lib/poolparty/poolparty/pool.rb
  104. +185 −0 lib/poolparty/poolparty/poolparty_base_class.rb
  105. +74 −176 lib/poolparty/poolparty/resource.rb
  106. +0 −112 lib/poolparty/poolparty/resources/class_package.rb
  107. +0 −67 lib/poolparty/poolparty/resources/conditional.rb
  108. +0 −23 lib/poolparty/poolparty/resources/file.rb
  109. +0 −24 lib/poolparty/poolparty/resources/package.rb
  110. +0 −26 lib/poolparty/poolparty/resources/remote_file.rb
  111. +0 −23 lib/poolparty/poolparty/resources/sshkey.rb
  112. +0 −31 lib/poolparty/poolparty/resources/symlink.rb
  113. +0 −32 lib/poolparty/poolparty/resources/variable.rb
  114. +17 −9 lib/poolparty/poolparty/script.rb
  115. +34 −0 lib/poolparty/poolparty/service.rb
  116. +18 −0 lib/poolparty/poolparty/template.rb
  117. +100 −0 lib/poolparty/provision/boot_strapper.rb
  118. +17 −0 lib/poolparty/provision/configurations/chef.rb
  119. +28 −0 lib/poolparty/provision/configurations/puppet.rb
  120. +71 −0 lib/poolparty/provision/dr_configure.rb
  121. +20 −19 lib/poolparty/provisioners/capistrano/capistrano.rb
  122. +20 −13 lib/poolparty/provisioners/capistrano/capistrano_configurer.rb
  123. +21 −0 lib/poolparty/provisioners/capistrano/recipes/aws.rb
  124. +69 −56 lib/poolparty/provisioners/capistrano/{recipies → recipes}/base.rb
  125. +66 −0 lib/poolparty/provisioners/capistrano/recipes/master.rb
  126. +101 −0 lib/poolparty/provisioners/capistrano/recipes/puppet.rb
  127. +5 −9 lib/poolparty/provisioners/capistrano/{recipies → recipes}/slave.rb
  128. +0 −112 lib/poolparty/provisioners/capistrano/recipies/master.rb
  129. +50 −44 lib/poolparty/provisioners/provisioner_base.rb
  130. 0 lib/poolparty/{poolparty → }/resources/cron.rb
  131. +1 −1 lib/poolparty/{poolparty → }/resources/custom_service.rb
  132. +1 −10 lib/poolparty/{poolparty → }/resources/directory.rb
  133. +6 −9 lib/poolparty/{poolparty → }/resources/exec.rb
  134. +25 −0 lib/poolparty/resources/file.rb
  135. +4 −2 lib/poolparty/{poolparty → }/resources/host.rb
  136. +17 −0 lib/poolparty/resources/line.rb
  137. +5 −6 lib/poolparty/{poolparty → }/resources/mount.rb
  138. +12 −0 lib/poolparty/resources/package.rb
  139. +20 −0 lib/poolparty/resources/remote_file.rb
  140. +1 −2 lib/poolparty/{poolparty → }/resources/service.rb
  141. +27 −0 lib/poolparty/resources/sshkey.rb
  142. +21 −0 lib/poolparty/resources/symlink.rb
  143. +1 −5 lib/poolparty/{poolparty/resources/remote_user.rb → resources/user.rb}
  144. +13 −0 lib/poolparty/resources/variable.rb
  145. +64 −0 lib/poolparty/schema.rb
  146. +0 −59 lib/poolparty/server/agent.rb
  147. +46 −0 lib/poolparty/services/conditional.rb
  148. +12 −10 lib/poolparty/{poolparty/resources → services}/gem_package.rb
  149. +2 −5 lib/poolparty/spec.rb
  150. +6 −0 lib/poolparty/templates/erlang_cookie_maker
  151. +11 −0 lib/poolparty/templates/gemrc
  152. +1 −1 lib/poolparty/templates/ha.cf
  153. +0 −28 lib/poolparty/templates/puppet.conf
  154. +6 −0 lib/poolparty/templates/puppet/add_puppet_to_hosts
  155. +2 −0 lib/poolparty/templates/puppet/puppet.conf
  156. +14 −0 lib/poolparty/templates/puppet/puppetrunner
  157. +4 −0 lib/poolparty/templates/puppet/site.pp
  158. +0 −12 lib/poolparty/templates/puppetcleaner
  159. +0 −22 lib/poolparty/templates/puppetrerun
  160. +0 −11 lib/poolparty/templates/puppetrunner
  161. BIN pkg/poolparty-1.0.1.gem
  162. BIN pkg/poolparty.gem
  163. +45 −572 poolparty.gemspec
  164. +1 −1 script/destroy
  165. +1 −1 script/generate
  166. +0 −82 script/txt2html
  167. +7 −0 spec/bin/bin_spec_helper.rb
  168. +19 −0 spec/bin/fixtures/bin_cloud_for_test.rb
  169. +22 −0 spec/bin/server-list-active_spec.rb
  170. +5 −5 spec/poolparty/aska/aska_spec.rb
  171. +2 −8 spec/poolparty/base_packages/haproxy_spec.rb
  172. +3 −26 spec/poolparty/base_packages/heartbeat_spec.rb
  173. +6 −23 spec/poolparty/bin/console_spec.rb
  174. +18 −3 spec/poolparty/core/array_spec.rb
  175. +24 −30 spec/poolparty/core/hash_spec.rb
  176. +2 −3 spec/poolparty/core/object_spec.rb
  177. +1 −27 spec/poolparty/core/string_spec.rb
  178. +11 −0 spec/poolparty/dependencies_spec.rb
  179. +0 −11 spec/poolparty/dependency_resolutions/base_spec.rb
  180. +122 −0 spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb
  181. +16 −0 spec/poolparty/dependency_resolver/dependency_resolver_spec.rb
  182. +120 −0 spec/poolparty/dependency_resolver/puppet_resolver_spec.rb
  183. +9 −5 spec/poolparty/extra/deployments_spec.rb
  184. +1 −0 spec/poolparty/fixtures/test_template.erb
  185. +2 −1 spec/poolparty/helpers/binary_spec.rb
  186. +34 −0 spec/poolparty/helpers/hash_printer_spec.rb
  187. +1 −1 spec/poolparty/helpers/optioner_spec.rb
  188. +27 −0 spec/poolparty/id_rsa
  189. +20 −105 spec/poolparty/modules/cloud_resourcer_spec.rb
  190. +0 −29 spec/poolparty/modules/configurable_spec.rb
  191. +1 −1 spec/poolparty/modules/definable_resource.rb
  192. +5 −5 spec/poolparty/modules/file_writer_spec.rb
  193. +1 −1 spec/poolparty/monitors/base_monitor_spec.rb
  194. +1 −0 spec/poolparty/monitors/monitors/cpu_monitor_spec.rb
  195. +9 −73 spec/poolparty/net/remote_instance_spec.rb
  196. +79 −97 spec/poolparty/net/remote_spec.rb
  197. +3 −59 spec/poolparty/net/remoter_base_spec.rb
  198. +24 −0 spec/poolparty/net/remoter_bases/ec2_mocks_and_stubs.rb
  199. +125 −0 spec/poolparty/net/remoter_bases/ec2_remote_instance_spec.rb
  200. +27 −45 spec/poolparty/net/{remote_bases → remoter_bases}/ec2_spec.rb
  201. +51 −44 spec/poolparty/net/remoter_spec.rb
  202. +7 −0 spec/poolparty/plugins/chef_spec.rb
  203. +51 −52 spec/poolparty/plugins/deploydirectory_spec.rb
  204. +13 −19 spec/poolparty/plugins/git_spec.rb
  205. +12 −8 spec/poolparty/plugins/line_spec.rb
  206. +80 −72 spec/poolparty/poolparty/cloud_spec.rb
  207. +3 −4 spec/poolparty/poolparty/configurers/files/ruby_basic.rb
  208. +7 −23 spec/poolparty/poolparty/configurers/ruby_spec.rb
  209. +2 −43 spec/poolparty/poolparty/custom_resource_spec.rb
  210. +41 −40 spec/poolparty/poolparty/{base_spec.rb → default_spec.rb}
  211. +43 −11 spec/poolparty/poolparty/example_spec.rb
  212. +40 −0 spec/poolparty/poolparty/key_spec.rb
  213. +66 −0 spec/poolparty/poolparty/neighborhoods_spec.rb
  214. +14 −24 spec/poolparty/poolparty/plugin_model_spec.rb
  215. +25 −96 spec/poolparty/poolparty/plugin_spec.rb
  216. +3 −1 spec/poolparty/poolparty/pool_spec.rb
  217. +69 −263 spec/poolparty/poolparty/resource_spec.rb
  218. +0 −120 spec/poolparty/poolparty/resources/class_package_spec.rb
  219. +0 −77 spec/poolparty/poolparty/resources/conditional_spec.rb
  220. +0 −50 spec/poolparty/poolparty/resources/cron_spec.rb
  221. +0 −40 spec/poolparty/poolparty/resources/directory_spec.rb
  222. +0 −37 spec/poolparty/poolparty/resources/exec_spec.rb
  223. +0 −40 spec/poolparty/poolparty/resources/file_spec.rb
  224. +0 −46 spec/poolparty/poolparty/resources/gem_spec.rb
  225. +0 −28 spec/poolparty/poolparty/resources/host_spec.rb
  226. +0 −44 spec/poolparty/poolparty/resources/package_spec.rb
  227. +0 −40 spec/poolparty/poolparty/resources/remote_file_spec.rb
  228. +0 −45 spec/poolparty/poolparty/resources/service_spec.rb
  229. +0 −48 spec/poolparty/poolparty/resources/sshkey_spec.rb
  230. +0 −22 spec/poolparty/poolparty/resources/symlink_spec.rb
  231. +0 −39 spec/poolparty/poolparty/resources/user_spec.rb
  232. +0 −24 spec/poolparty/poolparty/resources/variable_spec.rb
  233. +30 −53 spec/poolparty/poolparty/script_spec.rb
  234. +5 −0 spec/poolparty/poolparty/service_spec.rb
  235. +26 −0 spec/poolparty/poolparty/template_spec.rb
  236. +8 −25 spec/poolparty/poolparty/test_plugins/webserver.rb
  237. +70 −0 spec/poolparty/poolparty_base_class_spec.rb
  238. +4 −4 spec/poolparty/poolparty_spec.rb
  239. +31 −23 spec/poolparty/provisioners/capistrano/capistrano_spec.rb
  240. +5 −1 spec/poolparty/provisioners/provisioner_base_spec.rb
  241. +44 −0 spec/poolparty/resources/cron_spec.rb
  242. +40 −0 spec/poolparty/resources/directory_spec.rb
  243. +37 −0 spec/poolparty/resources/exec_spec.rb
  244. +62 −0 spec/poolparty/resources/file_spec.rb
  245. +7 −0 spec/poolparty/resources/gem_spec.rb
  246. +35 −0 spec/poolparty/resources/host_spec.rb
  247. +29 −0 spec/poolparty/resources/package_spec.rb
  248. +29 −0 spec/poolparty/resources/service_spec.rb
  249. +40 −0 spec/poolparty/resources/sshkey_spec.rb
  250. +29 −0 spec/poolparty/resources/symlink_spec.rb
  251. +48 −0 spec/poolparty/resources/user_spec.rb
  252. +26 −0 spec/poolparty/resources/variable_spec.rb
  253. +53 −0 spec/poolparty/schema_spec.rb
  254. +52 −0 spec/poolparty/services/conditional_spec.rb
  255. +104 −23 spec/poolparty/spec_helper.rb
  256. +13 −0 spec/poolparty/test_spec_helper.rb
  257. +0 −48 tasks/deployment.rake
  258. +76 −69 tasks/development.rake
  259. +53 −0 tasks/poolparty.rake
  260. +41 −39 tasks/server.rake
  261. +0 −17 tasks/website.rake
  262. +1 −0 vendor/gems/dslify
  263. +1 −0 vendor/gems/parenting
  264. +1 −0 vendor/gems/suitcase
  265. +0 −107 website/index.html
  266. +0 −95 website/index.txt
  267. +0 −285 website/javascripts/rounded_corners_lite.inc.js
  268. +0 −29 website/stylesheets/code.css
  269. +0 −147 website/stylesheets/screen.css
  270. +0 −49 website/template.html.erb
View
@@ -1,4 +1,5 @@
-tmp/*
+.com.apple.timemachine.supported
+.DS_Store
*tmp*
pkg/*.tgz
pkg/poolparty*/*
@@ -10,4 +11,9 @@ test_manifest.pp
# erl_crash.dump
*erl_crash.dump*
log
-*.beam
+*.beam
+ri/
+doc/
+config/manifest.pp
+vendor/dependencies/cache
+vendor/dependencies/packages
View
@@ -0,0 +1,9 @@
+[submodule "vendor/gems/parenting"]
+ path = vendor/gems/parenting
+ url = git://github.com/auser/parenting.git
+[submodule "vendor/gems/dslify"]
+ path = vendor/gems/dslify
+ url = git://github.com/auser/dslify.git
+[submodule "vendor/gems/suitcase"]
+ path = vendor/gems/suitcase
+ url = git://github.com/auser/suitcase.git
View
@@ -1,4 +1,4 @@
-Copyright (c) 2008 Ari Lerner
+Copyright (c) 2009 Ari Lerner
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Oops, something went wrong.

0 comments on commit 18ba929

Please sign in to comment.