From 4e682a9a8596326a2d1faab6c44e5a54918c5ba0 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 2 Mar 2014 15:04:26 -0500 Subject: Gemfile.lock --- Gemfile.lock | 10 +++++----- config/application.rb | 2 ++ db/migrate/20140304015610_create_servers.rb | 8 -------- db/migrate/20140304015612_create_tournaments.rb | 9 --------- db/migrate/20140304015615_create_matches.rb | 9 --------- db/migrate/20140304015617_create_teams.rb | 8 -------- db/migrate/20140304015622_create_users.rb | 11 ----------- db/migrate/20140304015624_create_user_team_pairs.rb | 10 ---------- db/migrate/20140304015626_create_team_match_pairs.rb | 10 ---------- db/migrate/20140304015628_create_alerts.rb | 10 ---------- db/migrate/20140304015631_create_pms.rb | 11 ----------- db/migrate/20140304015633_create_games.rb | 13 ------------- db/migrate/20140304015635_create_game_attributes.rb | 11 ----------- db/migrate/20140304015638_create_server_settings.rb | 8 -------- db/migrate/20140304015644_create_tournament_options.rb | 8 -------- db/migrate/20140304015655_create_servers.rb | 8 ++++++++ db/migrate/20140304015657_create_tournaments.rb | 9 +++++++++ db/migrate/20140304015700_create_matches.rb | 9 +++++++++ db/migrate/20140304015702_create_teams.rb | 8 ++++++++ db/migrate/20140304015706_create_users.rb | 11 +++++++++++ db/migrate/20140304015709_create_user_team_pairs.rb | 10 ++++++++++ db/migrate/20140304015711_create_team_match_pairs.rb | 10 ++++++++++ db/migrate/20140304015713_create_alerts.rb | 10 ++++++++++ db/migrate/20140304015715_create_pms.rb | 11 +++++++++++ db/migrate/20140304015718_create_games.rb | 13 +++++++++++++ db/migrate/20140304015720_create_game_attributes.rb | 11 +++++++++++ db/migrate/20140304015722_create_server_settings.rb | 8 ++++++++ db/migrate/20140304015729_create_tournament_options.rb | 8 ++++++++ db/schema.rb | 2 +- log/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 15 --------------- 37 files changed, 134 insertions(+), 147 deletions(-) delete mode 100644 db/migrate/20140304015610_create_servers.rb delete mode 100644 db/migrate/20140304015612_create_tournaments.rb delete mode 100644 db/migrate/20140304015615_create_matches.rb delete mode 100644 db/migrate/20140304015617_create_teams.rb delete mode 100644 db/migrate/20140304015622_create_users.rb delete mode 100644 db/migrate/20140304015624_create_user_team_pairs.rb delete mode 100644 db/migrate/20140304015626_create_team_match_pairs.rb delete mode 100644 db/migrate/20140304015628_create_alerts.rb delete mode 100644 db/migrate/20140304015631_create_pms.rb delete mode 100644 db/migrate/20140304015633_create_games.rb delete mode 100644 db/migrate/20140304015635_create_game_attributes.rb delete mode 100644 db/migrate/20140304015638_create_server_settings.rb delete mode 100644 db/migrate/20140304015644_create_tournament_options.rb create mode 100644 db/migrate/20140304015655_create_servers.rb create mode 100644 db/migrate/20140304015657_create_tournaments.rb create mode 100644 db/migrate/20140304015700_create_matches.rb create mode 100644 db/migrate/20140304015702_create_teams.rb create mode 100644 db/migrate/20140304015706_create_users.rb create mode 100644 db/migrate/20140304015709_create_user_team_pairs.rb create mode 100644 db/migrate/20140304015711_create_team_match_pairs.rb create mode 100644 db/migrate/20140304015713_create_alerts.rb create mode 100644 db/migrate/20140304015715_create_pms.rb create mode 100644 db/migrate/20140304015718_create_games.rb create mode 100644 db/migrate/20140304015720_create_game_attributes.rb create mode 100644 db/migrate/20140304015722_create_server_settings.rb create mode 100644 db/migrate/20140304015729_create_tournament_options.rb delete mode 100644 log/.keep delete mode 100644 test/controllers/.keep delete mode 100644 test/fixtures/.keep delete mode 100644 test/helpers/.keep delete mode 100644 test/integration/.keep delete mode 100644 test/mailers/.keep delete mode 100644 test/models/.keep delete mode 100644 test/test_helper.rb diff --git a/Gemfile.lock b/Gemfile.lock index b47c41e..9dd0199 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,7 +26,7 @@ GEM thread_safe (~> 0.1) tzinfo (~> 0.3.37) arel (4.0.2) - atomic (1.1.14) + atomic (1.1.15) bcrypt-ruby (3.1.2) bootstrap-sass (3.1.1.0) sass (~> 3.2) @@ -115,7 +115,7 @@ GEM multi_json (~> 1.0) rubyzip (< 1.0.0) websocket (~> 1.0.4) - sprockets (2.10.1) + sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -124,13 +124,13 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sqlite3 (1.3.8) + sqlite3 (1.3.9) therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref thor (0.18.1) - thread_safe (0.1.3) - atomic + thread_safe (0.2.0) + atomic (>= 1.1.7, < 2) tilt (1.4.1) treetop (1.4.15) polyglot diff --git a/config/application.rb b/config/application.rb index bf581b8..57c9163 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,6 +12,8 @@ module Leaguer # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. + I18n.enforce_available_locales = true + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. # config.time_zone = 'Central Time (US & Canada)' diff --git a/db/migrate/20140304015610_create_servers.rb b/db/migrate/20140304015610_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140304015610_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/20140304015612_create_tournaments.rb b/db/migrate/20140304015612_create_tournaments.rb deleted file mode 100644 index 36fcf7e..0000000 --- a/db/migrate/20140304015612_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/20140304015615_create_matches.rb b/db/migrate/20140304015615_create_matches.rb deleted file mode 100644 index 6c0c157..0000000 --- a/db/migrate/20140304015615_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/20140304015617_create_teams.rb b/db/migrate/20140304015617_create_teams.rb deleted file mode 100644 index dd8397d..0000000 --- a/db/migrate/20140304015617_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/20140304015622_create_users.rb b/db/migrate/20140304015622_create_users.rb deleted file mode 100644 index f0986d4..0000000 --- a/db/migrate/20140304015622_create_users.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.string :name - t.string :email - t.string :user_name - - t.timestamps - end - end -end diff --git a/db/migrate/20140304015624_create_user_team_pairs.rb b/db/migrate/20140304015624_create_user_team_pairs.rb deleted file mode 100644 index 2c492ac..0000000 --- a/db/migrate/20140304015624_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/20140304015626_create_team_match_pairs.rb b/db/migrate/20140304015626_create_team_match_pairs.rb deleted file mode 100644 index 8fac07e..0000000 --- a/db/migrate/20140304015626_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/20140304015628_create_alerts.rb b/db/migrate/20140304015628_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140304015628_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/20140304015631_create_pms.rb b/db/migrate/20140304015631_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140304015631_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/20140304015633_create_games.rb b/db/migrate/20140304015633_create_games.rb deleted file mode 100644 index 59d4ef0..0000000 --- a/db/migrate/20140304015633_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/20140304015635_create_game_attributes.rb b/db/migrate/20140304015635_create_game_attributes.rb deleted file mode 100644 index b63f134..0000000 --- a/db/migrate/20140304015635_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/20140304015638_create_server_settings.rb b/db/migrate/20140304015638_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140304015638_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/20140304015644_create_tournament_options.rb b/db/migrate/20140304015644_create_tournament_options.rb deleted file mode 100644 index d2df22e..0000000 --- a/db/migrate/20140304015644_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/20140304015655_create_servers.rb b/db/migrate/20140304015655_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140304015655_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/20140304015657_create_tournaments.rb b/db/migrate/20140304015657_create_tournaments.rb new file mode 100644 index 0000000..36fcf7e --- /dev/null +++ b/db/migrate/20140304015657_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/20140304015700_create_matches.rb b/db/migrate/20140304015700_create_matches.rb new file mode 100644 index 0000000..6c0c157 --- /dev/null +++ b/db/migrate/20140304015700_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/20140304015702_create_teams.rb b/db/migrate/20140304015702_create_teams.rb new file mode 100644 index 0000000..dd8397d --- /dev/null +++ b/db/migrate/20140304015702_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/20140304015706_create_users.rb b/db/migrate/20140304015706_create_users.rb new file mode 100644 index 0000000..f0986d4 --- /dev/null +++ b/db/migrate/20140304015706_create_users.rb @@ -0,0 +1,11 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :name + t.string :email + t.string :user_name + + t.timestamps + end + end +end diff --git a/db/migrate/20140304015709_create_user_team_pairs.rb b/db/migrate/20140304015709_create_user_team_pairs.rb new file mode 100644 index 0000000..2c492ac --- /dev/null +++ b/db/migrate/20140304015709_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/20140304015711_create_team_match_pairs.rb b/db/migrate/20140304015711_create_team_match_pairs.rb new file mode 100644 index 0000000..8fac07e --- /dev/null +++ b/db/migrate/20140304015711_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/20140304015713_create_alerts.rb b/db/migrate/20140304015713_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140304015713_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/20140304015715_create_pms.rb b/db/migrate/20140304015715_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140304015715_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/20140304015718_create_games.rb b/db/migrate/20140304015718_create_games.rb new file mode 100644 index 0000000..59d4ef0 --- /dev/null +++ b/db/migrate/20140304015718_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/20140304015720_create_game_attributes.rb b/db/migrate/20140304015720_create_game_attributes.rb new file mode 100644 index 0000000..b63f134 --- /dev/null +++ b/db/migrate/20140304015720_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/20140304015722_create_server_settings.rb b/db/migrate/20140304015722_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140304015722_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/20140304015729_create_tournament_options.rb b/db/migrate/20140304015729_create_tournament_options.rb new file mode 100644 index 0000000..d2df22e --- /dev/null +++ b/db/migrate/20140304015729_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 d44352e..4a44343 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: 20140304015644) do +ActiveRecord::Schema.define(version: 20140304015729) do create_table "alerts", force: true do |t| t.integer "author_id" diff --git a/log/.keep b/log/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/controllers/.keep b/test/controllers/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/fixtures/.keep b/test/fixtures/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/helpers/.keep b/test/helpers/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/integration/.keep b/test/integration/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/mailers/.keep b/test/mailers/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/models/.keep b/test/models/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/test/test_helper.rb b/test/test_helper.rb deleted file mode 100644 index bc7e05d..0000000 --- a/test/test_helper.rb +++ /dev/null @@ -1,15 +0,0 @@ -ENV["RAILS_ENV"] ||= "test" -require File.expand_path('../../config/environment', __FILE__) -require 'rails/test_help' - -class ActiveSupport::TestCase - ActiveRecord::Migration.check_pending! - - # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. - # - # Note: You'll currently still have to declare fixtures explicitly in integration tests - # -- they do not yet inherit this setting - fixtures :all - - # Add more helper methods to be used by all tests here... -end -- cgit v1.2.3-2-g168b