Drop hiredis

seuros · seuros · commit 43b30be643a9 · 2014-07-20T22:11:12.000Z
update gems
run codeclimate-test-reporter only when ENV['COVERAGE'] is set
diff --git a/Gemfile b/Gemfile
@@ -66,9 +66,7 @@ gem 'kaminari'
 gem 'chronic'
 
 # Redis
-gem 'hiredis'
-gem 'redis', require: ['redis', 'redis/connection/hiredis']
-gem 'redis-rails'
+gem 'redis-rails' , '~> 3.2'
 
 # Background Job Processing
 gem 'resque'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -152,9 +152,9 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.1)
-    color (1.7)
+    color (1.7.1)
     columnize (0.8.9)
-    compass (0.12.6)
+    compass (0.12.7)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
@@ -200,9 +200,9 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     ember-data-source (1.0.0.beta.8)
       ember-source
-    ember-source (1.6.0)
+    ember-source (1.6.1)
       handlebars-source (~> 1.0)
-    ephemeral (2.3.2)
+    ephemeral (2.3.3)
       activesupport
     equalizer (0.0.9)
     erubis (2.7.0)
@@ -227,28 +227,32 @@ GEM
       sax-machine (~> 0.2.1)
     ffaker (1.24.0)
     ffi (1.9.3)
-    flog (4.2.1)
+    flog (4.3.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.4)
-    fog (1.22.1)
+    fog (1.23.0)
       fog-brightbox
-      fog-core (~> 1.22)
+      fog-core (~> 1.23)
       fog-json
+      fog-softlayer
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
     fog-brightbox (0.1.1)
       fog-core (~> 1.22)
       fog-json
       inflecto
-    fog-core (1.22.0)
+    fog-core (1.23.0)
       builder
-      excon (~> 0.33)
+      excon (~> 0.38)
       formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
     fog-json (1.0.0)
       multi_json (~> 1.0)
+    fog-softlayer (0.3.9)
+      fog-core
+      fog-json
     foreman (0.74.0)
       dotenv (~> 0.11.1)
       thor (~> 0.19.1)
@@ -307,7 +311,6 @@ GEM
     highline (1.6.21)
     hike (1.2.3)
     hirb (0.7.2)
-    hiredis (0.5.2)
     http (0.5.1)
       http_parser.rb
     http_parser.rb (0.6.0)
@@ -318,7 +321,7 @@ GEM
     i18n (0.6.11)
     inflecto (0.0.2)
     ipaddress (0.8.0)
-    jbuilder (2.1.2)
+    jbuilder (2.1.3)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     journey (1.0.4)
@@ -589,7 +592,7 @@ GEM
     rspec-support (3.0.2)
     ruby-graphviz (1.0.9)
     ruby-progressbar (1.5.1)
-    ruby_parser (3.6.1)
+    ruby_parser (3.6.2)
       sexp_processor (~> 4.1)
     rufus-scheduler (2.0.24)
       tzinfo (>= 0.3.22)
@@ -606,7 +609,7 @@ GEM
     sax-machine (0.2.1)
       nokogiri (~> 1.6.0)
     sexp_processor (4.4.3)
-    shoulda-matchers (2.6.1)
+    shoulda-matchers (2.6.2)
       activesupport (>= 3.0.0)
     sidekiq (3.2.1)
       celluloid (>= 0.15.2)
@@ -619,7 +622,7 @@ GEM
       actionpack (~> 3.0)
       activemodel (~> 3.0)
     simple_oauth (0.2.0)
-    simplecov (0.8.2)
+    simplecov (0.9.0)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
@@ -628,7 +631,7 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    slop (3.5.0)
+    slop (3.6.0)
     split (0.7.2)
       redis (>= 2.1)
       redis-namespace (>= 1.1.0)
@@ -695,7 +698,7 @@ GEM
     typhoeus (0.6.9)
       ethon (>= 0.7.1)
     tzinfo (0.3.40)
-    uglifier (2.5.1)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     vcr (2.9.2)
@@ -752,7 +755,6 @@ DEPENDENCIES
   hamlbars (= 1.1.0)
   hashie
   heroku_rails_deflate
-  hiredis
   jazz_hands!
   jbuilder
   jquery-rails (= 2.0.3)
@@ -794,8 +796,7 @@ DEPENDENCIES
   rails_autolink
   rakismet
   redcarpet
-  redis
-  redis-rails
+  redis-rails (~> 3.2)
   resque
   resque-scheduler
   resque_mailer
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,12 +1,11 @@
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start 'rails'
+  require 'codeclimate-test-reporter'
+  CodeClimate::TestReporter.start
 end
 
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-
-ENV['RAILS_ENV'] ||= 'test'
+ENV['RAILS_ENV'] = 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 require 'capybara/rspec'
