Merge pull request #93 from mattgibson/gem-update

Gems updated
resque · May 24, 2015 · c09a9b4 · c09a9b4
2 parents 10f2d2e + 4e00d8e
commit c09a9b4
Show file tree

Hide file tree

Showing 2 changed files with 128 additions and 125 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/resque/resque.git
-  revision: aee359b79ed58799a9d1463b47da6533395e1185
+  revision: 68b43a3a01006abb0aabf0d564967f546ec1e134
   branch: 1-x-stable
   specs:
-    resque (1.25.1)
+    resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
@@ -23,113 +23,115 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.3)
-      actionpack (= 4.0.3)
-      mail (~> 2.5.4)
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
+      activesupport (= 4.0.13)
       arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activerecord-jdbc-adapter (1.2.9.1)
-    activerecord-jdbcsqlite3-adapter (1.2.9)
-      activerecord-jdbc-adapter (~> 1.2.9)
-      jdbc-sqlite3 (~> 3.7.2)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
+    activerecord-deprecated_finders (1.0.4)
+    activerecord-jdbc-adapter (1.3.16)
+      activerecord (>= 2.2)
+    activerecord-jdbcsqlite3-adapter (1.3.16)
+      activerecord-jdbc-adapter (~> 1.3.16)
+      jdbc-sqlite3 (>= 3.7.2, < 3.9)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.2)
-    atomic (1.1.15)
-    atomic (1.1.15-java)
     builder (3.1.4)
-    coffee-rails (4.0.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.1)
-    colorize (0.5.8)
-    coveralls (0.6.7)
-      colorize
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    dotenv (0.9.0)
-    dotenv-rails (0.9.0)
-      dotenv (= 0.9.0)
+    coffee-script-source (1.9.1.1)
+    coveralls (0.8.1)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+    docile (1.1.5)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.0.1)
+    dotenv-rails (2.0.1)
+      dotenv (= 2.0.1)
     erubis (2.7.0)
-    execjs (2.0.1)
+    execjs (2.5.2)
     ffi2-generators (0.1.1)
-    hike (1.2.3)
-    i18n (0.6.9)
-    jdbc-sqlite3 (3.7.2.1)
-    jquery-rails (3.1.1)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    i18n (0.7.0)
+    jdbc-sqlite3 (3.8.10.1)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    json (1.8.1-java)
+    json (1.8.2)
+    json (1.8.2-java)
     libv8 (3.16.14.7)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.25.1)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    metaclass (0.0.4)
+    mime-types (2.5)
     minitest (4.7.5)
-    minitest-spec-rails (4.7.6)
+    minitest-spec-rails (4.7.8)
       minitest (~> 4.7)
       rails (>= 3.0, < 4.1)
-    mocha (0.14.0)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
-    multi_json (1.8.4)
-    polyglot (0.3.4)
-    racc (1.4.10)
-    rack (1.5.2)
-    rack-protection (1.5.2)
+    multi_json (1.11.0)
+    netrc (0.10.3)
+    racc (1.4.12)
+    rack (1.5.3)
+    rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.3)
-      actionmailer (= 4.0.3)
-      actionpack (= 4.0.3)
-      activerecord (= 4.0.3)
-      activesupport (= 4.0.3)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.3)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+      railties (= 4.0.13)
+      sprockets-rails (~> 2.0)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
-    rdoc (4.0.1)
-      json (~> 1.4)
+    rake (10.4.2)
+    rdoc (4.2.0)
     redcard (1.1.0)
-    redis (3.0.7)
-    redis-namespace (1.4.1)
-      redis (~> 3.0.4)
+    redis (3.2.1)
+    redis-namespace (1.5.2)
+      redis (~> 3.0, >= 3.0.4)
     ref (1.0.5)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rubinius-coverage (2.0.3)
-    rubinius-profiler (2.0.0)
-    rubysl (2.0.15)
+    rubinius-profiler (2.0.2)
+    rubysl (2.1.0)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
       rubysl-benchmark (~> 2.0)
@@ -163,7 +165,7 @@ GEM
       rubysl-io-nonblock (~> 2.0)
       rubysl-io-wait (~> 2.0)
       rubysl-ipaddr (~> 2.0)
