Merge pull request #37 from mcpa-stlouis/dev

v2.1 beta pull

Author: paullj1

.env

@@ -1,3 +1,6 @@
+# Docker-Compose env vars:
+COMPOSE_PROJECT_NAME=hta
+
 # Environment variables for the docker-compose application
 RAILS_ENV=production
 RACK_ENV=production

.travis.yml

@@ -6,12 +6,12 @@ before_install:
 before_script:
 - bundle exec rails db:migrate
 rvm:
-- 2.3.3
+- 2.5
 install:
 - gem install bundler
 - bundle install --jobs=3 --retry=3
 before_script:
-- bundle exec rake db:migrate
+- bundle exec rails db:migrate
 script:
 - bundle exec rails test
 notifications:

Dockerfile

@@ -1,7 +1,7 @@
 # HackTheArch Dockerfile
 # VERSION 1.0
 
-FROM ruby:2.3
+FROM ruby:2.5
 MAINTAINER Paul Jordan <paullj1@gmail.com>
 
 HEALTHCHECK --interval=5m --timeout=3s \

Gemfile

@@ -1,61 +1,60 @@
 source 'https://rubygems.org'
-ruby '2.3.3'
+ruby '>= 2.5'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails',        '5.0.0'
-gem 'puma',         '3.4.0'
-gem 'uglifier',     '3.0.0'
-gem 'coffee-rails', '4.2.1'
-gem 'turbolinks',   '5.0.0'
-gem 'jbuilder',     '2.4.1'
-gem 'jquery-turbolinks'
-gem 'bcrypt', '~> 3.1.7'
-gem 'carrierwave', '0.10.0'
-gem 'mini_magick', '3.8.0'
-gem 'fog', '1.26.0'
-gem 'fog-google'
-gem 'will_paginate', '3.1.0' 
-gem 'stripe', '1.31.0'
-gem 'simplecov', '0.11.1'
-gem 'coveralls', require: false
-gem 'nokogiri', '~> 1.6.8.1'
-gem 'net-ssh'
-gem 'bootstrap-growl-rails'
-gem 'animate-rails'
+gem 'rails',                 '~> 5.1'
+gem 'puma',                  '~> 3.4'
+gem 'uglifier',              '~> 3.0'
+gem 'coffee-rails',          '~> 4.2'
+gem 'turbolinks',            '~> 5.1'
+gem 'jbuilder',              '~> 2.7'
+gem 'jquery-turbolinks',     '~> 2.1'
+gem 'bcrypt',                '~> 3.1'
+gem 'carrierwave',           '~> 1.2'
+gem 'activesupport',         '~> 5.1'
+gem 'mini_magick',           '~> 3.8'
+gem 'fog',                   '~> 1.26'
+gem 'fog-google',            '~> 0.4'
+gem 'will_paginate',         '~> 3.1' 
+gem 'stripe',                '~> 1.31'
+gem 'simplecov',             '~> 0.11'
+gem 'coveralls',             '~> 0.8'
+gem 'nokogiri',              '~> 1.8'
+gem 'net-ssh',               '~> 3.2'
+gem 'bootstrap-growl-rails', '~> 3.1'
+gem 'animate-rails',         '~> 1.0'
+gem 'CFPropertyList',        '~> 2.3'
 
 # Javascript and CSS
-gem 'sass-rails', '~> 5.0'
-gem 'bootstrap-sass', '3.2.0.0'
-gem 'jquery-rails'
-gem 'bootstrap-will_paginate', '0.0.10'
-gem 'bootstrap-switch-rails', '3.3.2'
-gem 'momentjs-rails', '>= 2.9.0'
-gem 'bootstrap3-datetimepicker-rails', '~> 4.14.30'
-gem 'c3-rails', '0.4.10'
-gem 'd3-rails', '3.5.6'
+gem 'sass-rails',                      '~> 5.0'
+gem 'bootstrap-sass',                  '~> 3.2'
+gem 'jquery-rails',                    '~> 4.2'
+gem 'bootstrap-will_paginate',         '~> 0.0'
+gem 'bootstrap-switch-rails',          '~> 3.3'
+gem 'momentjs-rails',                  '~> 2.15'
+gem 'bootstrap3-datetimepicker-rails', '~> 4.14'
+gem 'c3-rails',                        '~> 0.4'
+gem 'd3-rails',                        '~> 3.5'
 
 group :development,:test do
-	gem 'sqlite3'
+	gem 'sqlite3', '~> 1.3'
 end
 
 group :development do
-  gem 'byebug',  '9.0.0', platform: :mri
-  gem 'web-console', '~> 2.0'
+  gem 'byebug',      '~> 9.0', platform: :mri
+  gem 'web-console', '~> 2.3'
 end
 
 group :test do
-  gem 'rails-controller-testing', '0.1.1'
-  gem 'minitest-reporters',       '1.1.9'
-  gem 'guard',                    '2.13.0'
-  gem 'guard-minitest',           '2.4.4'
-  gem 'mini_backtrace',	          '0.1.3'
-  gem 'rake'
+  gem 'rails-controller-testing', '~> 0.1'
+  gem 'guard',                    '~> 2.13'
+  gem 'rake',                     '~> 12.3'
 end
 
 # Configured for Heroku 
 group :production do
   gem 'rack',           '2.0.1'
   gem 'pg',	            '0.18.4'
   gem 'rails_12factor', '0.0.2'
-  gem 'redis'
+  gem 'redis',          '3.3.1'
 end