Merge branch 'clean2'

Conflicts:
	app/controllers/alerts_controller.rb
	app/controllers/application_controller.rb
	app/controllers/matches_controller.rb
	app/controllers/servers_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/models/match.rb
	app/models/team.rb
	app/models/tournament.rb
	app/views/sessions/_form.html.erb
	app/views/sessions/index.html.erb
	app/views/sessions/index.json.jbuilder
	app/views/sessions/show.html.erb
	app/views/sessions/show.json.jbuilder
	app/views/tournaments/index.html.erb
	config/routes.rb
	generate.sh

1 files changed, 10 insertions, 12 deletions

diff --git a/generate.sh b/generate.sh
index 8fc3368..728e122 100755
--- a/generate.sh
+++ b/generate.sh
@@ -1,17 +1,13 @@
 #!/bin/bash
-set -x
 
-# The generate.sh bash file is used to generate all of the necessary .rb files to run the website
-# 
+# The generate.sh bash file is used to generate all of the necessary
+# .rb files to run the website
 
+set -x
 
-# To Start Rails Server:
-#   bundle exec rails server
-#
-# To Clear the Generated Files:
-#   git clean -df
-#
-#NOTEST='--skip-test-unit'
+# figure out where we are running from
+srcdir=$(dirname "$(readlink -f "$0")")
+cd "$srcdir"
 
 git rm -rf app test config/routes.rb db/migrate
 git checkout clean-start -- app test config/routes.rb
@@ -32,7 +28,7 @@ bundle exec rails generate scaffold game \
 	min_teams_per_match:integer max_teams_per_match:integer \
 	set_rounds:integer randomized_teams:boolean
 bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq
-bundle exec rails generate scaffold session user:references
+bundle exec rails generate scaffold session user:references token:string:uniq
 bundle exec rails generate scaffold remote_username game:references user:references user_name:string
 
 # Just models
@@ -56,7 +52,7 @@ bundle exec rails generate controller static $NOTEST
 # Migrations
 # By having these separate from the original 'generate', it makes it
 # not stick these in the views or anything.
-bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string remember_token:string:uniq groups:integer
+bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string permissions:integer
 
 #for the tournament controller to generate options
 #bundle exec rails generate scaffold
@@ -65,4 +61,6 @@ bundle exec rake db:drop RAILS_ENV=development
 bundle exec rake db:migrate RAILS_ENV=development
 bundle exec rake db:seed
 
+find app -type f -name '*.rb' -exec bin/autoindent {} \;
+
 git add app test config/routes.rb db/migrate db/schema.rb