From 50f3fb056bfb54ba1b79a7dc1307b1c16a792b78 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Tue, 8 Aug 2017 13:44:40 -0700 Subject: [PATCH] [red] update to fog-google v1.0.0 --- Gemfile | 7 ++--- Gemfile.lock | 86 ++++++++++++++++++++++++++-------------------------- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/Gemfile b/Gemfile index b0509781b4d..5ac29824000 100644 --- a/Gemfile +++ b/Gemfile @@ -9,14 +9,13 @@ gem 'clockwork', require: false gem 'cloudfront-signer' gem 'em-http-request', '~> 1.0' gem 'eventmachine', '~> 1.0.9' -gem 'google-api-client', '~> 0.8.6' # required for fog-google gem 'httpclient' gem 'i18n' gem 'json-schema' gem 'json_pure', '1.8.6' gem 'loggregator_emitter', '~> 5.0' gem 'membrane', '~> 1.0' -gem 'mime-types', '~> 2.6.2' +gem 'mime-types', '~> 3.0' gem 'multi_json' gem 'multipart-parser' gem 'net-ssh' @@ -25,7 +24,7 @@ gem 'newrelic_rpm', '>= 3.12' gem 'nokogiri', '~> 1.8.1' gem 'posix-spawn', '~> 0.3.6' gem 'protobuf', '3.6.12' -gem 'public_suffix', '~> 1.0' +gem 'public_suffix', '~> 2.0' gem 'railties' gem 'rake' gem 'rfc822' @@ -43,7 +42,7 @@ gem 'yajl-ruby' gem 'fog-aws' gem 'fog-azure-rm' -gem 'fog-google' +gem 'fog-google', '~> 1.0.0' gem 'fog-local' gem 'fog-openstack' diff --git a/Gemfile.lock b/Gemfile.lock index 64a83c9b2ad..15e148d62e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,15 +50,12 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.4.0) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) allowy (2.1.0) activesupport (>= 3.2) i18n ast (2.3.0) - autoparse (0.3.3) - addressable (>= 2.3.1) - extlib (>= 0.9.15) - multi_json (>= 1.0.0) awesome_print (1.7.0) azure-core (0.1.12) faraday (~> 0.9) @@ -111,6 +108,8 @@ GEM debase (0.2.2.beta10) debase-ruby_core_source debase-ruby_core_source (0.9.10) + declarative (0.0.10) + declarative-option (0.1.0) delayed_job (4.1.3) activesupport (>= 3.0, < 5.2) diff-lcs (1.3) @@ -127,8 +126,7 @@ GEM eventmachine (>= 1.0.0.beta.4) erubis (2.7.0) eventmachine (1.0.9.1) - excon (0.59.0) - extlib (0.9.16) + excon (0.60.0) fakefs (0.10.0) faraday (0.13.1) multipart-post (>= 1.2, < 3) @@ -162,10 +160,11 @@ GEM builder excon (~> 0.49) formatador (~> 0.2) - fog-google (0.5.2) + fog-google (1.0.0) fog-core fog-json fog-xml + google-api-client (~> 0.19.1) fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) @@ -179,39 +178,35 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) - google-api-client (0.8.7) - activesupport (>= 3.2, < 5.0) - 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) - google-protobuf (3.5.0) - google-protobuf (3.5.0-universal-darwin) - google-protobuf (3.5.0-x86_64-linux) + google-api-client (0.19.2) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.5, < 0.7.0) + httpclient (>= 2.8.1, < 3.0) + mime-types (~> 3.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + google-protobuf (3.5.1) + google-protobuf (3.5.1-universal-darwin) + google-protobuf (3.5.1-x86_64-linux) googleapis-common-protos-types (1.0.1) google-protobuf (~> 3.0) - googleauth (0.5.3) + googleauth (0.6.2) faraday (~> 0.12) - jwt (~> 1.4) + jwt (>= 1.4, < 3.0) logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.7.3) + grpc (1.8.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) - grpc (1.7.3-universal-darwin) + grpc (1.8.0-universal-darwin) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) - grpc (1.7.3-x86_64-linux) + grpc (1.8.0-x86_64-linux) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) @@ -220,15 +215,14 @@ GEM domain_name (~> 0.5) http_parser.rb (0.6.0) httpclient (2.8.2.4) - i18n (0.8.6) + i18n (0.9.1) + concurrent-ruby (~> 1.0) ipaddress (0.8.3) json (1.8.6) json-schema (2.8.0) addressable (>= 2.4) json_pure (1.8.6) - jwt (1.5.6) - launchy (2.4.3) - addressable (~> 2.3) + jwt (2.1.0) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -242,9 +236,11 @@ GEM memoist (0.16.0) method_source (0.8.2) middleware (0.1.0) - mime-types (2.6.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) mini_portile2 (2.3.0) - minitest (5.10.3) + minitest (5.11.1) ms_rest (0.6.4) concurrent-ruby (~> 1.0) faraday (~> 0.9) @@ -287,7 +283,7 @@ GEM pry-byebug (3.4.2) byebug (~> 9.0) pry (~> 0.10) - public_suffix (1.5.3) + public_suffix (2.0.5) rack (1.6.8) rack-protection (1.5.3) rack @@ -309,11 +305,15 @@ GEM rainbow (2.2.2) rake rake (12.1.0) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - retriable (1.4.1) + retriable (3.1.1) rfc822 (0.1.5) roodi (5.0.0) ruby_parser (~> 3.2, >= 3.2.2) @@ -363,10 +363,10 @@ GEM scientist (1.1.0) sequel (4.49.0) sexp_processor (4.7.0) - signet (0.7.3) + signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) - jwt (~> 1.5) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simplecov (0.12.0) docile (~> 1.1.0) @@ -403,8 +403,9 @@ GEM tilt (2.0.8) timecop (0.8.1) timeliness (0.3.8) - tzinfo (1.2.3) + tzinfo (1.2.4) thread_safe (~> 0.1) + uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.4) @@ -445,10 +446,9 @@ DEPENDENCIES fakefs fog-aws fog-azure-rm - fog-google + fog-google (~> 1.0.0) fog-local fog-openstack - google-api-client (~> 0.8.6) hashdiff httpclient i18n @@ -457,7 +457,7 @@ DEPENDENCIES loggregator_emitter (~> 5.0) machinist (~> 1.0.6) membrane (~> 1.0) - mime-types (~> 2.6.2) + mime-types (~> 3.0) multi_json multipart-parser mysql2 (= 0.4.8) @@ -470,7 +470,7 @@ DEPENDENCIES posix-spawn (~> 0.3.6) protobuf (= 3.6.12) pry-byebug - public_suffix (~> 1.0) + public_suffix (~> 2.0) rack-test railties rake @@ -501,4 +501,4 @@ DEPENDENCIES yajl-ruby BUNDLED WITH - 1.16.0 + 1.16.1