[ARVADOS] updated: 50f8ae2c283cb65d61cae70c29bf6a5bdaa26bf9

Git user git at public.curoverse.com
Wed May 4 16:57:07 EDT 2016


Summary of changes:
 apps/workbench/Gemfile.lock | 74 ++++++++++++++++++++++++++++-----------------
 services/api/Gemfile        |  1 -
 services/api/Gemfile.lock   | 45 +++++++++++++--------------
 3 files changed, 69 insertions(+), 51 deletions(-)

       via  50f8ae2c283cb65d61cae70c29bf6a5bdaa26bf9 (commit)
      from  5bd65b09716c720ecdb154c7cbeb5be80a1b5e8f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 50f8ae2c283cb65d61cae70c29bf6a5bdaa26bf9
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed May 4 16:20:29 2016 -0400

    Update API server and Workbench bundles to latest arvados gems.
    
    No issue #

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index b4e2400..fdcd375 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -37,16 +37,17 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.4.0)
     andand (1.3.3)
     angularjs-rails (1.3.8)
     arel (5.0.1.20140414130214)
-    arvados (0.1.20150511150219)
-      activesupport (>= 3.2.13)
+    arvados (0.1.20160420143004)
+      activesupport (>= 3, < 4.2.6)
       andand (~> 1.3, >= 1.3.3)
-      google-api-client (~> 0.6.3, >= 0.6.3)
+      google-api-client (>= 0.7, < 0.9)
+      i18n (~> 0)
       json (~> 1.7, >= 1.7.7)
-      jwt (>= 0.1.5, < 1.0.0)
+      jwt (>= 0.1.5, < 2)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
@@ -93,24 +94,33 @@ GEM
     erubis (2.7.0)
     execjs (2.2.2)
     extlib (0.9.16)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     fast_stack (0.1.0)
       rake
       rake-compiler
     ffi (1.9.10)
     flamegraph (0.1.0)
       fast_stack
-    google-api-client (0.6.4)
-      addressable (>= 2.3.2)
-      autoparse (>= 0.3.3)
-      extlib (>= 0.9.15)
-      faraday (~> 0.8.4)
-      jwt (>= 0.1.5)
-      launchy (>= 2.1.1)
-      multi_json (>= 1.0.0)
-      signet (~> 0.4.5)
-      uuidtools (>= 2.1.0)
+    google-api-client (0.8.6)
+      activesupport (>= 3.2)
+      addressable (~> 2.3)
+      autoparse (~> 0.3)
+      extlib (~> 0.9)
+      faraday (~> 0.9)
+      googleauth (~> 0.3)
+      launchy (~> 2.4)
+      multi_json (~> 1.10)
+      retriable (~> 1.4)
+      signet (~> 0.6)
+    googleauth (0.5.1)
+      faraday (~> 0.9)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
     headless (1.0.2)
     highline (1.6.21)
     httpclient (2.6.0.1)
@@ -119,8 +129,7 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
-    jwt (0.1.13)
-      multi_json (>= 1.5)
+    jwt (1.5.4)
     launchy (2.4.3)
       addressable (~> 2.3)
     less (2.6.0)
@@ -129,18 +138,23 @@ GEM
       actionpack (>= 3.1)
       less (~> 2.6.0)
     libv8 (3.16.14.7)
