trying to move gce to google.

lib/fog/bin.rb

@@ -61,7 +61,7 @@ require 'fog/bin/atmos'
 require 'fog/bin/aws'
 require 'fog/bin/bluebox'
 require 'fog/bin/brightbox'
-require 'fog/bin/gce'
+require 'fog/bin/google'
 require 'fog/bin/cloudstack'
 require 'fog/bin/clodo'
 require 'fog/bin/dnsimple'

lib/fog/bin/gce.rb

@@ -15,7 +15,7 @@ class GCE < Fog::Bin
         hash[key] = case key
         when :compute
           Fog::Logger.warning("GCE[:compute] is not recommended, use
-                              Compute[:gce] for portability")
+                              Compute[:google] for portability")
           Fog::Compute.new(:provider => 'GCE')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

lib/fog/compute.rb

@@ -19,8 +19,8 @@ module Fog
       when :brightbox
         require 'fog/brightbox/compute'
         Fog::Compute::Brightbox.new(attributes)
-      when :gce
+      when :google
-        require 'fog/gce/compute'
+        require 'fog/google/compute'
         Fog::Compute::GCE.new(attributes)
       when :cloudstack
         require 'fog/cloudstack/compute'

lib/fog/core/errors.rb

@@ -40,7 +40,7 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :bluebox_customer_id:
   :brightbox_client_id:
   :brightbox_secret:
-  :gce_project:
+  :google_project:
   :clodo_api_key:
   :clodo_username:
   :go_grid_api_key:

lib/fog/gce.rb

@@ -1,10 +0,0 @@
-require 'fog/core'
-
-module Fog
-  module GCE
-    extend Fog::Provider
-
-    service(:compute, 'gce/compute', 'Compute')
-
-  end
-end

lib/fog/google.rb

@@ -5,6 +5,7 @@ module Fog
 
     extend Fog::Provider
 
+    service(:compute, 'google/compute', 'Compute')
     service(:storage, 'google/storage', 'Storage')
 
     class Mock

lib/fog/google/compute.rb

@@ -1,15 +1,15 @@
-require 'fog/gce'
+require 'fog/google'
 require 'fog/compute'
-require 'fog/gce/oauth/oauth_util'
+require 'fog/google/oauth/oauth_util'
 require 'google/api_client'
 
 module Fog
   module Compute
     class GCE < Fog::Service
 
-      requires :gce_project
+      requires :google_project
 
-      request_path 'fog/gce/requests/compute'
+      request_path 'fog/google/requests/compute'
       request :list_servers
       request :list_disks
       request :list_firewalls
@@ -43,7 +43,7 @@ module Fog
       request :insert_network
       request :insert_server
 
-      model_path 'fog/gce/models/compute'
+      model_path 'fog/google/models/compute'
       model :server
       collection :servers
 
@@ -70,7 +70,7 @@ module Fog
           api_version = 'v1beta13'
           api_scope_url = 'https://www.googleapis.com/auth/compute'
 
-          @project = options[:gce_project]
+          @project = options[:google_project]
           @api_url = base_url + api_version + '/projects/'
           @client = ::Google::APIClient.new
           @compute = @client.discovered_api('compute', api_version)

lib/fog/google/models/compute/flavors.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/gce/models/compute/flavor'
+require 'fog/google/models/compute/flavor'
 
 module Fog
   module Compute

lib/fog/google/models/compute/images.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/gce/models/compute/image'
+require 'fog/google/models/compute/image'
 
 module Fog
   module Compute

lib/fog/google/models/compute/servers.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/gce/models/compute/server'
+require 'fog/google/models/compute/server'
 
 module Fog
   module Compute

lib/fog/providers.rb

@@ -2,7 +2,7 @@ require 'fog/atmos'
 require 'fog/aws'
 require 'fog/bluebox'
 require 'fog/brightbox'
-require 'fog/gce'
+require 'fog/google'
 require 'fog/cloudstack'
 require 'fog/clodo'
 require 'fog/dnsimple'