From: Ward Vandewege <ward@jhvc.com>
Date: Mon, 3 Sep 2018 19:14:37 +0000 (-0400)
Subject: Make the old google-api-client 0.8 release compatible with ruby 2.3.7,
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/4abc0252edc8b00fc76e6481ce731f2bba607fe3

Make the old google-api-client 0.8 release compatible with ruby 2.3.7,
by stripping an invalid CR from a http header.

No issue #
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d11caf68b..34e7dfaa2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 0.8.8
+* Do not put CR/LF in http headers
+
 # 0.8.7
 * Lock activesupport version to < 5.0
 
diff --git a/google-api-client.gemspec b/google-api-client.gemspec
index e5e3498058..da7afe9327 100644
--- a/google-api-client.gemspec
+++ b/google-api-client.gemspec
@@ -2,7 +2,7 @@
 require File.join(File.dirname(__FILE__), 'lib/google/api_client', 'version')
 
 Gem::Specification.new do |s|
-  s.name = "google-api-client"
+  s.name = "cure-google-api-client"
   s.version = Google::APIClient::VERSION::STRING
 
   s.required_rubygems_version = ">= 1.3.5"
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.files += Dir.glob("vendor/**/*.rb")
   s.files += Dir.glob("tasks/**/*")
   s.files += Dir.glob("website/**/*")
-  s.homepage = "https://github.com/google/google-api-ruby-client/"
+  s.homepage = "https://github.com/cure/google-api-ruby-client/"
   s.rdoc_options = ["--main", "README.md"]
   s.summary = "The Google API Ruby Client makes it trivial to discover and access Google's REST APIs."
 
diff --git a/lib/google/api_client.rb b/lib/google/api_client.rb
index ef3c2b1d34..240b1037fb 100644
--- a/lib/google/api_client.rb
+++ b/lib/google/api_client.rb
@@ -111,7 +111,7 @@ module Google
 
       self.user_agent = options[:user_agent] || (
         "#{application_string} " +
-        "google-api-ruby-client/#{Google::APIClient::VERSION::STRING} #{ENV::OS_VERSION} (gzip)"
+        "google-api-ruby-client/#{Google::APIClient::VERSION::STRING} #{ENV::OS_VERSION}".strip + " (gzip)"
       ).strip
       # The writer method understands a few Symbols and will generate useful
       # default authentication mechanisms.
diff --git a/lib/google/api_client/version.rb b/lib/google/api_client/version.rb
index edddd808b2..1db7f8d906 100644
--- a/lib/google/api_client/version.rb
+++ b/lib/google/api_client/version.rb
@@ -19,7 +19,7 @@ module Google
       MAJOR = 0
       MINOR = 8
       TINY  = 7
-      PATCH = nil
+      PATCH = 1
       STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
     end
   end