[ARVADOS] updated: 4c4387de5857ef00899fcb760a7cfc5ad4b76268

[Git user]

Summary of changes:
 sdk/cli/arvados-cli.gemspec |  4 +++-
 sdk/cli/bin/arv             | 29 +++++++++++++++++++----------
 sdk/ruby/arvados.gemspec    |  4 +++-
 3 files changed, 25 insertions(+), 12 deletions(-)

       via  4c4387de5857ef00899fcb760a7cfc5ad4b76268 (commit)
       via  e0d2a1aa4e13da85575cef7ea4136e69b5423ba8 (commit)
       via  324d0d6d115488d0ac7fea7aa1a6cff3dd16be0e (commit)
       via  d2dad24530a065808487a3006ab20a98a67d8fa5 (commit)
      from  7f7ed63314bec77bf93edc233514c50a1030cac4 (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 4c4387de5857ef00899fcb760a7cfc5ad4b76268
Merge: 7f7ed63 e0d2a1a
Author: Brett Smith <brett at curoverse.com>
Date:   Fri May 13 11:25:36 2016 -0400

    Merge branch '9213-fix-arv-gems-wip'
    
    Closes #9213, #9215.


commit e0d2a1aa4e13da85575cef7ea4136e69b5423ba8
Author: Brett Smith <brett at curoverse.com>
Date:   Thu May 12 16:48:43 2016 -0400

    9213: Update arv's `gem install` suggestions.
    
    This makes it match what it actually loads.

diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index 301cadc..b377ffe 100755
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -40,7 +40,7 @@ Error loading gems: #{error}
 
 Please install all required gems:
 
-  gem install activesupport andand curb google-api-client json oj trollop yaml
+  gem install arvados activesupport andand curb json oj trollop
 
   EOS
 end

commit 324d0d6d115488d0ac7fea7aa1a6cff3dd16be0e
Author: Brett Smith <brett at curoverse.com>
Date:   Thu May 12 16:40:37 2016 -0400

    9213: Improve gem loading in `arv`.
    
    * Include the exception string in the error message.
    * Separate stdlib loading problems from gem loading problems.
    * Load gems with more dependencies first, to avoid situations like
      this:
    
    irb(main):001:0> require 'active_support/inflector'
    => true
    irb(main):002:0> require 'arvados/google_api_client'
    Gem::LoadError: Unable to activate arvados-0.1.20160420143004, because activesupport-4.2.6 conflicts with activesupport (< 4.2.6, >= 3)

diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index 541bcdc..301cadc 100755
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -14,21 +14,30 @@ if RUBY_VERSION < '1.9.3' then
 end
 
 begin
-  require 'curb'
-  require 'rubygems'
-  require 'arvados/google_api_client'
   require 'json'
+  require 'net/http'
   require 'pp'
-  require 'trollop'
+  require 'tempfile'
+  require 'yaml'
+rescue LoadError => error
+  abort "Error loading libraries: #{error}\n"
+end
+
+begin
+  require 'rubygems'
+  # Load the gems with more requirements first, so we respect any version
+  # constraints they put on gems loaded later.
+  require 'arvados/google_api_client'
+  require 'active_support/inflector'
   require 'andand'
+  require 'curb'
   require 'oj'
-  require 'active_support/inflector'
-  require 'yaml'
-  require 'tempfile'
-  require 'net/http'
-rescue LoadError
+  require 'trollop'
+rescue LoadError => error
   abort <<-EOS
 
+Error loading gems: #{error}
+
 Please install all required gems:
 
   gem install activesupport andand curb google-api-client json oj trollop yaml

commit d2dad24530a065808487a3006ab20a98a67d8fa5
Author: Brett Smith <brett at curoverse.com>
Date:   Thu May 12 16:37:59 2016 -0400

    9213: Fix google-api-client dependency range in gemspecs.

diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec
index 7755a5a..0e11f96 100644
--- a/sdk/cli/arvados-cli.gemspec
+++ b/sdk/cli/arvados-cli.gemspec
@@ -25,7 +25,9 @@ Gem::Specification.new do |s|
   s.executables << "arv-tag"
   s.required_ruby_version = '>= 2.1.0'
   s.add_runtime_dependency 'arvados', '~> 0.1', '>= 0.1.20150128223554'
-  s.add_runtime_dependency 'google-api-client', '~> 0.6', '>= 0.6.3', '<0.9'
+  # Our google-api-client dependency used to be < 0.9, but that could be
+  # satisfied by the buggy 0.9.pre*.  https://dev.arvados.org/issues/9213
+  s.add_runtime_dependency 'google-api-client', '~> 0.6', '>= 0.6.3', '<0.8.9'
   s.add_runtime_dependency 'activesupport', '~> 3.2', '>= 3.2.13'
   s.add_runtime_dependency 'json', '~> 1.7', '>= 1.7.7'
   s.add_runtime_dependency 'trollop', '~> 2.0'
diff --git a/sdk/ruby/arvados.gemspec b/sdk/ruby/arvados.gemspec
index 355ed5d..2c4e60e 100644
--- a/sdk/ruby/arvados.gemspec
+++ b/sdk/ruby/arvados.gemspec
@@ -22,7 +22,9 @@ Gem::Specification.new do |s|
   # activesupport <4.2.6 only because https://dev.arvados.org/issues/8222
   s.add_dependency('activesupport', '>= 3', '< 4.2.6')
   s.add_dependency('andand', '~> 1.3', '>= 1.3.3')
-  s.add_dependency('google-api-client', '>= 0.7', '< 0.9')
+  # Our google-api-client dependency used to be < 0.9, but that could be
+  # satisfied by the buggy 0.9.pre*.  https://dev.arvados.org/issues/9213
+  s.add_dependency('google-api-client', '>= 0.7', '< 0.8.9')
   # work around undeclared dependency on i18n in some activesupport 3.x.x:
   s.add_dependency('i18n', '~> 0')
   s.add_dependency('json', '~> 1.7', '>= 1.7.7')

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


hooks/post-receive
--