From 500ece05bf8b45f16f49779b1278d414c6aa1493 Mon Sep 17 00:00:00 2001
From: Joel McCoy <joelmccoy+github@gmail.com>
Date: Tue, 20 Jan 2015 18:50:46 -0500
Subject: [PATCH] use cloudinary:basic addon and cloudinary gem

---
 Gemfile      |  1 +
 app.json     | 16 ++++++++++++++--
 bots.rb      |  3 ++-
 defaults.env |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 67ae1e8..19f5c9a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,3 +3,4 @@ ruby '2.1.3'
 
 gem 'twitter_ebooks', '3.0.7'
 gem 'dotenv'
+gem 'cloudinary'
diff --git a/app.json b/app.json
index a7a09c3..3f3c992 100644
--- a/app.json
+++ b/app.json
@@ -8,16 +8,28 @@
     "ebooks"
   ],
   "addons": [
-    "papertrail:choklad"
+    "papertrail:choklad",
+    "cloudinary:starter"
   ],
   "env": {
     "LANG": "en_US.UTF-8",
     "BOT_NAME": "",
-    "SOURCE_USERNAME": "",
+    "OWNER_ACCOUNTS": {
+      "required": false,
+      "value": ""
+    },
+    "SOURCE_USERNAMES": {
+      "required": false,
+      "value": ""
+    },
     "CONSUMER_KEY": "",
     "CONSUMER_SECRET": "",
     "ACCESS_TOKEN": "",
     "ACCESS_TOKEN_SECRET": "",
+    "CLOUDINARY_URL": {
+      "required": false,
+      "value": ""
+    },
     "TWEET_INTERVAL": "2h",
     "TWEET_CHANCE": "0.8",
     "BLACKLIST": {
diff --git a/bots.rb b/bots.rb
index 5f0ccc6..4620b8a 100644
--- a/bots.rb
+++ b/bots.rb
@@ -1,11 +1,12 @@
 require 'twitter_ebooks'
 require_relative 'boodoo'
 require 'dotenv'
+require 'cloudinary'
 
 include Ebooks::Boodoo
 
 # Read defaults and lay env vars on top:
-SETTINGS = Dotenv.load('defaults.env').merge(ENV)
+SETTINGS = Dotenv.load('secrets.env').merge(ENV)
 
 
 # Information about a particular Twitter user we know
diff --git a/defaults.env b/defaults.env
index 9b80925..c6b62cf 100644
--- a/defaults.env
+++ b/defaults.env
@@ -4,6 +4,7 @@ CONSUMER_KEY=
 CONSUMER_SECRET=
 ACCESS_TOKEN=
 ACCESS_TOKEN_SECRET=
+CLOUDINARY_URL=
 TWEET_INTERVAL=2h
 TWEET_CHANCE=0.8
 BLACKLIST=tinysubversions, dril