From 434deee36655d88b3e78425dec2d1ccfce1f0619 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Wed, 29 Apr 2015 13:37:21 -0700
Subject: [PATCH] Update rmagick (and add io/extra for geoip)

---
 Gemfile                      | 1 +
 Gemfile.lock                 | 4 +++-
 workers/screenshot_worker.rb | 4 ++--
 workers/thumbnail_worker.rb  | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3aaebd78..5a75ade3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,6 +27,7 @@ gem 'scrypt'
 gem 'rack-cache'
 gem 'rest-client'
 gem 'geoip'
+gem 'io-extra', require: 'io/extra'
 
 platform :mri, :rbx do
   gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic
diff --git a/Gemfile.lock b/Gemfile.lock
index b3d69511..56045876 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,6 +79,7 @@ GEM
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.6.9)
+    io-extra (1.2.8)
     jimson-temp (0.9.5)
       blankslate (>= 3.1.2)
       multi_json (~> 1.0)
@@ -158,7 +159,7 @@ GEM
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     retriable (1.4.1)
-    rmagick (2.13.3)
+    rmagick (2.15.0)
     safe_yaml (1.0.4)
     sass (3.3.8)
     screencap (0.1.1)
@@ -246,6 +247,7 @@ DEPENDENCIES
   geoip
   google-api-client
   hiredis
+  io-extra
   jdbc-postgres
   jruby-openssl
   json
diff --git a/workers/screenshot_worker.rb b/workers/screenshot_worker.rb
index bc172bb4..8831a1d4 100644
--- a/workers/screenshot_worker.rb
+++ b/workers/screenshot_worker.rb
@@ -1,4 +1,4 @@
-require 'RMagick'
+require 'rmagick'
 require 'timeout'
 require 'securerandom'
 require 'thread'
@@ -52,7 +52,7 @@ class ScreenshotWorker
       site = Site[username: username]
       site.is_crashing = true
       site.save_changes validate: false
-      
+
       # Don't enable until we know it works well.
 =begin
       if site.email
diff --git a/workers/thumbnail_worker.rb b/workers/thumbnail_worker.rb
index 9f0a558f..181b2183 100644
--- a/workers/thumbnail_worker.rb
+++ b/workers/thumbnail_worker.rb
@@ -1,4 +1,4 @@
-require 'RMagick'
+require 'rmagick'
 
 class ThumbnailWorker
   THUMBNAILS_PATH = Site::THUMBNAILS_ROOT
@@ -25,4 +25,4 @@ class ThumbnailWorker
       }
     end
   end
-end
\ No newline at end of file
+end