Converting from using Figaro to using Dotenv

just3ws · just3ws · commit d5e8f321d214 · 2014-05-12T20:19:49.000-05:00
diff --git a/.env.example b/.env.example
@@ -0,0 +1,44 @@
+DISCOUNT_TOKEN=discount_token
+
+GITHUB_ADMIN_USER=github_admin_user
+GITHUB_ADMIN_USER_PASSWORD=github_admin_user_password
+GITHUB_CLIENT_ID=github_client_id
+GITHUB_REDIRECT_URL=http://localhost:3000/auth/github/callback
+GITHUB_SECRET=github_secret
+
+LANG=en_US.UTF-8
+LC_ALL=en_US.UTF-8
+
+LINKEDIN_KEY=linkedin_key
+LINKEDIN_SECRET=linkedin_secret
+
+MAILGUN_API_KEY=key-mailgun_api_key
+MAILGUN_DOMAIN=localhost
+MAILGUN_SIGNATURE=mailgun_signature
+MAILGUN_TOKEN=mailgun_token
+
+MIXPANEL_API_SECRET=mixpanel_api_secret
+MIXPANEL_TOKEN=mixpanel_token
+
+MONGODB_DATABASE_NAME=coderwall
+
+NOTIFIER_ADMIN_EMAILS="['notifier_admin@example.com']"
+
+PRIVATE_ADMIN_PATH=private_admin_path
+PRIVATE_URL=http://development:development@localhost:3000
+
+REDIS_URL=redis://localhost:6379
+
+REVIEWERS="['Administrator']"
+
+STRIPE_PUBLISHABLE_KEY=pk_test_stripe_publishable_key
+STRIPE_SECRET_KEY=sk_test_stripe_secret_key
+
+SUPPORT_EMAIL=support@example.com
+
+TWITTER_ACCOUNT_ID=111111111
+TWITTER_CONSUMER_KEY=twitter_consumer_key
+TWITTER_CONSUMER_SECRET=twitter_consumer_secret
+TWITTER_OAUTH_SECRET=twitter_oauth_secret
+TWITTER_OAUTH_TOKEN=twitter_oauth_token
+TWITTER_REDIRECT_URL=http://localhost:3000/auth/twitter/callback
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+
+# Ignore application configuration
 *.dat
 *.gem
 *.rbc
@@ -6,12 +8,12 @@
 .bundle
 .config
 .env
-.env.*
 .idea
 .sass-cache
 .vagrant
 .yardoc
 /.bundle
+/config/application.yml
 /db/*.sqlite3
 /db/*.sqlite3-journal
 /log/*.log
@@ -32,6 +34,7 @@ log/*.log
 logfile
 nlp.rb
 pkg
+public/assets/
 public/images/top/
 rdoc
 script/env
@@ -42,13 +45,8 @@ test/tmp
 test/version_tmp
 tmp
 vagrant/cache
-vagrant/dotfiles
-vcr_cassettes
-public/assets/
-
-vagrant/coderwall-box/packer_cache/
 vagrant/coderwall-box/output-virtualbox-iso/
+vagrant/coderwall-box/packer_cache/
 vagrant/coderwall-box/packer_virtualbox-iso_virtualbox.box
-
-# Ignore application configuration
-/config/application.yml
+vagrant/dotfiles
+vcr_cassettes
diff --git a/Gemfile b/Gemfile
@@ -4,6 +4,9 @@ ruby '2.1.0'
 
 gem 'rails', '~> 3.2'
 
+# Load environment variables first
+gem 'dotenv-rails', groups: [:development, :test]
+
 gem 'strong_parameters'
 
 # Mongo
@@ -95,9 +98,6 @@ gem 'oj'
 gem 'active_model_serializers'
 gem 'jbuilder'
 
-# Environment variable configuration management
-gem 'figaro'
-
 # Run app
 gem 'foreman'
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -146,6 +146,8 @@ GEM
     diffy (3.0.1)
     docile (1.1.3)
     dotenv (0.10.0)
+    dotenv-rails (0.10.0)
+      dotenv (= 0.10.0)
     eco (1.0.0)
       coffee-script
       eco-source
@@ -181,9 +183,6 @@ GEM
       loofah (~> 1.2.1)
       sax-machine (~> 0.2.1)
     ffi (1.9.3)
-    figaro (0.7.0)
-      bundler (~> 1.0)
-      rails (>= 3, < 5)
     fog (0.7.2)
       builder
       excon (>= 0.6.1)
@@ -633,11 +632,11 @@ DEPENDENCIES
   createsend
   dalli
   database_cleaner
+  dotenv-rails
   ember-rails!
   fabrication (= 1.4.1)
   faker
   feedjira
-  figaro
   fog
   font_assets (~> 0.1.2)
   foreman
diff --git a/app/models/github_badge.rb b/app/models/github_badge.rb
@@ -1,6 +1,11 @@
 class GithubBadge
   def initialize
-    @client = Octokit::Client.new(login: ENV['GITHUB_ADMIN_USER'], password: ENV['GITHUB_ADMIN_USER_PASSWORD'], client_id: ENV['GITHUB_CLIENT_ID'], client_secret: ENV['GITHUB_SECRET'])
+    @client = Octokit::Client.new(
+      login: ENV['GITHUB_ADMIN_USER'],
+      password: ENV['GITHUB_ADMIN_USER_PASSWORD'],
+      client_id: ENV['GITHUB_CLIENT_ID'],
+      client_secret: ENV['GITHUB_SECRET']
+    )
   rescue Exception => e
     Rails.logger.error("Failed to initialize octokit: #{e.message}")
   end
diff --git a/spec/models/purchased_bundle_spec.rb b/spec/models/purchased_bundle_spec.rb
@@ -29,7 +29,6 @@
 require 'spec_helper'
 
 describe PurchasedBundle do
-
   it 'should split purchase amount on creation', functional: true do
     purchase = create_test_bundle(amount = 6000)
     purchase.codeschool_proceeds.should == 3477 #3600
@@ -51,7 +50,8 @@
 
   it 'should put stripe message into errors if charge unsucessful', functional: true do
     purchase = create_test_bundle(amount = 2000, bad_token = 'this-is-bogus')
-    purchase.errors.full_messages.should include("Unable to charge card. Please contact us at support@coderwall.com if you continue to have issues.")
+    expected_message = "Unable to charge card. Please contact us at support@coderwall.com if you continue to have issues."
+    purchase.errors.full_messages.should include(expected_message)
   end
 
   def create_test_bundle(amount, token = PurchasedBundle.create_test_token)
