Merge remote-tracking branch 'upstream/dev' into feature/dotenv

Gemfile

@@ -48,7 +48,6 @@ gem 'js-routes' # provides access to Rails routes in Javascript
 
 gem 'cancancan'                    # for checking member privileges
 gem 'csv_shaper'                   # CSV export
-gem 'figaro'                       # for handling config via ENV variables
 gem 'gibbon', '~>1.2.0'            # for Mailchimp newsletter subscriptions
 
 # Maps
@@ -163,6 +162,8 @@ group :development, :test do
   gem 'rubocop-rspec'
   gem 'webrat'                  # provides HTML matchers for view tests
 
+  gem 'dotenv-rails'
+
   # cli utils
   gem 'coveralls', require: false # coverage analysis
   gem 'haml-i18n-extractor', require: false

Gemfile.lock

@@ -163,6 +163,10 @@ GEM
     discard (1.2.0)
       activerecord (>= 4.2, < 7)
     docile (1.1.5)
+    dotenv (2.7.6)
+    dotenv-rails (2.7.6)
+      dotenv (= 2.7.6)
+      railties (>= 3.2)
     elasticsearch (6.8.2)
       elasticsearch-api (= 6.8.2)
       elasticsearch-transport (= 6.8.2)
@@ -193,8 +197,6 @@ GEM
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     ffi (1.13.0)
-    figaro (1.2.0)
-      thor (>= 0.14.0, < 2)
     flickraw (0.9.10)
     font-awesome-sass (5.13.0)
       sassc (>= 1.11)
@@ -613,12 +615,12 @@ DEPENDENCIES
   database_cleaner
   devise
   discard (~> 1.0)
+  dotenv-rails
   elasticsearch (< 7.0.0)
   factory_bot_rails
   faker
   faraday
   faraday_middleware
-  figaro
   flickraw
   font-awesome-sass
   friendly_id

env-example

@@ -15,7 +15,7 @@
 
 # Settings in this file will be available to you as ENV['WHATEVER']
 
-# NOTE: please prefix all environment variables with GROWSTUFF_ to make
+# NOTE=please prefix all environment variables with GROWSTUFF_ to make
 # it easy to identify which were set by us vs. the system or anyone else
 
 ##############################################################################
@@ -26,10 +26,10 @@
 # It's the only one without "GROWSTUFF_" prefix.
 # To generate a real one, use 'rake secret' (you don't need to for
 # dev, though.)
-RAILS_SECRET_TOKEN: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+RAILS_SECRET_TOKEN="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 
 # name that appears on the site, eg. in page titles
-GROWSTUFF_SITE_NAME: Growstuff (dev)
+GROWSTUFF_SITE_NAME="Growstuff (dev)"
 
 # Mailchimp is used for subscribing/unsubscribing people from the newsletter
 # To fetch list IDs using Gibbon (and thus find the ID of your newsletter):
@@ -37,45 +37,27 @@ GROWSTUFF_SITE_NAME: Growstuff (dev)
 #   Gibbon::API.api_key = '...'
 #   gb = Gibbon::API.new
 #   puts gb.lists.list.to_yaml
-GROWSTUFF_MAILCHIMP_APIKEY: ""
+GROWSTUFF_MAILCHIMP_APIKEY=""
-GROWSTUFF_MAILCHIMP_NEWSLETTER_ID: ""
+GROWSTUFF_MAILCHIMP_NEWSLETTER_ID=""
 
 # Used for connecting member accounts to Twitter
 # Get Twitter key from https://dev.twitter.com/apps
-GROWSTUFF_TWITTER_KEY: ""
+GROWSTUFF_TWITTER_KEY=""
-GROWSTUFF_TWITTER_SECRET: ""
+GROWSTUFF_TWITTER_SECRET=""
 
 # Used for connecting member accounts to Flickr
 # Get Flickr key from http://www.flickr.com/services/apps/create/apply/
-GROWSTUFF_FLICKR_KEY: ""
+GROWSTUFF_FLICKR_KEY="ebb5ef627143346f992201b02f12e4a8"
-GROWSTUFF_FLICKR_SECRET: ""
+GROWSTUFF_FLICKR_SECRET="04368dcc21a624a8"
 
 # https://developers.facebook.com/
-GROWSTUFF_FACEBOOK_KEY: ""
+GROWSTUFF_FACEBOOK_KEY=""
-GROWSTUFF_FACEBOOK_SECRET: ""
+GROWSTUFF_FACEBOOK_SECRET=""
 
-GROWSTUFF_MAPBOX_MAP_ID: ""
+# Elasticsearch is used for flexible search and it requires another component
-GROWSTUFF_MAPBOX_ACCESS_TOKEN: ""
+# to be installed. To make it easy for people who don't need to test this feature
-
+# it's been turned off for test and development environment as a default.
-##############################################################################
+# If you want to test this functionality, install elasticsearch and
-# Other environments
+# set this flag to "true".
-# You can override the above for staging, production, etc.
+GROWSTUFF_ELASTICSEARCH="true"
-# To push these settings to Heroku, use "rake figaro:heroku --app=whatever".
+GROWSTUFF_EMAIL='noreply@dev.growstuff.org'
-# To see current settings on Heroku, use "heroku config --app=whatever".
-##############################################################################
-
-### EMAil addres for notifier and mailers to use as from
-GROWSTUFF_EMAIL: 'noreply@dev.growstuff.org'
-
-test:
-  GROWSTUFF_SITE_NAME: Growstuff (test)
-
-# Note: there is no good way to deploy settings from Figaro to
-# Travis-CI.  If you need env vars set there in order for tests to pass,
-# set them in .travis.yml
-
-staging:
-  GROWSTUFF_SITE_NAME: Growstuff (staging)
-
-production:
-  GROWSTUFF_SITE_NAME: Growstuff