Merge pull request #413 from theodi/update-dependencies-2014-12-24

Updated dependencies
theodi · Dec 24, 2014 · b291ff1 · b291ff1
2 parents 869aa31 + 6e06a57
commit b291ff1
Showing 1 changed file with 16 additions and 21 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -59,8 +59,6 @@ GEM
     addressable (2.3.6)
     archive-tar-minitar (0.5.2)
     builder (3.0.4)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
     childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
@@ -162,36 +160,34 @@ GEM
       multi_json (~> 1.4)
       nokogiri (~> 1.5.2)
       oauth2
-    guard (2.10.4)
+    guard (1.8.3)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-cucumber (1.5.1)
-      cucumber (>= 1.3.0)
-      guard (>= 2.0.0)
-    guard-spork (1.5.1)
+      listen (~> 1.3)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-cucumber (1.4.1)
+      cucumber (>= 1.2.0)
+      guard (>= 1.1.0)
+    guard-spork (1.5.2)
       childprocess (>= 0.2.3)
-      guard (>= 1.1)
+      guard (~> 1.1)
       spork (>= 0.8.4)
     hashie (3.3.2)
-    hitimes (1.2.2)
     httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.6.11)
+    i18n (0.7.0)
     inflecto (0.0.2)
     ipaddress (0.8.0)
     json (1.8.1)
     jwt (1.2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    listen (2.8.3)
-      celluloid (>= 0.15.2)
+    listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
     lumberjack (1.0.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
@@ -203,7 +199,6 @@ GEM
     multi_test (0.1.1)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
-    nenv (0.1.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
@@ -221,13 +216,15 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
+    rack (1.6.0)
     rack-protection (1.5.3)
       rack
     rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
+    rb-kqueue (0.2.3)
+      ffi (>= 0.5.0)
     rdoc (4.2.0)
       json (~> 1.4)
     redis (3.2.0)
@@ -283,8 +280,6 @@ GEM
     thor (0.19.1)
     tilt (1.4.1)
     timecop (0.7.1)
-    timers (4.0.1)
-      hitimes
     tzinfo (0.3.42)
     vcr (2.9.3)
     vegas (0.1.11)