From 932944ffc98b54467427b575d25ee876df1c6a66 Mon Sep 17 00:00:00 2001 From: "R.J. Osborne" Date: Thu, 14 May 2015 19:47:28 -0400 Subject: [PATCH 1/5] Added Dockerfile --- Dockerfile | 26 ++++++++++++++++++++++++++ Gemfile | 6 +----- 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..0de91bc --- /dev/null +++ b/Dockerfile @@ -0,0 +1,26 @@ +FROM ruby:2.2.2 + +RUN apt-get update && apt-get upgrade -y && apt-get install -y build-essential +RUN apt-get install -y nodejs + +ENV APP_HOME /wrestlingApp +ENV PORT 3000 + +RUN mkdir $APP_HOME + +WORKDIR $APP_HOME + +ADD Gemfile* $APP_HOME/ +RUN bundle install + +ADD . $APP_HOME + +RUN rake db:migrate RAILS_ENV=test +RUN rake db:migrate RAILS_ENV=development +RUN rake db:seed +RUN rake test + +#CMD rails s puma --binding 0.0.0.0 +CMD bundle exec passenger start -p $PORT --max-pool-size 3 + +EXPOSE 3000 diff --git a/Gemfile b/Gemfile index d82244f..a739fe8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.2.0' +ruby '2.2.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.0' @@ -55,7 +55,3 @@ gem 'spring', group: :development group :development do gem 'puma' end - - - - From f54937e9feccd92f28e4d56416efc744e650b695 Mon Sep 17 00:00:00 2001 From: "R.J. Osborne" Date: Thu, 14 May 2015 20:03:06 -0400 Subject: [PATCH 2/5] Fixed deprecation warnings from migrations --- db/migrate/20131231134936_create_schools.rb | 2 +- db/migrate/20131231134955_create_weights.rb | 2 +- db/migrate/20131231135039_create_wrestlers.rb | 2 +- db/migrate/20140120175252_create_tournaments.rb | 2 +- db/migrate/20140122030856_devise_create_users.rb | 2 +- db/migrate/20140124174110_create_matches.rb | 2 +- db/migrate/20140125065007_create_mats.rb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/db/migrate/20131231134936_create_schools.rb b/db/migrate/20131231134936_create_schools.rb index 3849f8d..eb0a252 100644 --- a/db/migrate/20131231134936_create_schools.rb +++ b/db/migrate/20131231134936_create_schools.rb @@ -4,7 +4,7 @@ class CreateSchools < ActiveRecord::Migration t.string :name t.integer :score - t.timestamps + t.timestamps null: true end end end diff --git a/db/migrate/20131231134955_create_weights.rb b/db/migrate/20131231134955_create_weights.rb index e3e29ef..d082d7b 100644 --- a/db/migrate/20131231134955_create_weights.rb +++ b/db/migrate/20131231134955_create_weights.rb @@ -3,7 +3,7 @@ class CreateWeights < ActiveRecord::Migration create_table :weights do |t| t.integer :max - t.timestamps + t.timestamps null: true end end end diff --git a/db/migrate/20131231135039_create_wrestlers.rb b/db/migrate/20131231135039_create_wrestlers.rb index 754b75c..77aa744 100644 --- a/db/migrate/20131231135039_create_wrestlers.rb +++ b/db/migrate/20131231135039_create_wrestlers.rb @@ -7,7 +7,7 @@ class CreateWrestlers < ActiveRecord::Migration t.integer :seed t.integer :original_seed - t.timestamps + t.timestamps null: true end end end diff --git a/db/migrate/20140120175252_create_tournaments.rb b/db/migrate/20140120175252_create_tournaments.rb index 1952d5f..3bbcb9b 100644 --- a/db/migrate/20140120175252_create_tournaments.rb +++ b/db/migrate/20140120175252_create_tournaments.rb @@ -6,7 +6,7 @@ class CreateTournaments < ActiveRecord::Migration t.string :director t.string :director_email - t.timestamps + t.timestamps null: true end end end diff --git a/db/migrate/20140122030856_devise_create_users.rb b/db/migrate/20140122030856_devise_create_users.rb index ab71c3d..6e5e27c 100644 --- a/db/migrate/20140122030856_devise_create_users.rb +++ b/db/migrate/20140122030856_devise_create_users.rb @@ -31,7 +31,7 @@ class DeviseCreateUsers < ActiveRecord::Migration # t.datetime :locked_at - t.timestamps + t.timestamps null: true end add_index :users, :email, :unique => true diff --git a/db/migrate/20140124174110_create_matches.rb b/db/migrate/20140124174110_create_matches.rb index fb24169..c6023dd 100644 --- a/db/migrate/20140124174110_create_matches.rb +++ b/db/migrate/20140124174110_create_matches.rb @@ -9,7 +9,7 @@ class CreateMatches < ActiveRecord::Migration t.string :win_type t.string :score - t.timestamps + t.timestamps null: true end end end diff --git a/db/migrate/20140125065007_create_mats.rb b/db/migrate/20140125065007_create_mats.rb index 8dadf67..27ac2e0 100644 --- a/db/migrate/20140125065007_create_mats.rb +++ b/db/migrate/20140125065007_create_mats.rb @@ -4,7 +4,7 @@ class CreateMats < ActiveRecord::Migration t.string :name t.integer :tournament_id - t.timestamps + t.timestamps null: true end end end From f6dd4e86250c90e96a62c83dac6effc15f10be59 Mon Sep 17 00:00:00 2001 From: "R.J. Osborne" Date: Sun, 17 May 2015 08:13:52 -0400 Subject: [PATCH 3/5] Renamed boutNumber to bout_number to make the field consistent with the rest of the domain and database schema. --- app/models/boutgen.rb | 2 +- app/models/losernamegen.rb | 28 +++++++++---------- app/models/wrestler.rb | 2 +- .../_fourPoolQuarterBracket.html.erb | 14 +++++----- .../_fourPoolSemiBracket.html.erb | 12 ++++---- .../_twoPoolFinalBracket.html.erb | 4 +-- .../static_pages/_twoPoolSemiBracket.html.erb | 6 ++-- app/views/static_pages/up_matches.html.erb | 2 +- .../201505170715923_rename_bout_number.rb | 5 ++++ db/schema.rb | 2 +- test/integration/poolbracket_matchups_test.rb | 8 +++--- 11 files changed, 45 insertions(+), 40 deletions(-) create mode 100644 db/migrate/201505170715923_rename_bout_number.rb diff --git a/app/models/boutgen.rb b/app/models/boutgen.rb index 651155b..12a0176 100644 --- a/app/models/boutgen.rb +++ b/app/models/boutgen.rb @@ -8,7 +8,7 @@ class Boutgen @matches = matches.sort_by{|x|[x.weight_max]} @matches.each_with_index do |m, i| @bout = m.round * 1000 + i - m.boutNumber = @bout + m.bout_number = @bout end return @matches end diff --git a/app/models/losernamegen.rb b/app/models/losernamegen.rb index 0f939f0..fae2f90 100644 --- a/app/models/losernamegen.rb +++ b/app/models/losernamegen.rb @@ -17,8 +17,8 @@ class Losernamegen @match1 = matches.select{|m| m.loser1_name == "Winner Pool 1"}.first @match2 = matches.select{|m| m.loser1_name == "Winner Pool 2"}.first @matchChange = matches.select{|m| m.bracket_position == "3/4"}.first - @matchChange.loser1_name = "Loser of #{@match1.boutNumber}" - @matchChange.loser2_name = "Loser of #{@match2.boutNumber}" + @matchChange.loser1_name = "Loser of #{@match1.bout_number}" + @matchChange.loser2_name = "Loser of #{@match2.bout_number}" end def fourPoolsToQuarterLoser(matches) @@ -29,18 +29,18 @@ class Losernamegen @seventhEighth = matches.select{|m| m.bracket_position == "7/8"}.first @consoSemis.each do |match| if match.bracket_position_number == 1 - match.loser1_name = "Loser of #{@quarters.select{|m| m.bracket_position_number == 1}.first.boutNumber}" - match.loser2_name = "Loser of #{@quarters.select{|m| m.bracket_position_number == 2}.first.boutNumber}" + match.loser1_name = "Loser of #{@quarters.select{|m| m.bracket_position_number == 1}.first.bout_number}" + match.loser2_name = "Loser of #{@quarters.select{|m| m.bracket_position_number == 2}.first.bout_number}" elsif match.bracket_position_number == 2 - match.loser1_name = "Loser of #{@quarters.select{|m| m.bracket_position_number == 3}.first.boutNumber}" - match.loser2_name = "Loser of #{@quarters.select{|m| m.bracket_position_number == 4}.first.boutNumber}" + match.loser1_name = "Loser of #{@quarters.select{|m| m.bracket_position_number == 3}.first.bout_number}" + match.loser2_name = "Loser of #{@quarters.select{|m| m.bracket_position_number == 4}.first.bout_number}" end end - @thirdFourth.loser1_name = "Loser of #{@semis.select{|m| m.bracket_position_number == 1}.first.boutNumber}" - @thirdFourth.loser2_name = "Loser of #{@semis.select{|m| m.bracket_position_number == 2}.first.boutNumber}" + @thirdFourth.loser1_name = "Loser of #{@semis.select{|m| m.bracket_position_number == 1}.first.bout_number}" + @thirdFourth.loser2_name = "Loser of #{@semis.select{|m| m.bracket_position_number == 2}.first.bout_number}" @consoSemis = matches.select{|m| m.bracket_position == "Conso Semis"} - @seventhEighth.loser1_name = "Loser of #{@consoSemis.select{|m| m.bracket_position_number == 1}.first.boutNumber}" - @seventhEighth.loser2_name = "Loser of #{@consoSemis.select{|m| m.bracket_position_number == 2}.first.boutNumber}" + @seventhEighth.loser1_name = "Loser of #{@consoSemis.select{|m| m.bracket_position_number == 1}.first.bout_number}" + @seventhEighth.loser2_name = "Loser of #{@consoSemis.select{|m| m.bracket_position_number == 2}.first.bout_number}" end def fourPoolsToSemiLoser(matches) @@ -48,9 +48,9 @@ class Losernamegen @thirdFourth = matches.select{|m| m.bracket_position == "3/4"}.first @consoSemis = matches.select{|m| m.bracket_position == "Conso Semis"} @seventhEighth = matches.select{|m| m.bracket_position == "7/8"}.first - @thirdFourth.loser1_name = "Loser of #{@semis.select{|m| m.bracket_position_number == 1}.first.boutNumber}" - @thirdFourth.loser2_name = "Loser of #{@semis.select{|m| m.bracket_position_number == 2}.first.boutNumber}" - @seventhEighth.loser1_name = "Loser of #{@consoSemis.select{|m| m.bracket_position_number == 1}.first.boutNumber}" - @seventhEighth.loser2_name = "Loser of #{@consoSemis.select{|m| m.bracket_position_number == 2}.first.boutNumber}" + @thirdFourth.loser1_name = "Loser of #{@semis.select{|m| m.bracket_position_number == 1}.first.bout_number}" + @thirdFourth.loser2_name = "Loser of #{@semis.select{|m| m.bracket_position_number == 2}.first.bout_number}" + @seventhEighth.loser1_name = "Loser of #{@consoSemis.select{|m| m.bracket_position_number == 1}.first.bout_number}" + @seventhEighth.loser2_name = "Loser of #{@consoSemis.select{|m| m.bracket_position_number == 2}.first.bout_number}" end end \ No newline at end of file diff --git a/app/models/wrestler.rb b/app/models/wrestler.rb index 391b0da..80f8fe2 100644 --- a/app/models/wrestler.rb +++ b/app/models/wrestler.rb @@ -27,7 +27,7 @@ class Wrestler < ActiveRecord::Base if @match.blank? return "BYE" else - return @match.boutNumber + return @match.bout_number end end diff --git a/app/views/static_pages/_fourPoolQuarterBracket.html.erb b/app/views/static_pages/_fourPoolQuarterBracket.html.erb index 6bbe600..9a629f5 100644 --- a/app/views/static_pages/_fourPoolQuarterBracket.html.erb +++ b/app/views/static_pages/_fourPoolQuarterBracket.html.erb @@ -66,7 +66,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -78,7 +78,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -90,7 +90,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -115,7 +115,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -140,7 +140,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -152,7 +152,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -177,7 +177,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • diff --git a/app/views/static_pages/_fourPoolSemiBracket.html.erb b/app/views/static_pages/_fourPoolSemiBracket.html.erb index 476b914..c6a71de 100644 --- a/app/views/static_pages/_fourPoolSemiBracket.html.erb +++ b/app/views/static_pages/_fourPoolSemiBracket.html.erb @@ -66,7 +66,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -78,7 +78,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -104,7 +104,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -131,7 +131,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -143,7 +143,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -168,7 +168,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • diff --git a/app/views/static_pages/_twoPoolFinalBracket.html.erb b/app/views/static_pages/_twoPoolFinalBracket.html.erb index 6604bf4..2d5d0ab 100644 --- a/app/views/static_pages/_twoPoolFinalBracket.html.erb +++ b/app/views/static_pages/_twoPoolFinalBracket.html.erb @@ -66,7 +66,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -90,7 +90,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • diff --git a/app/views/static_pages/_twoPoolSemiBracket.html.erb b/app/views/static_pages/_twoPoolSemiBracket.html.erb index 413745e..4b839ef 100644 --- a/app/views/static_pages/_twoPoolSemiBracket.html.erb +++ b/app/views/static_pages/_twoPoolSemiBracket.html.erb @@ -66,7 +66,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -78,7 +78,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • @@ -104,7 +104,7 @@ li.game{
  •  
  • <%= match.w1_name %> Score
    • -
  • <%= match.boutNumber %>  
    • +
  • <%= match.bout_number %>  
  • <%= match.w2_name %>Score
  •  
    • diff --git a/app/views/static_pages/up_matches.html.erb b/app/views/static_pages/up_matches.html.erb index 3a5f712..ccf7276 100644 --- a/app/views/static_pages/up_matches.html.erb +++ b/app/views/static_pages/up_matches.html.erb @@ -23,7 +23,7 @@ <% @matches.each.map do |m| %> Round <%= m.round %> - <%= m.boutNumber %> + <%= m.bout_number %> <%= m.weight_max %> lbs <%= m.w1_name %> vs. <%= m.w2_name %> diff --git a/db/migrate/201505170715923_rename_bout_number.rb b/db/migrate/201505170715923_rename_bout_number.rb new file mode 100644 index 0000000..11065d4 --- /dev/null +++ b/db/migrate/201505170715923_rename_bout_number.rb @@ -0,0 +1,5 @@ +class RenameBoutNumber < ActiveRecord::Migration + def change + rename_column :matches, :boutNumber, :bout_number + end +end diff --git a/db/schema.rb b/db/schema.rb index 1dd957b..dc07353 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -26,7 +26,7 @@ ActiveRecord::Schema.define(version: 20150427163818) do t.integer "tournament_id" t.integer "round" t.integer "finished" - t.integer "boutNumber" + t.integer "bout_number" t.integer "weight_id" t.string "bracket_position" t.integer "bracket_position_number" diff --git a/test/integration/poolbracket_matchups_test.rb b/test/integration/poolbracket_matchups_test.rb index 3078502..3ddcafd 100644 --- a/test/integration/poolbracket_matchups_test.rb +++ b/test/integration/poolbracket_matchups_test.rb @@ -70,14 +70,14 @@ class PoolbracketMatchupsTest < ActionDispatch::IntegrationTest refute_nil @tournament end - test "tests boutNumber matches round" do - @matchup_to_test = @genMatchups.select{|m| m.boutNumber == 4000}.first + test "tests bout_number matches round" do + @matchup_to_test = @genMatchups.select{|m| m.bout_number == 4000}.first assert_equal 4, @matchup_to_test.round end - test "tests boutNumbers are generated with smallest weight first regardless of id" do + test "tests bout_numbers are generated with smallest weight first regardless of id" do @weight = @tournament.weights.map.sort_by{|x|[x.max]}.first - @matchup = @genMatchups.select{|m| m.boutNumber == 1000}.first + @matchup = @genMatchups.select{|m| m.bout_number == 1000}.first assert_equal @weight.max, @matchup.weight_max end From 5b411a2311ae90e475f6341919ff607d8bbeb814 Mon Sep 17 00:00:00 2001 From: "R.J. Osborne" Date: Sun, 17 May 2015 09:40:15 -0400 Subject: [PATCH 4/5] Updated README instructions and fixed filename of my migration --- README.rdoc | 12 +++++++++++- ...umber.rb => 20150517075923_rename_bout_number.rb} | 0 2 files changed, 11 insertions(+), 1 deletion(-) rename db/migrate/{201505170715923_rename_bout_number.rb => 20150517075923_rename_bout_number.rb} (100%) diff --git a/README.rdoc b/README.rdoc index 5cad162..2999797 100644 --- a/README.rdoc +++ b/README.rdoc @@ -8,7 +8,7 @@ Heroku production: Development details: -* Ruby 2.2.0 +* Ruby 2.2.2 * Rails 4.2.0 @@ -20,6 +20,16 @@ Development details: * Development login email: test@test.com password: password +Docker instructions: + +* Building the image +``` +docker build -t wrestling . +``` +* Running the image (as development) +``` +docker run -it --rm -p 3000:3000 wrestling +``` What the app does now: diff --git a/db/migrate/201505170715923_rename_bout_number.rb b/db/migrate/20150517075923_rename_bout_number.rb similarity index 100% rename from db/migrate/201505170715923_rename_bout_number.rb rename to db/migrate/20150517075923_rename_bout_number.rb From acb1a225dd1eb9dde72c4b695632194ad0130a2c Mon Sep 17 00:00:00 2001 From: "R.J. Osborne" Date: Sun, 17 May 2015 09:49:51 -0400 Subject: [PATCH 5/5] updated the db schema file to reflect the migration --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index dc07353..d9d5f13 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: 20150427163818) do +ActiveRecord::Schema.define(version: 20150517075923) do create_table "matches", force: :cascade do |t| t.integer "w1"