Commit a1e34649

mo k <mo@mokhan.ca>
2012-10-28 04:09:04
update gems to fix bug where test was failing when running rspec with spork. latest version of one of the gems fixes this.
1 parent 0ca0536
Changed files (1)
Gemfile.lock
@@ -50,14 +50,14 @@ GEM
     arbre (1.0.1)
       activesupport (>= 3.0.0)
     arel (3.0.2)
-    awesome_nested_set (2.1.4)
+    awesome_nested_set (2.1.5)
       activerecord (>= 3.0.0)
     bcrypt-ruby (3.0.1)
     bootstrap-sass (2.1.0.0)
     bourbon (2.1.1)
       sass (>= 3.1)
-    builder (3.0.3)
-    capistrano (2.13.3)
+    builder (3.0.4)
+    capistrano (2.13.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -75,20 +75,21 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    carrierwave (0.6.2)
+    carrierwave (0.7.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
-    carrierwave_backgrounder (0.0.7)
+    carrierwave_backgrounder (0.0.8)
       carrierwave (~> 0.5)
-    childprocess (0.3.5)
+    childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
+    coderay (1.0.8)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.4.0)
     daemons (1.1.9)
     delayed_job (3.0.3)
       activesupport (~> 3.0)
@@ -107,9 +108,10 @@ GEM
       eventmachine (>= 0.12.9)
     erubis (2.7.0)
     eventmachine (1.0.0)
-    exception_notification (2.6.1)
+    exception_notification (3.0.0)
       actionmailer (>= 3.0.4)
-    excon (0.16.2)
+      tinder (~> 1.8)
+    excon (0.16.7)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.1.0)
@@ -122,9 +124,13 @@ GEM
     fakes-rspec (1.0.2)
       fakes
       rspec
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    faraday_middleware (0.9.0)
+      faraday (>= 0.7.4, < 0.9)
     fastercsv (1.5.5)
     ffi (1.1.5)
-    fog (1.5.0)
+    fog (1.6.0)
       builder
       excon (~> 0.14)
       formatador (~> 0.2.0)
@@ -134,26 +140,31 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.3)
+    formatador (0.2.4)
     formtastic (2.2.1)
       actionpack (>= 3.0)
-    guard (1.3.2)
+    guard (1.5.1)
       listen (>= 0.4.2)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-livereload (1.0.0)
+    guard-livereload (1.1.0)
       em-websocket (>= 0.2.0)
-      guard (>= 1.1.0)
+      guard (>= 1.5.0)
       multi_json (~> 1.0)
-    guard-rspec (1.2.1)
+    guard-rspec (2.1.0)
       guard (>= 1.1)
-    guard-spork (1.2.0)
-      childprocess
+      rspec (~> 2.11)
+    guard-spork (1.2.1)
+      childprocess (>= 0.2.3)
       guard (>= 1.1)
       spork (>= 0.8.4)
       sys-proctable
     has_scope (0.5.1)
-    highline (1.6.14)
+    hashie (1.2.0)
+    highline (1.6.15)
     hike (1.2.1)
+    http_parser.rb (0.5.3)
     i18n (0.6.1)
     inherited_resources (1.3.1)
       has_scope (~> 0.5.0)
@@ -168,7 +179,7 @@ GEM
     jquery-fileupload-rails (0.3.4)
       actionpack (>= 3.1)
       railties (>= 3.1)
-    jquery-rails (2.1.2)
+    jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.5)
@@ -177,7 +188,8 @@ GEM
       activesupport (>= 3.0.0)
     libwebsocket (0.1.5)
       addressable
-    listen (0.5.0)
+    listen (0.5.3)
+    lumberjack (1.0.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -187,28 +199,34 @@ GEM
       activerecord (~> 3.1)
       activesupport (~> 3.1)
       polyamorous (~> 0.5.0)
+    method_source (0.8.1)
     mime-types (1.19)
     multi_json (1.3.6)
+    multipart-post (1.1.5)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.5.2)
+    net-ssh (2.6.1)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    newrelic_rpm (3.4.2)
+    newrelic_rpm (3.5.0.1)
     nokogiri (1.5.5)
     orm_adapter (0.4.0)
     pg (0.14.1)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.8)
       actionmailer (= 3.2.8)
@@ -228,7 +246,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    responders (0.9.2)
+    responders (0.9.3)
       railties (~> 3.1)
     rmagick (2.13.1)
     rspec (2.11.0)
@@ -238,8 +256,8 @@ GEM
     rspec-core (2.11.1)
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    rspec-rails (2.11.0)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -258,10 +276,12 @@ GEM
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+    simple_oauth (0.1.9)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    slop (3.3.3)
     spork (0.9.2)
     sprockets (2.1.3)
       hike (~> 1.2)
@@ -269,13 +289,27 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
     stringex (1.4.0)
-    sys-proctable (0.9.1)
+    sys-proctable (0.9.2)
     thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    tinder (1.9.1)
+      eventmachine (>= 0.12.0, < 2)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.8)
+      hashie (~> 1.0)
+      json (~> 1.6)
+      mime-types (~> 1.16)
+      multi_json (~> 1.0)
+      multipart-post (~> 1.1)
+      twitter-stream (~> 0.1)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    twitter-stream (0.1.16)
+      eventmachine (>= 0.12.8)
+      http_parser.rb (~> 0.5.1)
+      simple_oauth (~> 0.1.4)
+    tzinfo (0.3.34)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)