Attempting to fix some Windows issues and update deprecated library calls.

diff --git a/bin/google-api b/bin/google-api
index c6e641113be968c475455dcfbfb2defdabab5db7..e8f3957666e639082a9cc515fd0a7773f514bd78 100755 (executable)
--- a/bin/google-api
+++ b/bin/google-api
@@ -294,13 +294,12 @@ HTML
           exit(0)
         else
           $verifier = nil
-          # TODO(bobaman): Cross-platform?
-          logger = WEBrick::Log.new('/dev/null')
           server = WEBrick::HTTPServer.new(
             :Port => OAUTH_SERVER_PORT,
-            :Logger => logger,
-            :AccessLog => logger
+            :Logger => WEBrick::Log.new,
+            :AccessLog => WEBrick::Log.new
           )
+          server.logger.level = 0
           trap("INT") { server.shutdown }
 
           server.mount("/", OAuthVerifierServlet)
@@ -389,7 +388,7 @@ HTML
           )
 
           # Launch browser
-          Launchy::Browser.run(oauth_client.authorization_uri.to_s)
+          Launchy.open(oauth_client.authorization_uri.to_s)
 
           server.start
           oauth_client.code = $verifier

diff --git a/lib/google/api_client/environment.rb b/lib/google/api_client/environment.rb
index 7bb7966cfcaeaf05cf5855d52d5e67de789ea507..dbdb2d8ebeb53b187a841fcc9e02f9a3c3edf444 100644 (file)
--- a/lib/google/api_client/environment.rb
+++ b/lib/google/api_client/environment.rb
@@ -5,7 +5,7 @@ module Google
         # TODO(bobaman)
         # Confirm that all of these Windows environments actually have access
         # to the `ver` command.
-        `ver`.sub(/\s*\[Version\s*/, '/').sub(']', '')
+        `ver`.sub(/\s*\[Version\s*/, '/').sub(']', '').strip
       elsif RUBY_PLATFORM =~ /darwin/i
         "Mac OS X/#{`sw_vers -productVersion`}"
       else