Issue 53 #2

.gitignore

@@ -21,3 +21,4 @@
 /log/*
 !/log/.keep
 /tmp
+.env

.rubocop.yml

@@ -1,16 +1,36 @@
+Rails:
+  Enabled: true
+
 AllCops:
-  RunRailsCops: true
+  TargetRailsVersion: 4.0
   Exclude:
     - 'bin/*'
     - 'db/schema.rb'
     - 'db/seeds.rb'
     - 'vendor/bundle/**/*'
 
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
 Metrics/AbcSize:
   Exclude:
     - 'app/controllers/passwords_controller.rb'
     - 'app/controllers/sessions_controller.rb'
     - 'app/controllers/users_controller.rb'
+    - 'lib/thing_importer.rb'
+    - 'lib/adoption_mover.rb'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'config/initializers/*'
+    - 'lib/adoption_mover.rb' # removing heredocs would decrease readibility
+  ExcludedMethods: ['test']
 
 Metrics/BlockNesting:
   Max: 2
@@ -24,14 +44,13 @@ Metrics/MethodLength:
   Max: 10
   Exclude:
     - 'db/migrate/*.rb'
+    - 'lib/thing_importer.rb' # removing heredocs would decrease readibility
+    - 'lib/adoption_mover.rb' # removing heredocs would decrease readibility
 
 Metrics/ParameterLists:
   Max: 4
   CountKeywordArgs: true
 
-Style/AccessModifierIndentation:
-  EnforcedStyle: outdent
-
 Style/CollectionMethods:
   PreferredMethods:
     map:      'collect'
@@ -42,16 +61,16 @@ Style/CollectionMethods:
 Style/Documentation:
   Enabled: false
 
-Style/DotPosition:
-  EnforcedStyle: trailing
-
 Style/DoubleNegation:
   Enabled: false
 
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: 'comma'
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: 'comma'
 
-Style/TrailingComma:
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: 'comma'
 
 Style/WordArray:

.ruby-version

@@ -1 +1 @@
-2.2.3
+2.5.0

.travis.yml

@@ -1,18 +1,19 @@
-before_script: bundle exec rake db:create db:schema:load
+dist: trusty
+sudo: false
+language: ruby
 bundler_args: "--without assets:development:production"
+addons:
+  postgresql: "9.6"
 cache: bundler
-language: ruby
-rvm:
-  - 2.2.3
+before_script: bundle exec rake db:create db:schema:load
 script:
-  - bundle exec rake
-  - bundle exec rubocop
-sudo: false
+- bundle exec rake
+- bundle exec rubocop
 deploy:
+  provider: heroku
   api_key:
-    secure: Ck6BzHMtPmYsBY/PbVnfIE6wnSe9s6fYDkvzYZtT/2qud4j4ElhV9el0ZbDhiTmix0PMwcCnN/Tpw5GbLVaHncDaJkvb6ucEBNyC7xECjNAFsxE6lu3yKATsY2hta7OQ8NwLlvAZpzCLMZQf9lzoSNbh2h/p+CwSNR7vOkw0FNc=
-  app: adopt-a-hydrant
+    secure: RYcEa08NYClwvVGXEuxdkTPmWIasRPXIhVFhy3ievSYAlL6kRy44QoTApp26p+gDMImP1UIGcjI37RkPvqiONdmR70n2kVVYpbFYql5aJ3GjVYYYAwXqt6dHnFjt2Bi4mWhVH8ydyqxC7mQ8quW8a+yHkf/YSXhMv5IC1TmPnv4I+vyjAxK/Ru20768E5hn0UlcdYWGpNq81ZZhJzk26KZIEJDVOokJTY4dBDxXYEYsgSpTpAkN5KRipFJNosWPl2ASbEmOXzR23tmoHN4VcmAKhZ4ePwqupWN3G7VhkF5q3FA/1VB5AuNmUuvhr1G5lO9ZoIHStqPrm4G28PwAJF058QHyQOZk309F7bTRpfiY0nu77pnO09Ze/lK98NGygog+9YTQDzF43qwjPdIIn1Az06ng2QWAaur9QGoG3lGKuhadUKdSuFETpH/dVMfV+9DiPbYcIoTigDNLUhC8Pp4atFN1ltz7kLhRkJT8l4gPpWPNOQrQC1ZwVJyM1yCasetGIIcGWXa7pI9qq55P+ERseFTNB5WNmsSQb97eXTGKjaRCcpmLnXxUQ5sG6lxi/ZMJ2L/K4X15PfLHFwMhsc2jWgfvGWqmPYwuNXsqPeUNuNW/GY5dNAqKasa1fmURwJDzxCu/x1XsyktcCzGbY1HOEaYv+5HjV0Ycrj4ca4iY=
+  app: adoptadrainsf-staging
   on:
-    repo: codeforamerica/adopt-a-hydrant
-  provider: heroku
-  strategy: git
+    repo: sfbrigade/adopt-a-drain
+    branch: production

Dockerfile

@@ -0,0 +1,7 @@
+FROM ruby:2.2.3
+RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
+RUN mkdir /myapp
+WORKDIR /myapp
+ADD Gemfile /myapp/Gemfile
+ADD Gemfile.lock /myapp/Gemfile.lock
+RUN bundle install

Gemfile

@@ -1,22 +1,25 @@
-source 'https://rubygems.org'
-ruby '2.2.3'
+# frozen_string_literal: true
 
-gem 'rails', '~> 4.2.4'
+source 'https://rubygems.org'
+ruby '2.5.0'
 
-gem 'arel'
-gem 'devise'
-gem 'geokit'
-gem 'haml'
-gem 'http_accept_language'
-gem 'nokogiri'
+gem 'airbrake', '~> 7.3'
+gem 'devise', '~> 4.3'
+gem 'geokit', '~> 1.0'
+gem 'haml', '~> 5.0'
+gem 'http_accept_language', '~> 2.0'
+gem 'local_time', '~> 2.0'
+gem 'obscenity', '~> 1.0', '>= 1.0.2'
 gem 'pg'
-gem 'rails_12factor'
-gem 'rails_admin'
-gem 'validates_formatting_of'
+gem 'rails', '~> 4.2.10'
+gem 'rails_admin', '~> 1.3'
+gem 'validates_formatting_of', '~> 0.9.0'
 
-platforms :ruby_18 do
-  gem 'fastercsv'
-end
+gem 'paranoia', '~> 2.4'
+gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw]
+
+gem 'byebug', groups: %i[development test]
+gem 'dotenv-rails', groups: %i[development test]
 
 group :assets do
   gem 'sass-rails', '>= 4.0.3'
@@ -29,13 +32,13 @@ end
 
 group :production do
   gem 'puma'
+  gem 'rails_12factor'
   gem 'skylight'
 end
 
 group :test do
   gem 'coveralls', require: false
   gem 'rubocop'
   gem 'simplecov', require: false
-  gem 'sqlite3'
   gem 'webmock'
 end