post-rebase clean-up

Author: intuedge

sites/installfest/clean_up.step

@@ -4,10 +4,10 @@ Ok, there is one more step. You won't be using the test applications in the work
 MARKDOWN
 
 step "Delete the apps from Heroku" do
-  message "Go to <https://heroku.com/myapps>, login if needed, and then click on your (lyrical) app name. Scroll to the bottom of the page and click Destroy App. Confirm, and then repeat for the second app."
+  message "Go to <https://heroku.com/myapps>, login if needed, and then click on your first (lyrical) app name. Scroll to the bottom of the page and click Destroy App. Confirm, and then repeat for the second app."
 end
 
-step "Delete the apps from your computer" do
+step "Delete the test_app from your computer" do
   option "Windows" do
     message "From the Explorer, right click on the test_app folder (inside C:\\Sites) and choose Delete."
   end
@@ -17,9 +17,9 @@ step "Delete the apps from your computer" do
   option "Linux" do
     console "rm -rf ~/test_app"
   end
-  
-  option "All" do
+end 
+step "Delete the sticker app from your computer" do
     message "Do the same for the sticker folder."
-  end
+	message "Now you're really done!"
 end
 

sites/installfest/create_and_deploy_a_rails_app.step

@@ -70,7 +70,7 @@ message "In Windows, you may need to let Ruby and Rails communicate through your
 step "Generate a database model" do
 
   option "if your prompt doesn't already show that you are (still) in the test_app folder" do
-    cd test_app
+    console "cd test_app"
   end
 
   console <<-BASH
@@ -90,7 +90,7 @@ end
 step "Use git" do
 
   option "if your prompt doesn't already show that you are (still) in the test_app folder" do
-    cd test_app
+    console "cd test_app"
   end
 
   console <<-BASH

sites/installfest/get_a_sticker.step

@@ -1,8 +1,7 @@
+step "Have a volunteer check your tool versions" do
 
 message "Find a volunteer and have them watch the next steps."
 
-message "If this works - get a sticker from them for your computer!"
-
 verify "tool installation" do
 
   tip "Most of the time, the version numbers don't have to match exactly. In general, if the *first two* numbers match, or if the full number you have is *greater* than the one below, then you're cool."
@@ -37,7 +36,13 @@ verify "tool installation" do
 
 end
 
-Create the "sticker" application do
+message "If this works - proceed to build the sticker app."
+
+end
+
+step "Build the sticker app" do
+
+verify "rails" do
 
 	section "Change to your home directory" do
 	  option "Windows" do
@@ -97,6 +102,7 @@ Your bundle is complete! Use `bundle show [gemname]` to see where a bundled gem
 ==  CreateDrinks: migrated (0.0033s) ==========================================
 "
 
+
   console "rails server"
   result "
 => Booting WEBrick
@@ -265,8 +271,12 @@ You should see the same screen as you did at `http://localhost:3000/drinks` and
 
 end
 
+message "If this works -- find a volunteer and show them"
+
+end
+
 step "Congratulations!" do
-  message "You got a sticker!"
+  message "Show a volunteer -- you get a sticker!"
 end
 
 next_step "clean_up"