From 39c3e81e268fa547dc4c14e81ffe1b465f9d1bf6 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Wed, 17 Sep 2014 14:57:32 +0000
Subject: [PATCH] So many versions!!

---
 lib/google/api_client.rb                 |  4 +---
 lib/google/api_client/version.rb         | 21 ++++++++-------------
 spec/google/api_client/batch_spec.rb     |  1 -
 spec/google/api_client/discovery_spec.rb |  1 -
 spec/google/api_client/gzip_spec.rb      |  1 -
 spec/google/api_client/media_spec.rb     |  1 -
 spec/google/api_client/request_spec.rb   |  1 -
 spec/google/api_client/result_spec.rb    |  1 -
 8 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/lib/google/api_client.rb b/lib/google/api_client.rb
index dc9c85379..91b405150 100644
--- a/lib/google/api_client.rb
+++ b/lib/google/api_client.rb
@@ -687,6 +687,4 @@ module Google
 
   end
 
-end
-
-require 'google/api_client/version'
+end
\ No newline at end of file
diff --git a/lib/google/api_client/version.rb b/lib/google/api_client/version.rb
index a979647d9..ee12fd33b 100644
--- a/lib/google/api_client/version.rb
+++ b/lib/google/api_client/version.rb
@@ -13,19 +13,14 @@
 # limitations under the License.
 
 
-# Used to prevent the class/module from being loaded more than once
-if !defined?(::Google::APIClient::VERSION)
-
-
-  module Google
-    class APIClient
-      module VERSION
-        MAJOR = 0
-        MINOR = 7
-        TINY  = 1
-        PATCH = nil
-        STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
-      end
+module Google
+  class APIClient
+    module VERSION
+      MAJOR = 0
+      MINOR = 7
+      TINY  = 1
+      PATCH = nil
+      STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
     end
   end
 end
diff --git a/spec/google/api_client/batch_spec.rb b/spec/google/api_client/batch_spec.rb
index 0df184e56..786c16a77 100644
--- a/spec/google/api_client/batch_spec.rb
+++ b/spec/google/api_client/batch_spec.rb
@@ -14,7 +14,6 @@
 
 require 'spec_helper'
 require 'google/api_client'
-require 'google/api_client/version'
 
 describe Google::APIClient::BatchRequest do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
diff --git a/spec/google/api_client/discovery_spec.rb b/spec/google/api_client/discovery_spec.rb
index 4ec5f99e5..a047bab03 100644
--- a/spec/google/api_client/discovery_spec.rb
+++ b/spec/google/api_client/discovery_spec.rb
@@ -22,7 +22,6 @@ require 'multi_json'
 require 'compat/multi_json'
 require 'signet/oauth_1/client'
 require 'google/api_client'
-require 'google/api_client/version'
 
 describe Google::APIClient do
   include ConnectionHelpers
diff --git a/spec/google/api_client/gzip_spec.rb b/spec/google/api_client/gzip_spec.rb
index 36d7fd6ca..e05e90737 100644
--- a/spec/google/api_client/gzip_spec.rb
+++ b/spec/google/api_client/gzip_spec.rb
@@ -15,7 +15,6 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
 describe Google::APIClient::Gzip do
 
diff --git a/spec/google/api_client/media_spec.rb b/spec/google/api_client/media_spec.rb
index 8c6515ea5..0fce150f5 100644
--- a/spec/google/api_client/media_spec.rb
+++ b/spec/google/api_client/media_spec.rb
@@ -15,7 +15,6 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
 fixtures_path = File.expand_path('../../../fixtures', __FILE__)
 
diff --git a/spec/google/api_client/request_spec.rb b/spec/google/api_client/request_spec.rb
index d70e217e3..760a8a34b 100644
--- a/spec/google/api_client/request_spec.rb
+++ b/spec/google/api_client/request_spec.rb
@@ -15,7 +15,6 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
 describe Google::APIClient::Request do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
diff --git a/spec/google/api_client/result_spec.rb b/spec/google/api_client/result_spec.rb
index 757730386..8c5f09bc9 100644
--- a/spec/google/api_client/result_spec.rb
+++ b/spec/google/api_client/result_spec.rb
@@ -15,7 +15,6 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
 describe Google::APIClient::Result do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)