Ruby upgrade 2.4.10

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     parallelism: 4
     docker:
-      - image: circleci/ruby:2.3.8-stretch-node-browsers
+      - image: circleci/ruby:2.4.10-stretch-node-browsers
         environment:
           BUNDLE_JOBS: 3
           BUNDLE_RETRY: 3
@@ -98,4 +98,4 @@ jobs:
 
       - store_artifacts:
           path: tmp/capybara
-          destination: capybara
+          destination: capybara

.env.sample

@@ -0,0 +1,51 @@
+ADMIN_EMAIL: "service@localorbit.com"
+API_ADMIN_USER_ID: <admin user id>
+ASSET_HOST: "http://localhost:3000"
+BI_CERT: <url to BI CERT file>
+BI_CERT_KEY: <url to BI CERT KEY file>
+BI_DASHBOARD_URL: <url to BI dashboard>
+BI_SERVER: <qlik url>
+DEBUG: OFF
+DOMAIN: "localtest.me" # localtest.me points to 127.0.0.1 and lets us use subdomains. localhost does not. see http://readme.localtest.me/
+# Use staging DRAGONFLY_HOST for dev and test
+DRAGONFLY_HOST: 'https://d3jv177czn6wv2.cloudfront.net'
+DW_DB_URL: <dw url>
+ETL_DAYS: '720'
+FROALA_KEY: <api key for froala>
+GOOGLE_MAPS_KEY: <api key for google maps>
+MAILTRAP_USERNAME: <MT username>
+MAILTRAP_PASSWORD: <MT secret>
+MAX_POOL_SIZE: '10'
+ON_HEROKU: 'false'
+PDF_ASSET_HOST: "localtest.me"
+QB_ACCESS_TOKEN: <QB access token>
+QB_ACCESS_TOKEN_SECRET: <QB access token secret>
+QB_APP_TOKEN: <QB app token>
+QB_CONSUMER_KEY: <QB consumer key>
+QB_CONSUMER_SECRET: <QB consumer secret>
+QB_REALM_ID: <QB realm id>
+RAILS_ENABLE_TEST_LOG: ~
+RECAPTCHA_SECRET_KEY: ''
+RECAPTCHA_SECRET_KEY_V3: ''
+RECAPTCHA_SITE_KEY: ''
+RECAPTCHA_SITE_KEY_V3: ''
+ROLLBAR_ACCESS_TOKEN: ''
+SECRET_TOKEN: <long random string>
+SMTP_PASSWORD: <mandrill smtp password>
+SMTP_USERNAME: <mandrill smtp username>
+STRIPE_ACCOUNT_SIGNING_SECRET: <stripe account signing secret>
+STRIPE_CLIENT_ID: <stripe client key (test on local system)>
+STRIPE_CONNECT_SIGNING_SECRET: <stripe connect signing secret>
+STRIPE_DEV_MARKET_ACCOUNT_ID: <stripe user id of market that did oauth flow, see docs/stripe.md>
+STRIPE_PUBLISHABLE_KEY: <stripe publishable key (test on local system)>
+STRIPE_SECRET_KEY: <stripe secret key (test on local system)>
+SUPPORT_PHONE_NUMBER: '(800) 598-3351'
+TRANS_DB_URL: <transactional db>
+TWITTER_WIDGET_ID: 'create-me-at-twitter-dot-com'
+UPLOADS_ACCESS_KEY_ID: <S3 upload access key id>
+UPLOADS_BUCKET: <S3 upload bucket (dev)>
+UPLOADS_REGION: <S3 upload region>
+UPLOADS_SECRET_ACCESS_KEY: <S3 upload secret access key>
+USE_DELAYED_JOB: 'true'
+USE_ROLLBAR: 'false'
+USE_UPLOAD_QUEUE: 'true'

.env.test

@@ -0,0 +1,2 @@
+CAPYBARA_WAIT_TIME: '180'
+USE_UPLOAD_QUEUE: 'false'

.gitignore

