Specified ruby 2.3.0

Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+ruby '2.3.0'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2.5'
 # Use sqlite3 as the database for Active Record
@@ -54,7 +55,7 @@ gem 'spring', :group => :development
 		gem 'rb-readline'
 		gem 'delayed_job_active_record'
 		gem 'puma'
-		gem 'postmark-rails'
+		gem 'brakeman'
 	group :development do
       
 	#gem 'bullet'

Gemfile.lock

@@ -38,6 +38,18 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.3)
     bcrypt (3.1.10)
+    brakeman (3.1.5)
+      erubis (~> 2.6)
+      fastercsv (~> 1.5)
+      haml (>= 3.0, < 5.0)
+      highline (>= 1.6.20, < 2.0)
+      multi_json (~> 1.2)
+      ruby2ruby (>= 2.1.1, < 2.3.0)
+      ruby_parser (~> 3.7.0)
+      safe_yaml (>= 1.0)
+      sass (~> 3.0)
+      slim (>= 1.3.6, < 4.0)
+      terminal-table (~> 1.4)
     builder (3.2.2)
     cancancan (1.10.1)
     coffee-rails (4.0.1)
@@ -63,8 +75,12 @@ GEM
       warden (~> 1.2.3)
     erubis (2.7.0)
     execjs (2.5.2)
+    fastercsv (1.5.5)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
+    haml (4.0.7)
+      tilt
+    highline (1.7.8)
     i18n (0.7.0)
     jbuilder (2.2.13)
       activesupport (>= 3.0.0, < 5)
@@ -91,12 +107,6 @@ GEM
     passenger (5.0.7)
       rack
       rake (>= 0.8.1)
-    postmark (1.7.0)
-      json
-      rake
-    postmark-rails (0.12.0)
-      actionmailer (>= 3.0.0)
-      postmark (~> 1.7.0)
     puma (2.11.2)
       rack (>= 1.1, < 2.0)
     rack (1.6.4)
@@ -139,9 +149,20 @@ GEM
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     round_robin_tournament (0.0.1)
+    ruby2ruby (2.2.0)
+      ruby_parser (~> 3.1)
+      sexp_processor (~> 4.0)
+    ruby_parser (3.7.3)
+      sexp_processor (~> 4.1)
+    safe_yaml (1.0.4)
+    sass (3.4.21)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    sexp_processor (4.6.1)
+    slim (3.0.6)
+      temple (~> 0.7.3)
+      tilt (>= 1.3.3, < 2.1)
     spring (1.3.5)
     sprockets (3.5.0)
       concurrent-ruby (~> 1.0)
@@ -151,11 +172,14 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
+    temple (0.7.6)
+    terminal-table (1.5.2)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
     thread_safe (0.3.5)
+    tilt (2.0.2)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
@@ -170,6 +194,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  brakeman
   cancancan
   coffee-rails (~> 4.0.0)
   dalli
@@ -180,7 +205,6 @@ DEPENDENCIES
   mysql2
   newrelic_rpm
   passenger
-  postmark-rails
   puma
   rails (= 4.2.5)
   rails_12factor
@@ -194,4 +218,4 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

README.rdoc

@@ -16,7 +16,7 @@ MIT License
 
 <b>Development details:</b>
 
-* Ruby 2.2.0
+* Ruby 2.3.0
 
 * Rails 4.2.5
 

config/routes.rb

@@ -15,8 +15,6 @@ Wrestling::Application.routes.draw do
 
   post "/weights/:id" => "weights#show"
 
-  
-
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
 

deploy/deploy-prod.sh

@@ -2,7 +2,7 @@ gpg prod.env.gpg
 cd ..
 bash rails-prod.sh wrestlingdev
 cd deploy
-docker-compose -f docker-compose-prod.yml up -d
-echo Make sure your local mysql database has a db for wrestlingdev
+docker-compose -f docker-compose-prod-full-stack.yml up -d
+echo Make sure your local mysql database has a db for wrestlingdev called wrestlingtourney
 echo "mysqldump -u guy -ppassword -h host database_name > database.sql"
 echo "mysql -u guy -ppassword -h host database_name < database.sql"

deploy/docker-compose-common.yml

@@ -19,3 +19,7 @@ email:
 memcached:
   image: memcached
   mem_limit: 64000000
+  
+worker:
+  image: wrestlingdev
+  command: /bin/bash -c "cd /var/www && bundle exec rake jobs:work RAILS_ENV=production"

deploy/docker-compose-prod-full-stack.yml

@@ -14,3 +14,12 @@ db:
   restart: always
   env_file: 
     - ./prod.env
+worker:
+  extends:
+    file: docker-compose-common.yml
+    service: worker
+  links:
+    - db
+  restart: always
+  env_file: 
+    - ./prod.env

deploy/docker-compose-prod-webapp.yml

@@ -1,9 +0,0 @@
-app:
-  extends:
-    file: docker-compose-common.yml
-    service: app
-  links:
-    - db
-  restart: always
-  env_file: 
-    - ./prod.env

deploy/docker-compose-test.yml

@@ -21,3 +21,19 @@ db:
   environment:
     - MYSQL_ROOT_PASSWORD=password
   restart: always
+worker:
+  extends:
+    file: docker-compose-common.yml
+    service: worker
+  environment:
+    - WRESTLINGDEV_DB_NAME=wrestlingtourney
+    - WRESTLINGDEV_DB_USR=root
+    - WRESTLINGDEV_DB_PWD=password
+    - WRESTLINGDEV_DB_HOST=db
+    - WRESTLINGDEV_DB_PORT=3306
+    - WRESTLINGDEV_DEVISE_SECRET_KEY=2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa
+    - WRESTLINGDEV_SECRET_KEY_BASE=077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2
+
+  links:
+    - db
+  restart: always

deploy/server-deploy-prod.sh

@@ -1,22 +0,0 @@
-if [ -z "$2" ]
-  then
-    echo "usage) server-deploy-prod.sh user@server docker-compose-file-name.yml"
-    exit 1
-fi
-
-echo "Copying your ssh key to ${1}"
-ssh-copy-id $1
-clear
-ssh -t $1 bash -c "'
-cd wrestlingApp
-mv deploy/prod.env ../
-git pull origin master
-mv ../prod.env deploy/
-
-#Kill all containers
-docker kill $(docker ps -q)
-
-bash rails-prod.sh wrestlingdev
-cd deploy
-docker-compose -f ${2} up -d
-'"

rails-dev-Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.2.3
+FROM ruby:2.3.0
 
 RUN apt-get update
 

rails-prod-Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.2.3
+FROM ruby:2.3.0
 
 
 RUN apt-get update

rails-prod.sh

@@ -13,4 +13,4 @@ docker ps | grep "Exit" | awk '{print $1}' | while read -r id ; do
   docker kill $id
 done
 
-docker run -h $HOSTNAME -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE -v /srv/docker/apache2/logs:/var/log/apache2  -v /etc/localtime:/etc/localtime -p 80:80 -p 443:443 $1
+docker run -h $HOSTNAME -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE -v /var/log/apache2:/var/log/apache2  -v /etc/localtime:/etc/localtime -p 80:80 -p 443:443 $1