From 910b0e104c5dcab1c60de7d52f71dbaa4372bc62 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Wed, 7 Dec 2011 10:49:00 -0800
Subject: [PATCH] added fog back to the Gemfile

---
 Gemfile      |  1 +
 Gemfile.lock | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/Gemfile b/Gemfile
index a88b99db1..cff264651 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,6 +45,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
 # file uploading
 
 gem 'carrierwave', '0.5.8'
+gem 'fog'
 gem 'fastercsv', '1.5.4', :require => false
 gem 'mini_magick', '3.3'
 gem 'rest-client', '1.6.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4cc85fae7..fda3ca6fc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -161,6 +161,7 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
+    excon (0.7.12)
     extlib (0.9.15)
     factory_girl (2.3.2)
       activesupport
@@ -179,10 +180,21 @@ GEM
     fixture_builder (0.3.1)
       activerecord (>= 2)
       activesupport (>= 2)
+    fog (1.1.1)
+      builder
+      excon (~> 0.7.4)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0.3)
+      net-scp (~> 1.0.4)
+      net-ssh (>= 2.1.3)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
     foreigner (0.9.1)
     foreman (0.27.0)
       term-ansicolor (~> 1.0.5)
       thor (>= 0.13.6)
+    formatador (0.2.1)
     fuubar (0.0.5)
       rspec (~> 2.0)
       rspec-instafail (~> 0.1.4)
@@ -359,6 +371,7 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
+    ruby-hmac (0.4.0)
     ruby-oembed (0.8.5)
     ruby-progressbar (0.0.10)
     ruby_core_source (0.1.5)
@@ -439,6 +452,7 @@ DEPENDENCIES
   faraday-stack
   fastercsv (= 1.5.4)
   fixture_builder (= 0.3.1)
+  fog
   foreigner (= 0.9.1)
   foreman
   fuubar (= 0.0.5)