Merge remote branch 'upstream/master'

Gemfile

@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '>= 3.0.0'
 
 gem 'bundler', '>= 1.0.0'
+gem "chef"
 
 #Security
 gem 'devise', '1.1.3'

Gemfile.lock

@@ -108,6 +108,7 @@ GEM
     bson (1.1)
     bson_ext (1.1)
     builder (2.1.2)
+    bunny (0.6.0)
     capistrano (2.5.19)
       highline
       net-scp (>= 1.0.0)
@@ -121,6 +122,20 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.3)
+    chef (0.9.12)
+      bunny (>= 0.6.0)
+      erubis
+      extlib
+      highline
+      json (>= 1.4.4, <= 1.4.6)
+      mixlib-authentication (>= 1.1.0)
+      mixlib-cli (>= 1.1.0)
+      mixlib-config (>= 1.1.2)
+      mixlib-log (>= 1.2.0)
+      moneta
+      ohai (>= 0.5.7)
+      rest-client (>= 1.0.4, < 1.7.0)
+      uuidtools
     childprocess (0.1.3)
       ffi (~> 0.6.3)
     columnize (0.3.1)
@@ -148,6 +163,7 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
+    extlib (0.9.15)
     factory_girl (1.3.2)
     factory_girl_rails (1.0)
       factory_girl (~> 1.3)
@@ -175,8 +191,14 @@ GEM
       rest-client
     mini_magick (2.3)
       subexec (~> 0.0.4)
+    mixlib-authentication (1.1.4)
+      mixlib-log
+    mixlib-cli (1.2.0)
+    mixlib-config (1.1.2)
+    mixlib-log (1.2.0)
     mocha (0.9.8)
       rake
+    moneta (0.6.0)
     mongo (1.1)
       bson (>= 1.0.5)
     net-scp (1.0.4)
@@ -187,6 +209,13 @@ GEM
     net-ssh-gateway (1.0.1)
       net-ssh (>= 1.99.1)
     nokogiri (1.4.3.1)
+    ohai (0.5.8)
+      extlib
+      json (>= 1.4.4, <= 1.4.6)
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      systemu
     plucky (0.3.6)
       mongo (~> 1.1)
     polyglot (0.3.1)
@@ -238,6 +267,7 @@ GEM
       json_pure
       rubyzip
     subexec (0.0.4)
+    systemu (1.2.0)
     term-ansicolor (1.0.5)
     thin (1.2.7)
       daemons (>= 1.0.9)
@@ -267,6 +297,7 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   capybara (~> 0.3.9)
   carrierwave!
+  chef
   cucumber-rails (= 0.3.2)
   database_cleaner
   devise (= 1.1.3)

chef/cookbooks/bootstrap/bootstrap.json

+{"recipes": ["bootstrap::default" ] } 

chef/cookbooks/bootstrap/recipes/default.rb

+execute "bundler deps" do
+  command "yum install -y cpio"
+end
+execute "nokogiri deps" do
+  command "yum install -y libxml2-devel libxslt-devel"
+end
+execute "eventmachine deps" do
+  command "yum install -y gcc-c++"
+end
\ No newline at end of file

chef/cookbooks/main/main.json

+{"recipes": ["main::default" ] } 

chef/cookbooks/main/recipes/default.rb

+execute "say hello" do
+  command "echo welcome to diaspora chef"
+end