-      rubysl-irb (~> 2.0)
+      rubysl-irb (~> 2.1)
       rubysl-logger (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-matrix (~> 2.0)
@@ -192,7 +194,6 @@ GEM
       rubysl-pstore (~> 2.0)
       rubysl-pty (~> 2.0)
       rubysl-rational (~> 2.0)
-      rubysl-readline (~> 2.0)
       rubysl-resolv (~> 2.0)
       rubysl-rexml (~> 2.0)
       rubysl-rinda (~> 2.0)
@@ -234,14 +235,14 @@ GEM
     rubysl-csv (2.0.2)
       rubysl-english (~> 2.0)
     rubysl-curses (2.0.1)
-    rubysl-date (2.0.6)
+    rubysl-date (2.0.9)
     rubysl-delegate (2.0.1)
-    rubysl-digest (2.0.3)
+    rubysl-digest (2.0.8)
     rubysl-drb (2.0.1)
     rubysl-e2mmap (2.0.0)
     rubysl-english (2.0.0)
     rubysl-enumerator (2.0.0)
-    rubysl-erb (2.0.1)
+    rubysl-erb (2.0.2)
     rubysl-etc (2.0.3)
       ffi2-generators (~> 0.1)
     rubysl-expect (2.0.0)
@@ -259,12 +260,11 @@ GEM
     rubysl-io-nonblock (2.0.0)
     rubysl-io-wait (2.0.0)
     rubysl-ipaddr (2.0.0)
-    rubysl-irb (2.0.4)
+    rubysl-irb (2.1.1)
       rubysl-e2mmap (~> 2.0)
       rubysl-mathn (~> 2.0)
-      rubysl-readline (~> 2.0)
       rubysl-thread (~> 2.0)
-    rubysl-logger (2.0.0)
+    rubysl-logger (2.1.0)
     rubysl-mathn (2.0.0)
     rubysl-matrix (2.1.0)
       rubysl-e2mmap (~> 2.0)
@@ -287,22 +287,21 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.0.5)
+    rubysl-openssl (2.3.0)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
     rubysl-ostruct (2.0.4)
-    rubysl-pathname (2.0.0)
-    rubysl-prettyprint (2.0.2)
+    rubysl-pathname (2.1.0)
+    rubysl-prettyprint (2.0.3)
     rubysl-prime (2.0.1)
     rubysl-profile (2.0.0)
     rubysl-profiler (2.0.1)
     rubysl-pstore (2.0.0)
-    rubysl-pty (2.0.2)
+    rubysl-pty (2.0.3)
     rubysl-rational (2.0.1)
-    rubysl-readline (2.0.2)
-    rubysl-resolv (2.0.0)
-    rubysl-rexml (2.0.2)
-    rubysl-rinda (2.0.0)
+    rubysl-resolv (2.1.2)
+    rubysl-rexml (2.0.4)
+    rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
     rubysl-scanf (2.0.0)
     rubysl-securerandom (2.0.0)
@@ -313,14 +312,14 @@ GEM
     rubysl-stringio (2.0.0)
     rubysl-strscan (2.0.0)
     rubysl-sync (2.0.0)
-    rubysl-syslog (2.0.1)
+    rubysl-syslog (2.1.0)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
-    rubysl-thread (2.0.2)
+    rubysl-thread (2.0.3)
     rubysl-thwait (2.0.0)
     rubysl-time (2.0.3)
     rubysl-timeout (2.0.0)
-    rubysl-tmpdir (2.0.0)
+    rubysl-tmpdir (2.0.1)
     rubysl-tsort (2.0.1)
     rubysl-un (2.0.0)
       rubysl-fileutils (~> 2.0)
@@ -329,56 +328,57 @@ GEM
     rubysl-weakref (2.0.0)
     rubysl-webrick (2.0.0)
     rubysl-xmlrpc (2.0.0)
-    rubysl-yaml (2.0.4)
+    rubysl-yaml (2.1.0)
     rubysl-zlib (2.0.1)
-    sass (3.2.19)
-    sass-rails (4.0.3)
+    sass (3.4.14)
+    sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sinatra (1.4.4)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
+    simplecov (0.10.0)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sprockets (2.11.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+      tilt (>= 1.3, < 3)
+    sprockets (3.1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.8)
-    therubyracer (0.12.1)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     therubyrhino (2.0.2)
       therubyrhino_jar (>= 1.7.3)
-    therubyrhino_jar (1.7.4)
-    thor (0.18.1)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
-    thread_safe (0.2.0-java)
-      atomic (>= 1.1.7, < 2)
+    therubyrhino_jar (1.7.6)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
+    tins (1.5.1)
     twitter-bootstrap-rails (2.2.8)
       actionpack (>= 3.1)
       execjs
       rails (>= 3.1)
       railties (>= 3.1)
-    tzinfo (0.3.38)
-    uglifier (2.2.0)
+    tzinfo (0.3.44)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
+    unf (0.1.4)
+      unf_ext
+    unf (0.1.4-java)
+    unf_ext (0.0.7.1)
     vegas (0.1.11)
       rack (>= 1.0.0)
 

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,3 +1,6 @@
+require 'dotenv'
+Dotenv.load!
+
 require 'redcard'
 require 'profiler' if RedCard.check :rubinius