From d55b94f83cd6a161d47b622e68c11bfdf09d1bbc Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 01:26:20 -0400 Subject: tidy up --- generate.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 68504b0..9541184 100755 --- a/generate.sh +++ b/generate.sh @@ -9,9 +9,13 @@ set -xe srcdir=$(dirname "$(readlink -f "$0")") cd "$srcdir" +export RAILS_ENV=development + git rm -rf -- app test config/routes.rb db/migrate || true git checkout clean-start -- app test config/routes.rb +bundle install + bundle exec rails generate simple_captcha bundle exec rails generate delayed_job:active_record @@ -60,10 +64,10 @@ bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string #for the tournament controller to generate options #bundle exec rails generate scaffold -bundle exec rake db:drop RAILS_ENV=development -bundle exec rake db:migrate RAILS_ENV=development +bundle exec rake db:drop +bundle exec rake db:migrate 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 +git add app test config/routes.rb db/migrate db/schema.rb Gemfile.lock -- cgit v1.2.3-2-g168b From 6d2baadfa051d6d08ade980e2d4603ca7c154e4a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 01:26:41 -0400 Subject: generate.sh: s/preference/setting/ --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 9541184..5a98b41 100755 --- a/generate.sh +++ b/generate.sh @@ -41,7 +41,7 @@ bundle exec rails generate scaffold bracket user:references tournament:reference # Just models bundle exec rails generate model server_setting bundle exec rails generate model game_setting game:references stype:integer name:string default:text description:text type_opt:text display_order:integer -bundle exec rails generate model tournament_preference tournament:references vartype:integer name:string value:text +bundle exec rails generate model tournament_setting tournament:references vartype:integer name:string value:text bundle exec rails generate model score user:references match:references value:integer bundle exec rails generate model remote_username game:references user:references json_value:text bundle exec rails generate model bracket_match bracket:references match:references predicted_winner:references -- cgit v1.2.3-2-g168b From a09778072023f08bfbc8987881be9f05965496c1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 Apr 2014 09:59:19 -0400 Subject: generate.sh: add api_requests for managing throttling --- generate.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 5a98b41..059d3f8 100755 --- a/generate.sh +++ b/generate.sh @@ -45,6 +45,8 @@ bundle exec rails generate model tournament_setting tournament:references vartyp bundle exec rails generate model score user:references match:references value:integer bundle exec rails generate model remote_username game:references user:references json_value:text bundle exec rails generate model bracket_match bracket:references match:references predicted_winner:references +bundle exec rails generate model api_requests api_name:string + # Join tables bundle exec rails generate migration CreateTournamentPlayersJoinTable players tournaments bundle exec rails generate migration CreateTournamentHostsJoinTable hosts tournaments -- cgit v1.2.3-2-g168b