Have generate.sh to tricky git stuff, run it

also, stick in a couple of missing 'bundle exec's

19 files changed, 28 insertions, 7 deletions

diff --git a/db/migrate/20140304031800_create_servers.rb b/db/migrate/20140304041637_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304031800_create_servers.rb
+++ b/db/migrate/20140304041637_create_servers.rb
diff --git a/db/migrate/20140304031802_create_tournaments.rb b/db/migrate/20140304041639_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304031802_create_tournaments.rb
+++ b/db/migrate/20140304041639_create_tournaments.rb
diff --git a/db/migrate/20140304031804_create_matches.rb b/db/migrate/20140304041641_create_matches.rb
index 325863d..325863d 100644
--- a/db/migrate/20140304031804_create_matches.rb
+++ b/db/migrate/20140304041641_create_matches.rb
diff --git a/db/migrate/20140304031806_create_teams.rb b/db/migrate/20140304041643_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304031806_create_teams.rb
+++ b/db/migrate/20140304041643_create_teams.rb
diff --git a/db/migrate/20140304031808_create_alerts.rb b/db/migrate/20140304041646_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304031808_create_alerts.rb
+++ b/db/migrate/20140304041646_create_alerts.rb
diff --git a/db/migrate/20140304031810_create_pms.rb b/db/migrate/20140304041648_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304031810_create_pms.rb
+++ b/db/migrate/20140304041648_create_pms.rb
diff --git a/db/migrate/20140304031813_create_games.rb b/db/migrate/20140304041650_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304031813_create_games.rb
+++ b/db/migrate/20140304041650_create_games.rb
diff --git a/db/migrate/20140304031815_create_users.rb b/db/migrate/20140304041652_create_users.rb
index f0986d4..f0986d4 100644
--- a/db/migrate/20140304031815_create_users.rb
+++ b/db/migrate/20140304041652_create_users.rb
diff --git a/db/migrate/20140304031817_create_game_attributes.rb b/db/migrate/20140304041655_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304031817_create_game_attributes.rb
+++ b/db/migrate/20140304041655_create_game_attributes.rb
diff --git a/db/migrate/20140304031819_create_server_settings.rb b/db/migrate/20140304041657_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304031819_create_server_settings.rb
+++ b/db/migrate/20140304041657_create_server_settings.rb
diff --git a/db/migrate/20140304031821_create_user_team_pairs.rb b/db/migrate/20140304041659_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304031821_create_user_team_pairs.rb
+++ b/db/migrate/20140304041659_create_user_team_pairs.rb
diff --git a/db/migrate/20140304031823_create_team_match_pairs.rb b/db/migrate/20140304041701_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304031823_create_team_match_pairs.rb
+++ b/db/migrate/20140304041701_create_team_match_pairs.rb
diff --git a/db/migrate/20140304041711_add_index_to_user_email.rb b/db/migrate/20140304041711_add_index_to_user_email.rb
new file mode 100644
index 0000000..1bc4c56
--- /dev/null
+++ b/db/migrate/20140304041711_add_index_to_user_email.rb
@@ -0,0 +1,4 @@
+class AddIndexToUserEmail < ActiveRecord::Migration
+  def change
+  end
+end
diff --git a/db/migrate/20140304041714_add_index_to_user_name.rb b/db/migrate/20140304041714_add_index_to_user_name.rb
new file mode 100644
index 0000000..a77567b
--- /dev/null
+++ b/db/migrate/20140304041714_add_index_to_user_name.rb
@@ -0,0 +1,4 @@
+class AddIndexToUserName < ActiveRecord::Migration
+  def change
+  end
+end
diff --git a/db/migrate/20140304041716_add_password_digest_to_users.rb b/db/migrate/20140304041716_add_password_digest_to_users.rb
new file mode 100644
index 0000000..0070da7
--- /dev/null
+++ b/db/migrate/20140304041716_add_password_digest_to_users.rb
@@ -0,0 +1,4 @@
+class AddPasswordDigestToUsers < ActiveRecord::Migration
+  def change
+  end
+end
diff --git a/db/migrate/20140304041718_add_remember_token_to_users.rb b/db/migrate/20140304041718_add_remember_token_to_users.rb
new file mode 100644
index 0000000..74c254f
--- /dev/null
+++ b/db/migrate/20140304041718_add_remember_token_to_users.rb
@@ -0,0 +1,4 @@
+class AddRememberTokenToUsers < ActiveRecord::Migration
+  def change
+  end
+end
diff --git a/db/migrate/20140304031834_create_tournament_options.rb b/db/migrate/20140304041720_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304031834_create_tournament_options.rb
+++ b/db/migrate/20140304041720_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index a9bd57b..eb44d71 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140304031834) do
+ActiveRecord::Schema.define(version: 20140304041720) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
diff --git a/generate.sh b/generate.sh
index c678448..bf980f3 100755
--- a/generate.sh
+++ b/generate.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 # The generate.sh bash file is used to generate all of the necessary .rb files to run the website
 # 
@@ -12,7 +13,9 @@
 #
 #NOTEST='--skip-test-unit'
 
-set -x
+git rm -rf app test config/routes.rb db/migrate
+git checkout clean-start -- app test config/routes.rb
+
 bundle exec rails generate scaffold server --force $NOTEST
 bundle exec rails generate scaffold tournament game:references $NOTEST
 bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST
@@ -34,15 +37,17 @@ bundle exec rails generate controller sessions
 
 #added some stuff to the database
 
-rails generate migration add_index_to_user_email
-rails generate migration add_index_to_user_name
-rails generate migration add_password_digest_to_users
-rails generate migration add_remember_token_to_users
+bundle exec rails generate migration add_index_to_user_email
+bundle exec rails generate migration add_index_to_user_name
+bundle exec rails generate migration add_password_digest_to_users
+bundle exec rails generate migration add_remember_token_to_users
 
 #for the tournament controller to generate options
 bundle exec rails generate model tournament_option $NOTEST
+#bundle exec rails generate scaffold
+
+git add app test config/routes.rb db/migrate db/schema.rb
 
 bundle exec rake db:drop RAILS_ENV=development
 bundle exec rake db:migrate RAILS_ENV=development
 bundle exec rake db:seed
-#bundle exec rails generate scaffold