From 256142285eb349d19ea3418dbaaaff41a73eba21 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Apr 2014 20:49:17 -0400 Subject: get changes to generate.sh from master --- generate.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 32eacfa..9d5fb87 100755 --- a/generate.sh +++ b/generate.sh @@ -3,6 +3,23 @@ # The generate.sh bash file is used to generate all of the necessary # .rb files to run the website +# To modify it and update the app do the following: +# 1. Take care of uncommitted files +# 2. Run `git checkout clean2` +# 3. Run `git pull` +# 4. Make any changes to `generate.sh`, and commit them. +# If you have committed the desired changes to 'master', you can do +# this simply with: +# git checkout master generate.sh +# git commit -m 'Get changes to generate.sh from master +# 5. Run `./generate.sh` +# 6. Run `git commit -m 'run ./generate.sh'` +# 7. Run `git checkout master` +# 8. Run `git merge clean2` +# 9. Resolve any merge conflicts. +# 10. Run `git push origin clean2` +# 11. Run `git push origin master` + set -xe # figure out where we are running from -- cgit v1.2.3-2-g168b From 9b9f6ca15bd5523ce1cdcba363c5c88c777e561e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Apr 2014 20:52:56 -0400 Subject: remove the static controller (use the main controller) --- generate.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 9d5fb87..2e576d5 100755 --- a/generate.sh +++ b/generate.sh @@ -71,7 +71,6 @@ bundle exec rails generate migration CreateMatchTeamJoinTable matches teams # Just controllers bundle exec rails generate controller search bundle exec rails generate controller main -bundle exec rails generate controller static # Migrations # By having these separate from the original 'generate', it makes it -- cgit v1.2.3-2-g168b From 933199499f9adfa0347783c538a10b88ffb1b98b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 23 Apr 2014 20:56:43 -0400 Subject: run ./generate.sh --- generate.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 2e576d5..5e6682a 100755 --- a/generate.sh +++ b/generate.sh @@ -29,6 +29,7 @@ cd "$srcdir" export RAILS_ENV=development git rm -rf -- app test config/routes.rb db/migrate || true +git rm -f -- config/initializers/mailboxer.rb || true git checkout clean-start -- app test config/routes.rb bundle install -- cgit v1.2.3-2-g168b From 292bfecd7dd2071f3a0403c75f28e4d50a53a558 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Wed, 23 Apr 2014 21:17:11 -0400 Subject: generate.sh: add game.parent --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 32eacfa..8980139 100755 --- a/generate.sh +++ b/generate.sh @@ -33,7 +33,7 @@ bundle exec rails generate scaffold session user:references token:string:uniq bundle exec rails generate scaffold bracket user:references tournament:references name:string # Just models -bundle exec rails generate model game_setting game:references name:string vartype:integer type_opt:text description:text display_order:integer default:text +bundle exec rails generate model game_setting game:references name:string vartype:integer type_opt:text description:text display_order:integer default:text parent:references bundle exec rails generate model tournament_setting tournament:references name:string vartype:integer type_opt:text description:text display_order:integer value:text bundle exec rails generate model tournament_stage tournament:references scheduling:string structure:text -- cgit v1.2.3-2-g168b From e0d2e72c9c2b7268cf6b7fc52a2d1ce50b53377a Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Wed, 23 Apr 2014 21:30:59 -0400 Subject: add all files in /config in generate.sh --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index b6d4330..923d45e 100755 --- a/generate.sh +++ b/generate.sh @@ -84,4 +84,4 @@ bundle exec rake db:seed find app config -type f -name '*.rb' -exec bin/autoindent {} \; -git add app test config/routes.rb config/initializers db/migrate db/schema.rb Gemfile.lock +git add app test config db/migrate db/schema.rb Gemfile.lock -- cgit v1.2.3-2-g168b From dfba531151d1aa363b2fd0d17bb6ef1da7e02bd4 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Wed, 23 Apr 2014 21:44:10 -0400 Subject: I R DUM --- generate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'generate.sh') diff --git a/generate.sh b/generate.sh index 923d45e..8e29384 100755 --- a/generate.sh +++ b/generate.sh @@ -45,13 +45,13 @@ bundle exec rails generate scaffold team bundle exec rails generate scaffold alert author:references message:text bundle exec rails generate scaffold pm author:references recipient:references message:text bundle exec rails generate scaffold tournament game:references status:integer name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer set_rounds:integer randomized_teams:boolean sampling_method:string -bundle exec rails generate scaffold game name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer set_rounds:integer randomized_teams:boolean sampling_method:string +bundle exec rails generate scaffold game parent:references name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer set_rounds:integer randomized_teams:boolean sampling_method:string bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq bundle exec rails generate scaffold session user:references token:string:uniq bundle exec rails generate scaffold bracket user:references tournament:references name:string # Just models -bundle exec rails generate model game_setting game:references name:string vartype:integer type_opt:text description:text display_order:integer default:text parent:references +bundle exec rails generate model game_setting game:references name:string vartype:integer type_opt:text description:text display_order:integer default:text bundle exec rails generate model tournament_setting tournament:references name:string vartype:integer type_opt:text description:text display_order:integer value:text bundle exec rails generate model tournament_stage tournament:references scheduling:string structure:text -- cgit v1.2.3-2-g168b