Merge branch 'development'

.travis.yml

@@ -7,15 +7,13 @@ rvm:
 env:
 - DB=sqlite
 script:
-#- RAILS_ENV=test bundle exec rake db:migrate --trace
-#- bundle exec rake test
 - bash bin/run-tests-with-docker.sh
 deploy:
   provider: heroku
   api_key:
-    secure: jK845+Ck8sr7EQwYhRAb1L1pL6reS5Rx/kzQ7qR/6XJRrUvCXIhM/p2Z561VifTmg/6NuUtxzINk97f+LrDNhFFErwitn3dVNuldXbFTdMHJtUj5quypm9Q8i+v+tvlgEf7Lm/sOgZCYYrW9Cgb3NLqTJXj2j2DXQTJcIsLKWqlkspcaSul8BKFbKpNOzhL7L0lr/+vGRVVD2Mh0eJPctx4GQOS9SePmFAQRJfU5egIL7l7SSONwXzPFyCQF7BH43r7URboc03IFlwQHOx3q6JLzZRtqnsbbv8Zwdq65ic49kN+UwEE6Ji/lEyZxuh3KyEezBuYFdc3PXOUyJ0FroFEQjehNeVhbcG6BSswmSU2H7Dbo7kxBCW4tkRDVIuiPZrOhzrDprdsjE0n8z+J/ZwHeCLodiFueuF4MU1w/oeyDCRBfnuZhpXX9/wGLbEIZSX0aZQM0dk/r69XL8mDxIT437+VxBVTolPExFtxksKaqCpqlUHZ9vPPqW8YUtnGrcYBwgoKfqa1KKXmp6eJCQ2FYywZe5xnVyZSm2JDzo0aZFlAuZDvbYQ4aFu1uDwzk7VXDAzXIvfDKr39Q2KgcZuY3FWZcB6ujvaDZZHn2XQv396etkNVD9U45OaJjTQ2xgmIyW8xe8uDrZhTC0zG6ZTF12SpbNycLym2GoRRDLw4=
+    secure: qGhRB1ESkHeTTLTtejb84k84nKudeIWWdg2LkTnQ21yP/2SVkEPcWXSXYSaMs5lYkmedhzzdZU9e/Lbe8mOpy0Eqv0I0QItkDpCdDVeEFWsUPFXvd2B8IuO4tOIbUNjhvLAvW4JbIEpnMvQQUFTXW7yUd3SZqPjZHtSA6pNqDvZzDOKjrYfzEUxlF6FycG+XlOaoon1pvqc+p8JK/J5H8P7Nj4og0ynJwLYUIuMjt1empTOLESGVSZ5uM44le2Cq76Bar28xiCBso9LJ7SnsvZRZjNJ2zy4YhM6iYI4w/L2h7RO9WX1qBOODseXc1gzfD3jGoeCPmy41f7Gpay8N4F2y821XI0Ai03qiR3MvjfP8Gkq7irgNZnrCfsae6+yANjno9e7fv5+KbH9XrCqQETREears4zDPfRihwJC+No2iKIXn54BJpCR5pUHVDyRGv+M3QETjmPzwtU62BK1uYlhUOmQHnHTomLLOE9cJto4B26oeG1IaKdyhhvZwOTxAPvyAwlXbsF/NsSZ6RhLMUuMM9PThN28c/7htwgD+SpsaklvDxv8rt6uAQ8KI8kzFNGrxMZnxdFc9zPVyp1B18YbgbGstQRO3HTkMkg9inQBR511MCTp7EE2DJr3sA7jAiwR/Y3s7AzfJixAowHKoOiYv+4H6YgHv11ti7aK/7KM=
   app: wrestlingapp
   on:
     repo: jcwimer/wrestlingApp
     branch: master
-  run: "rake db:migrate RAILS_ENV=production"
+  run: rake db:migrate RAILS_ENV=production

Gemfile

@@ -53,6 +53,7 @@ gem 'round_robin_tournament'
 gem 'rb-readline'
 gem 'delayed_job_active_record'
 gem 'puma'
+gem 'travis'
 
 group :development do
  gem 'rubocop'

Gemfile.lock

@@ -42,8 +42,10 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    addressable (2.4.0)
     arel (9.0.0)
     ast (2.4.0)
+    backports (3.11.3)
     bcrypt (3.1.11)
     brakeman (4.2.1)
     builder (3.2.3)
@@ -73,9 +75,24 @@ GEM
       responders
       warden (~> 1.2.3)
     erubi (1.7.1)
+    ethon (0.11.0)
+      ffi (>= 1.3.0)
     execjs (2.7.0)
+    faraday (0.15.2)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    ffi (1.9.25)
+    gh (0.15.1)
+      addressable (~> 2.4.0)
+      backports
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
+      net-http-persistent (~> 2.9)
+      net-http-pipeline
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    highline (1.7.10)
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     jbuilder (2.7.0)
@@ -85,6 +102,9 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    json (2.1.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
     libv8 (3.16.14.19)
     loofah (2.2.2)
       crass (~> 1.0.2)
@@ -99,7 +119,10 @@ GEM
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     multi_json (1.13.1)
+    multipart-post (2.0.0)
     mysql2 (0.5.1)
+    net-http-persistent (2.9.4)
+    net-http-pipeline (1.0.1)
     newrelic_rpm (5.1.0.344)
     nio4r (2.3.1)
     nokogiri (1.8.2)
@@ -110,6 +133,9 @@ GEM
       ast (~> 2.4.0)
     powerpack (0.1.1)
     puma (3.11.4)
+    pusher-client (0.6.2)
+      json
+      websocket (~> 1.0)
     rack (2.0.5)
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
@@ -176,9 +202,20 @@ GEM
       ref
     thor (0.20.0)
     thread_safe (0.3.6)
+    travis (1.8.8)
+      backports
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.9, >= 0.9.1)
+      gh (~> 0.13)
+      highline (~> 1.6)
+      launchy (~> 2.1)
+      pusher-client (~> 0.4)
+      typhoeus (~> 0.6, >= 0.6.8)
     turbolinks (5.1.1)
       turbolinks-source (~> 5.1)
     turbolinks-source (5.1.0)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.10)
@@ -187,6 +224,7 @@ GEM
     uniform_notifier (1.11.0)
     warden (1.2.7)
       rack (>= 1.0)
+    websocket (1.2.8)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
@@ -216,6 +254,7 @@ DEPENDENCIES
   spring
   sqlite3
   therubyracer
+  travis
   turbolinks
   uglifier