From ae3b9a846a1a08865bc8fe2f38a24bbb01e8622c Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sat, 1 Mar 2014 19:59:36 -0500 Subject: Made the start script sent 2> to a file called server.talk for later reference. --- db/migrate/20140304015327_create_servers.rb | 8 -------- db/migrate/20140304015329_create_tournaments.rb | 9 --------- db/migrate/20140304015331_create_matches.rb | 9 --------- db/migrate/20140304015334_create_teams.rb | 8 -------- db/migrate/20140304015336_create_users.rb | 11 ----------- db/migrate/20140304015338_create_user_team_pairs.rb | 10 ---------- db/migrate/20140304015340_create_team_match_pairs.rb | 10 ---------- db/migrate/20140304015342_create_alerts.rb | 10 ---------- db/migrate/20140304015344_create_pms.rb | 11 ----------- db/migrate/20140304015347_create_games.rb | 13 ------------- db/migrate/20140304015349_create_game_attributes.rb | 11 ----------- db/migrate/20140304015351_create_server_settings.rb | 8 -------- db/migrate/20140304015357_create_tournament_options.rb | 8 -------- db/migrate/20140304015407_create_servers.rb | 8 ++++++++ db/migrate/20140304015409_create_tournaments.rb | 9 +++++++++ db/migrate/20140304015412_create_matches.rb | 9 +++++++++ db/migrate/20140304015414_create_teams.rb | 8 ++++++++ db/migrate/20140304015416_create_users.rb | 11 +++++++++++ db/migrate/20140304015418_create_user_team_pairs.rb | 10 ++++++++++ db/migrate/20140304015420_create_team_match_pairs.rb | 10 ++++++++++ db/migrate/20140304015422_create_alerts.rb | 10 ++++++++++ db/migrate/20140304015425_create_pms.rb | 11 +++++++++++ db/migrate/20140304015427_create_games.rb | 13 +++++++++++++ db/migrate/20140304015429_create_game_attributes.rb | 11 +++++++++++ db/migrate/20140304015431_create_server_settings.rb | 8 ++++++++ db/migrate/20140304015437_create_tournament_options.rb | 8 ++++++++ db/schema.rb | 2 +- start.sh | 2 +- 28 files changed, 128 insertions(+), 128 deletions(-) delete mode 100644 db/migrate/20140304015327_create_servers.rb delete mode 100644 db/migrate/20140304015329_create_tournaments.rb delete mode 100644 db/migrate/20140304015331_create_matches.rb delete mode 100644 db/migrate/20140304015334_create_teams.rb delete mode 100644 db/migrate/20140304015336_create_users.rb delete mode 100644 db/migrate/20140304015338_create_user_team_pairs.rb delete mode 100644 db/migrate/20140304015340_create_team_match_pairs.rb delete mode 100644 db/migrate/20140304015342_create_alerts.rb delete mode 100644 db/migrate/20140304015344_create_pms.rb delete mode 100644 db/migrate/20140304015347_create_games.rb delete mode 100644 db/migrate/20140304015349_create_game_attributes.rb delete mode 100644 db/migrate/20140304015351_create_server_settings.rb delete mode 100644 db/migrate/20140304015357_create_tournament_options.rb create mode 100644 db/migrate/20140304015407_create_servers.rb create mode 100644 db/migrate/20140304015409_create_tournaments.rb create mode 100644 db/migrate/20140304015412_create_matches.rb create mode 100644 db/migrate/20140304015414_create_teams.rb create mode 100644 db/migrate/20140304015416_create_users.rb create mode 100644 db/migrate/20140304015418_create_user_team_pairs.rb create mode 100644 db/migrate/20140304015420_create_team_match_pairs.rb create mode 100644 db/migrate/20140304015422_create_alerts.rb create mode 100644 db/migrate/20140304015425_create_pms.rb create mode 100644 db/migrate/20140304015427_create_games.rb create mode 100644 db/migrate/20140304015429_create_game_attributes.rb create mode 100644 db/migrate/20140304015431_create_server_settings.rb create mode 100644 db/migrate/20140304015437_create_tournament_options.rb diff --git a/db/migrate/20140304015327_create_servers.rb b/db/migrate/20140304015327_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140304015327_create_servers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015329_create_tournaments.rb b/db/migrate/20140304015329_create_tournaments.rb deleted file mode 100644 index 36fcf7e..0000000 --- a/db/migrate/20140304015329_create_tournaments.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.references :game, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015331_create_matches.rb b/db/migrate/20140304015331_create_matches.rb deleted file mode 100644 index 6c0c157..0000000 --- a/db/migrate/20140304015331_create_matches.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.references :tournament, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015334_create_teams.rb b/db/migrate/20140304015334_create_teams.rb deleted file mode 100644 index dd8397d..0000000 --- a/db/migrate/20140304015334_create_teams.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015336_create_users.rb b/db/migrate/20140304015336_create_users.rb deleted file mode 100644 index 6a500e5..0000000 --- a/db/migrate/20140304015336_create_users.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.text :name - t.text :pw_hash - t.integer :groups - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015338_create_user_team_pairs.rb b/db/migrate/20140304015338_create_user_team_pairs.rb deleted file mode 100644 index 2c492ac..0000000 --- a/db/migrate/20140304015338_create_user_team_pairs.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateUserTeamPairs < ActiveRecord::Migration - def change - create_table :user_team_pairs do |t| - t.references :user, index: true - t.references :team, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015340_create_team_match_pairs.rb b/db/migrate/20140304015340_create_team_match_pairs.rb deleted file mode 100644 index 8fac07e..0000000 --- a/db/migrate/20140304015340_create_team_match_pairs.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateTeamMatchPairs < ActiveRecord::Migration - def change - create_table :team_match_pairs do |t| - t.references :team, index: true - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015342_create_alerts.rb b/db/migrate/20140304015342_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140304015342_create_alerts.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateAlerts < ActiveRecord::Migration - def change - create_table :alerts do |t| - t.references :author, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015344_create_pms.rb b/db/migrate/20140304015344_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140304015344_create_pms.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreatePms < ActiveRecord::Migration - def change - create_table :pms do |t| - t.references :author, index: true - t.references :recipient, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015347_create_games.rb b/db/migrate/20140304015347_create_games.rb deleted file mode 100644 index 59d4ef0..0000000 --- a/db/migrate/20140304015347_create_games.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.text :name - t.integer :players_per_team - t.integer :teams_per_match - t.integer :set_rounds - t.integer :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015349_create_game_attributes.rb b/db/migrate/20140304015349_create_game_attributes.rb deleted file mode 100644 index b63f134..0000000 --- a/db/migrate/20140304015349_create_game_attributes.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateGameAttributes < ActiveRecord::Migration - def change - create_table :game_attributes do |t| - t.references :game, index: true - t.text :key - t.integer :type - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015351_create_server_settings.rb b/db/migrate/20140304015351_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140304015351_create_server_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServerSettings < ActiveRecord::Migration - def change - create_table :server_settings do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015357_create_tournament_options.rb b/db/migrate/20140304015357_create_tournament_options.rb deleted file mode 100644 index d2df22e..0000000 --- a/db/migrate/20140304015357_create_tournament_options.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentOptions < ActiveRecord::Migration - def change - create_table :tournament_options do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015407_create_servers.rb b/db/migrate/20140304015407_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140304015407_create_servers.rb @@ -0,0 +1,8 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015409_create_tournaments.rb b/db/migrate/20140304015409_create_tournaments.rb new file mode 100644 index 0000000..36fcf7e --- /dev/null +++ b/db/migrate/20140304015409_create_tournaments.rb @@ -0,0 +1,9 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.references :game, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015412_create_matches.rb b/db/migrate/20140304015412_create_matches.rb new file mode 100644 index 0000000..6c0c157 --- /dev/null +++ b/db/migrate/20140304015412_create_matches.rb @@ -0,0 +1,9 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.references :tournament, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015414_create_teams.rb b/db/migrate/20140304015414_create_teams.rb new file mode 100644 index 0000000..dd8397d --- /dev/null +++ b/db/migrate/20140304015414_create_teams.rb @@ -0,0 +1,8 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015416_create_users.rb b/db/migrate/20140304015416_create_users.rb new file mode 100644 index 0000000..6a500e5 --- /dev/null +++ b/db/migrate/20140304015416_create_users.rb @@ -0,0 +1,11 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.text :name + t.text :pw_hash + t.integer :groups + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015418_create_user_team_pairs.rb b/db/migrate/20140304015418_create_user_team_pairs.rb new file mode 100644 index 0000000..2c492ac --- /dev/null +++ b/db/migrate/20140304015418_create_user_team_pairs.rb @@ -0,0 +1,10 @@ +class CreateUserTeamPairs < ActiveRecord::Migration + def change + create_table :user_team_pairs do |t| + t.references :user, index: true + t.references :team, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015420_create_team_match_pairs.rb b/db/migrate/20140304015420_create_team_match_pairs.rb new file mode 100644 index 0000000..8fac07e --- /dev/null +++ b/db/migrate/20140304015420_create_team_match_pairs.rb @@ -0,0 +1,10 @@ +class CreateTeamMatchPairs < ActiveRecord::Migration + def change + create_table :team_match_pairs do |t| + t.references :team, index: true + t.references :match, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015422_create_alerts.rb b/db/migrate/20140304015422_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140304015422_create_alerts.rb @@ -0,0 +1,10 @@ +class CreateAlerts < ActiveRecord::Migration + def change + create_table :alerts do |t| + t.references :author, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015425_create_pms.rb b/db/migrate/20140304015425_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140304015425_create_pms.rb @@ -0,0 +1,11 @@ +class CreatePms < ActiveRecord::Migration + def change + create_table :pms do |t| + t.references :author, index: true + t.references :recipient, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015427_create_games.rb b/db/migrate/20140304015427_create_games.rb new file mode 100644 index 0000000..59d4ef0 --- /dev/null +++ b/db/migrate/20140304015427_create_games.rb @@ -0,0 +1,13 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.text :name + t.integer :players_per_team + t.integer :teams_per_match + t.integer :set_rounds + t.integer :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015429_create_game_attributes.rb b/db/migrate/20140304015429_create_game_attributes.rb new file mode 100644 index 0000000..b63f134 --- /dev/null +++ b/db/migrate/20140304015429_create_game_attributes.rb @@ -0,0 +1,11 @@ +class CreateGameAttributes < ActiveRecord::Migration + def change + create_table :game_attributes do |t| + t.references :game, index: true + t.text :key + t.integer :type + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015431_create_server_settings.rb b/db/migrate/20140304015431_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140304015431_create_server_settings.rb @@ -0,0 +1,8 @@ +class CreateServerSettings < ActiveRecord::Migration + def change + create_table :server_settings do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015437_create_tournament_options.rb b/db/migrate/20140304015437_create_tournament_options.rb new file mode 100644 index 0000000..d2df22e --- /dev/null +++ b/db/migrate/20140304015437_create_tournament_options.rb @@ -0,0 +1,8 @@ +class CreateTournamentOptions < ActiveRecord::Migration + def change + create_table :tournament_options do |t| + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 445f943..f970bd1 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: 20140304015357) do +ActiveRecord::Schema.define(version: 20140304015437) do create_table "alerts", force: true do |t| t.integer "author_id" diff --git a/start.sh b/start.sh index c03361e..01b7f72 100755 --- a/start.sh +++ b/start.sh @@ -1,5 +1,5 @@ #!/bin/bash generate.sh -bundle exec rails server & +bundle exec rails server 2> server.talk & -- cgit v1.2.3