+    little-plugger (1.1.4)
+    logging (2.1.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    memoist (0.14.0)
     metaclass (0.0.4)
     mime-types (2.99)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     morrisjs-rails (0.5.1)
       railties (> 3.1, < 5)
-    multi_json (1.11.2)
-    multipart-post (1.2.0)
+    multi_json (1.12.0)
+    multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -151,6 +165,7 @@ GEM
     nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
     oj (2.11.2)
+    os (0.9.6)
     passenger (4.0.57)
       daemon_controller (>= 1.2.0)
       rack
@@ -190,6 +205,7 @@ GEM
       rake
     raphael-rails (2.1.2)
     ref (1.0.5)
+    retriable (1.4.1)
     ruby-debug-passenger (0.2.0)
     ruby-prof (0.15.2)
     rubyzip (1.1.7)
@@ -207,11 +223,11 @@ GEM
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    signet (0.4.5)
-      addressable (>= 2.2.3)
-      faraday (~> 0.8.1)
-      jwt (>= 0.1.5)
-      multi_json (>= 1.0.0)
+    signet (0.7.2)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (~> 1.5)
+      multi_json (~> 1.10)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -238,7 +254,6 @@ GEM
     uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    uuidtools (2.1.5)
     websocket (1.2.2)
     websocket-driver (0.5.1)
       websocket-extensions (>= 0.1.0)
@@ -294,3 +309,6 @@ DEPENDENCIES
   therubyracer
   uglifier (>= 1.0.3)
   wiselinks
+
+BUNDLED WITH
+   1.12.1
diff --git a/services/api/Gemfile b/services/api/Gemfile
index 48998aa..1e25467 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -67,7 +67,6 @@ gem 'andand'
 
 gem 'test_after_commit', :group => :test
 
-gem 'google-api-client', '~> 0.6.3'
 gem 'trollop'
 gem 'faye-websocket'
 
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index ac6be5a..7be4e0f 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -32,23 +32,23 @@ GEM
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       rack (>= 1.1.0)
-    addressable (2.3.8)
+    addressable (2.4.0)
     andand (1.3.3)
     arel (3.0.3)
-    arvados (0.1.20150615153458)
-      activesupport (>= 3.2.13)
+    arvados (0.1.20160420143004)
+      activesupport (>= 3, < 4.2.6)
       andand (~> 1.3, >= 1.3.3)
-      google-api-client (~> 0.6.3, >= 0.6.3)
+      google-api-client (>= 0.7, < 0.9)
+      i18n (~> 0)
       json (~> 1.7, >= 1.7.7)
-      jwt (>= 0.1.5, < 1.0.0)
-    arvados-cli (0.1.20151207150126)
+      jwt (>= 0.1.5, < 2)
+    arvados-cli (0.1.20160503204200)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       arvados (~> 0.1, >= 0.1.20150128223554)
       curb (~> 0.8)
-      google-api-client (~> 0.6.3, >= 0.6.3)
+      google-api-client (~> 0.6, >= 0.6.3, < 0.9)
       json (~> 1.7, >= 1.7.7)
-      jwt (>= 0.1.5, < 1.0.0)
       oj (~> 2.0, >= 2.0.3)
       trollop (~> 2.0)
     autoparse (0.3.3)
@@ -69,7 +69,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    curb (0.8.8)
+    curb (0.9.3)
     daemon_controller (1.2.0)
     database_cleaner (1.2.0)
     erubis (2.7.0)
@@ -81,20 +81,21 @@ GEM
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     faye-websocket (0.7.2)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.3.1)
-    google-api-client (0.6.4)
+    google-api-client (0.7.1)
       addressable (>= 2.3.2)
       autoparse (>= 0.3.3)
       extlib (>= 0.9.15)
-      faraday (~> 0.8.4)
+      faraday (>= 0.9.0)
       jwt (>= 0.1.5)
       launchy (>= 2.1.1)
       multi_json (>= 1.0.0)
-      signet (~> 0.4.5)
+      retriable (>= 1.4)
+      signet (>= 0.5.0)
       uuidtools (>= 2.1.0)
     hashie (1.2.0)
     highline (1.6.21)
@@ -118,8 +119,8 @@ GEM
     mime-types (1.25.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.1)
-    multipart-post (1.2.0)
+    multi_json (1.12.0)
+    multipart-post (2.0.0)
     net-scp (1.2.0)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -133,7 +134,7 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    oj (2.11.4)
+    oj (2.15.0)
     omniauth (1.1.1)
       hashie (~> 1.2)
       rack
@@ -177,6 +178,7 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
+    retriable (2.1.0)
     ruby-prof (0.15.2)
     rvm-capistrano (1.5.1)
       capistrano (~> 2.15.4)
@@ -185,9 +187,9 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    signet (0.4.5)
+    signet (0.5.1)
       addressable (>= 2.2.3)
-      faraday (~> 0.8.1)
+      faraday (>= 0.9.0.rc5)
       jwt (>= 0.1.5)
       multi_json (>= 1.0.0)
     simplecov (0.7.1)
@@ -213,7 +215,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    trollop (2.1.1)
+    trollop (2.1.2)
     tzinfo (0.3.39)
     uglifier (2.5.0)
       execjs (>= 0.3.0)
@@ -233,7 +235,6 @@ DEPENDENCIES
   database_cleaner
   factory_girl_rails
   faye-websocket
-  google-api-client (~> 0.6.3)
   jquery-rails
   mocha
   multi_json
@@ -258,4 +259,4 @@ DEPENDENCIES
   uglifier (>= 1.0.3)
 
 BUNDLED WITH
-   1.10.6
+   1.12.1

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list