@@ -26,6 +26,9 @@ dragonfly.log
 /tempfiles/*
 
 # Ignore application configuration
+.env
+.env.local
+.env.*.local
 /config/application.yml
 /dragonfly
 public/system/dragonfly/development
@@ -52,4 +55,4 @@ node_modules/
 
 /snippets
 
-.DS_Store
+.DS_Store

.ruby-version

@@ -1 +1 @@
-2.3.8
+2.4.10

Capfile

@@ -0,0 +1,41 @@
+# Load DSL and set up stages
+require "capistrano/setup"
+
+# Include default deployment tasks
+# require "capistrano/deploy"
+require 'capistrano/git_deploy'
+require 'capistrano/aws'
+
+# Load the SCM plugin appropriate to your project:
+#
+# require "capistrano/scm/hg"
+# install_plugin Capistrano::SCM::Hg
+# or
+# require "capistrano/scm/svn"
+# install_plugin Capistrano::SCM::Svn
+# or
+require "capistrano/scm/git"
+install_plugin Capistrano::SCM::Git
+
+# Include tasks from other gems included in your Gemfile
+#
+# For documentation on these, see for example:
+#
+#   https://github.com/capistrano/rvm
+#   https://github.com/capistrano/rbenv
+#   https://github.com/capistrano/chruby
+#   https://github.com/capistrano/bundler
+#   https://github.com/capistrano/rails
+#   https://github.com/capistrano/passenger
+#
+# require "capistrano/rvm"
+# require "capistrano/rbenv"
+# require "capistrano/chruby"
+require 'capistrano/bundler'
+require 'capistrano/rails/assets'
+require 'capistrano/rails/migrations'
+require 'capistrano/passenger'
+require 'capistrano/yarn'
+
+# Load custom tasks from `lib/capistrano/tasks` if you have any defined
+Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }

Gemfile

@@ -5,9 +5,12 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-ruby '2.3.8'
+ruby '2.4.10'
 
-gem 'rails', '~> 4.1.11'
+# This needs to load before other gems
+gem 'dotenv-rails', require: 'dotenv/rails-now'
+
+gem 'rails', '~> 4.2.11.3'
 
 gem 'pg', '~> 0.21.0'
 
@@ -28,36 +31,34 @@ gem 'wysihtml5-rails'
 gem 'active_model_serializers'
 gem 'active_record_query_trace'
 gem 'active_record_union'
-gem 'acts_as_geocodable'
 gem 'audited-activerecord'
 gem 'awesome_nested_set'
 gem 'bootsnap', require: false # TODO: Remove this when we upgrade to rails 5.2
 gem 'color'
 gem 'countries'
 gem 'csv_builder'
 gem 'delayed_job_active_record'
-gem 'devise', '~> 3.5.10'
+gem 'devise'
 gem 'devise_invitable'
 gem 'devise_masquerade'
 gem 'dragonfly-s3_data_store'
 gem 'draper'
-gem 'figaro'
-gem 'font_assets'
-gem 'graticule'
 gem 'groupdate', :git => 'https://github.com/trestrantham/groupdate.git', :branch => 'custom-calculations' # Waiting on https://github.com/ankane/groupdate/pull/53
 gem 'interactor-rails', '< 3.0'
 gem 'interactor', '< 3.0' # We are not ready for 3 yet
 gem 'jbuilder'
 gem 'jwt'
-gem 'kaminari'                      # Paginator
+gem 'kaminari'
+gem 'mini_racer'
 gem 'pdfkit'
 gem 'periscope-activerecord'
 gem 'pg_search'
-gem 'postgres_ext'
 gem 'rack-canonical-host'
-gem 'ransack'
+gem 'ransack', '1.6.4'
 gem 'recaptcha'
+# RAILS42 TODO: gem 'responders', '~> 2.0'
 gem 'simpleidn'
+gem 'skylight'
 gem 'stripe', '5.14.0'
 gem 'stripe_event', '2.3.0'
 gem 'font-awesome-rails'
@@ -82,12 +83,15 @@ gem 'rschema', :git => 'https://github.com/tomdalling/rschema.git'
 
 gem 'turbolinks'
 
-install_if -> { RUBY_PLATFORM =~ /darwin/ } do
-  gem 'wkhtmltopdf-binary', '0.12.5.1'
-end
-install_if -> { ENV['ON_HEROKU'] == 'true' } do
-  gem 'wkhtmltopdf-heroku'
+install_if -> { ENV['ON_HEROKU'] != 'true' } do
+  # Maybe try 0.12.5.4 if run into issues
+  gem 'wkhtmltopdf-binary', '0.12.5.4'
 end
+# install_if -> { ENV['ON_HEROKU'] == 'true' } do
+#   gem 'wkhtmltopdf-heroku'
+#   gem 'rails_12factor'
+#   gem 'platform-api'
+# end
 
 # Product import/export
 gem 'rubyXL', require: false # XLSX
@@ -99,6 +103,7 @@ gem 'grape' # API v2
 gem 'grape-active_model_serializers' # API v2
 gem 'rack-cors', :require => 'rack/cors' # API v2
 gem 'grape-swagger' # API V2, documentation
+gem 'puma'
 
 gem 'rollbar'
 
@@ -110,7 +115,15 @@ group :doc do
 end
 
 group :development do
+  gem 'aws_config'
   gem 'bullet'
+  gem 'capistrano'
+  gem 'capistrano-aws', require: false
+  gem 'capistrano-bundler'
+  gem 'capistrano-git_deploy', github: 'thermistor/capistrano-git_deploy', require: false
+  gem 'capistrano-passenger'
+  gem 'capistrano-rails'
+  gem 'capistrano-yarn'
   gem 'ultrahook'
   gem 'spring'
   gem 'spring-commands-rspec'
@@ -121,7 +134,6 @@ group :development do
   gem 'rails_view_annotator'
   gem 'rubycritic', require: false
   gem 'mailcatcher'
-  gem 'unicorn'
 
   # profiling, see https://github.com/MiniProfiler/rack-mini-profiler#installation
   gem 'rack-mini-profiler'
@@ -130,7 +142,7 @@ group :development do
   gem 'stackprof'
 end
 
-group :development, :test do
+group :development, :test, :build do
   gem 'factory_bot_rails'
   gem 'rspec-rails', '~> 3.0'
   gem 'rspec_junit_formatter', :git => 'https://github.com/sj26/rspec_junit_formatter.git'
@@ -164,19 +176,9 @@ group :test do
   gem 'stripe-ruby-mock', '~> 2.5.8', :require => 'stripe_mock'
 end
 
-group :staging do
-  gem 'skylight'
-end
-
 group :production, :staging do
   gem 'newrelic_rpm'
   gem 'newrelic-dragonfly'
   #gem 'passenger'
-  gem 'rack-cache', require: 'rack/cache'
-  gem 'rails_12factor'
-  gem 'platform-api'
-end
-
-group :production, :staging, :development do
-  gem 'puma'
+  # gem 'rack-cache', require: 'rack/cache'
 end