fog-google 0.1.3 → 0.2.0

data/lib/fog/{google/models/compute → compute/google/models}/target_pool.rb

@@ -1,16 +1,14 @@
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Google
       class TargetPool < Fog::Model
         identity :name
 
-        attribute :kind, :aliases => 'kind'
-        attribute :self_link, :aliases => 'selfLink'
-        attribute :id, :aliases => 'id'
-        attribute :creation_timestamp, :aliases => 'creationTimestamp'
-        attribute :description, :aliases => 'description'
+        attribute :kind, :aliases => "kind"
+        attribute :self_link, :aliases => "selfLink"
+        attribute :id, :aliases => "id"
+        attribute :creation_timestamp, :aliases => "creationTimestamp"
+        attribute :description, :aliases => "description"
         attribute :region, :aliases => "region"
         attribute :health_checks, :aliases => "healthChecks"
         attribute :instances, :aliases => "instances"
@@ -22,25 +20,25 @@ module Fog
           requires :name, :region
 
           options = {
-            'description' => description,
-            'region' => region,
-            'healthChecks' => health_checks,
-            'instances' => instances,
-            'sessionAffinity' => session_affinity,
-            'failoverRatio' => failover_ratio,
-            'backupPool' => backup_pool
+            "description" => description,
+            "region" => region,
+            "healthChecks" => health_checks,
+            "instances" => instances,
+            "sessionAffinity" => session_affinity,
+            "failoverRatio" => failover_ratio,
+            "backupPool" => backup_pool
           }
 
           data = service.insert_target_pool(name, region, options).body
-          operation = Fog::Compute::Google::Operations.new(:service => service).get(data['name'], nil, data['region'])
+          operation = Fog::Compute::Google::Operations.new(:service => service).get(data["name"], nil, data["region"])
           operation.wait_for { !pending? }
           reload
         end
 
-        def destroy(async=true)
+        def destroy(async = true)
           requires :name, :region
           operation = service.delete_target_pool(name, region)
-          if not async
+          unless async
             # wait until "DONE" to ensure the operation doesn't fail, raises
             # exception on error
             Fog.wait_for do
@@ -51,25 +49,25 @@ module Fog
           operation
         end
 
-        def add_instance instance
+        def add_instance(instance)
           instance = instance.self_link unless instance.class == String
           service.add_target_pool_instances(self, [instance])
           reload
         end
 
-        def remove_instance instance
+        def remove_instance(instance)
           instance = instance.self_link unless instance.class == String
           service.remove_target_pool_instances(self, [instance])
           reload
         end
 
-        def add_health_check health_check
+        def add_health_check(health_check)
           health_check = health_check.self_link unless health_check.class == String
           service.add_target_pool_health_checks(self, [health_check])
           reload
         end
 
-        def remove_health_check health_check
+        def remove_health_check(health_check)
           health_check = health_check.self_link unless health_check.class == String
           service.remove_target_pool_health_checks(self, [health_check])
           reload
@@ -80,16 +78,14 @@ module Fog
         end
 
         def ready?
-          begin
-            service.get_target_pool(self.name, self.region)
-            true
-          rescue Fog::Errors::NotFound
-            false
-          end
+          service.get_target_pool(name, region)
+          true
+        rescue Fog::Errors::NotFound
+          false
         end
 
         def region_name
-          region.nil? ? nil : region.split('/')[-1]
+          region.nil? ? nil : region.split("/")[-1]
         end
 
         def reload

data/lib/fog/{google/models/compute → compute/google/models}/target_pools.rb

@@ -1,25 +1,22 @@
-require 'fog/core/collection'
-require 'fog/google/models/compute/target_pool'
-
 module Fog
   module Compute
     class Google
       class TargetPools < Fog::Collection
         model Fog::Compute::Google::TargetPool
 
-        def all(filters={})
-          if filters['region'].nil?
+        def all(filters = {})
+          if filters["region"].nil?
             data = []
-            service.list_regions.body['items'].each do |region|
-              data += service.list_target_pools(region['name']).body['items'] || []
+            service.list_regions.body["items"].each do |region|
+              data += service.list_target_pools(region["name"]).body["items"] || []
             end
           else
-            data = service.list_target_pools(filters['region']).body['items'] || []
+            data = service.list_target_pools(filters["region"]).body["items"] || []
           end
           load(data)
         end
 
-        def get(identity, region=nil)
+        def get(identity, region = nil)
           response = nil
           if region.nil?
             service.regions.all.each do |region|

data/lib/fog/{google/models/compute → compute/google/models}/url_map.rb

@@ -1,45 +1,43 @@
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Google
       class UrlMap < Fog::Model
         identity :name
 
-        attribute :kind, :aliases => 'kind'
-        attribute :creationTimestamp, :aliases => 'creation_timestamp'
-        attribute :defaultService, :aliases => ['default_service', :default_service]
-        attribute :description, :aliases => 'description'
-        attribute :fingerprint, :aliases => 'fingerprint'
-        attribute :hostRules, :aliases => 'host_rules'
-        attribute :id, :aliases => 'id'
-        attribute :pathMatchers, :aliases => 'path_matchers'
-        attribute :self_link, :aliases => 'selfLink'
-        attribute :tests, :aliases => 'tests'
-      
+        attribute :kind, :aliases => "kind"
+        attribute :creation_timestamp, :aliases => "creationTimestamp"
+        attribute :default_service, :aliases => "defaultService"
+        attribute :description, :aliases => "description"
+        attribute :fingerprint, :aliases => "fingerprint"
+        attribute :host_rules, :aliases => "hostRules"
+        attribute :id, :aliases => "id"
+        attribute :path_matchers, :aliases => "pathMatchers"
+        attribute :self_link, :aliases => "selfLink"
+        attribute :tests, :aliases => "tests"
+
         def save
-          requires :name, :defaultService
+          requires :name, :default_service
 
           options = {
-            'defaultService' => defaultService,
-            'description' => description,
-            'fingerprint' => fingerprint,
-            'hostRules' => hostRules,
-            'pathMatchers' => pathMatchers,
-            'tests' => tests
+            "defaultService" => default_service,
+            "description" => description,
+            "fingerprint" => fingerprint,
+            "hostRules" => host_rules,
+            "pathMatchers" => path_matchers,
+            "tests" => tests
           }
-    
+
           data = service.insert_url_map(name, options).body
-          operation = Fog::Compute::Google::Operations.new(:service => service).get(data['name'])
+          operation = Fog::Compute::Google::Operations.new(:service => service).get(data["name"])
           operation.wait_for { !pending? }
           reload
         end
-      
-        def destroy(async=true)
+
+        def destroy(async = true)
           requires :name
 
           operation = service.delete_url_map(name)
-          if not async
+          unless async
             Fog.wait_for do
               operation = service.get_global_operation(operation.body["name"])
               operation.body["status"] == "DONE"
@@ -51,27 +49,25 @@ module Fog
         def validate
           service.validate_url_map self
         end
-      
-        def add_host_rules hostRules
-          hostRules= [hostRules] unless hostRules.class == Array
+
+        def add_host_rules(hostRules)
+          hostRules = [hostRules] unless hostRules.class == Array
           service.update_url_map(self, hostRules)
           reload
         end
 
         def add_path_matchers(pathMatchers, hostRules)
           pathMatchers = [pathMatchers] unless pathMatchers.class == Array
-          hostRules=[hostRules] unless hostRules.class == Array
+          hostRules = [hostRules] unless hostRules.class == Array
           service.update_url_map(self, hostRules, pathMatchers)
           reload
         end
 
         def ready?
-          begin
-            service.get_url_map(self.name)
-            true
-          rescue Fog::Errors::NotFound
-            false
-          end
+          service.get_url_map(name)
+          true
+        rescue Fog::Errors::NotFound
+          false
         end
 
         def reload
@@ -88,7 +84,7 @@ module Fog
           self
         end
 
-        RUNNING_STATE ="READY"
+        RUNNING_STATE = "READY"
       end
     end
   end

data/lib/fog/{google/models/compute → compute/google/models}/url_maps.rb

@@ -1,6 +1,3 @@
-require 'fog/core/collection'
-require 'fog/google/models/compute/url_map'
-
 module Fog
   module Compute
     class Google
@@ -8,7 +5,7 @@ module Fog
         model Fog::Compute::Google::UrlMap
 
         def all
-          data = service.list_url_maps.body['items'] || []
+          data = service.list_url_maps.body["items"] || []
           load(data)
         end
 

data/lib/fog/compute/google/models/zone.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Google
+      class Zone < Fog::Model
+        identity :name
+        attribute :description
+        attribute :status
+        attribute :maintenance_windows, :aliases => "maintenanceWindows"
+        attribute :begin_time, :aliases => "beginTime"
+        attribute :end_time, :aliases => "endTime"
+        attribute :quotas
+        attribute :region
+        attribute :self_link, :aliases => "selfLink"
+
+        def up?
+          status == "UP"
+        end
+      end
+    end
+  end
+end

data/lib/fog/{google/models/compute → compute/google/models}/zones.rb

@@ -1,6 +1,3 @@
-require 'fog/core/collection'
-require 'fog/google/models/compute/zone'
-
 module Fog
   module Compute
     class Google

data/lib/fog/{google/requests/compute → compute/google/requests}/add_backend_service_backends.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class Google
       class Mock
-        def add_backend_service_backends(backend_service, new_backends)
+        def add_backend_service_backends(_backend_service, _new_backends)
           Fog::Mock.not_implemented
         end
       end
@@ -11,16 +11,16 @@ module Fog
         def add_backend_service_backends(backend_service, new_backends)
           api_method = @compute.backend_services.patch
           parameters = {
-            'project' => @project,
-            'backendService' => backend_service.name,
+            "project" => @project,
+            "backendService" => backend_service.name
           }
-          if backend_service.backends then
+          if backend_service.backends
             backend_service.backends.concat(new_backends)
           else
             backend_service.backends = new_backends
           end
           body_object = backend_service
-          
+
           request(api_method, parameters, body_object)
         end
       end

data/lib/fog/{google/requests/compute → compute/google/requests}/add_instance_group_instance.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class Google
       class Mock
-        def add_instance_group_instance(group_name, zone, instances)
+        def add_instance_group_instance(_group_name, _zone, _instances)
           Fog::Mock.not_implemented
         end
       end
@@ -12,9 +12,9 @@ module Fog
           api_method = @compute.instance_groups.add_instances
 
           parameters = {
-            'project' => @project,
-            'instanceGroup' => group_name,
-            'zone' => zone,
+            "project" => @project,
+            "instanceGroup" => group_name,
+            "zone" => zone
           }
 
           body_object = {

data/lib/fog/compute/google/requests/add_region_view_resources.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def add_region_view_resources(_region_view, _resources)
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        def add_region_view_resources(region_view, resources, region)
+          api_method = @resourceviews.region_views.add_resources
+          parameters = {
+            "projectName" => @project,
+            "resourceViewName" => region_view,
+            "region" => region
+          }
+          body = {
+            "resources" => resources
+          }
+
+          request(api_method, parameters, body_object = body)
+        end
+      end
+    end
+  end
+end

data/lib/fog/{google/requests/compute → compute/google/requests}/add_server_access_config.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class Google
       class Mock
-        def add_server_access_config(identity, zone, nic, options = {})
+        def add_server_access_config(_identity, _zone, _nic, _options = {})
           Fog::Mock.not_implemented
         end
       end
@@ -11,18 +11,18 @@ module Fog
         def add_server_access_config(identity, zone, nic, options = {})
           api_method = @compute.instances.add_access_config
           parameters = {
-            'project'  => @project,
-            'instance' => identity,
-            'zone'     => zone.split('/')[-1],
-            'networkInterface' => nic,
+            "project"  => @project,
+            "instance" => identity,
+            "zone"     => zone.split("/")[-1],
+            "networkInterface" => nic
           }
 
           body_object = {
-            'type' => 'ONE_TO_ONE_NAT',
+            "type" => "ONE_TO_ONE_NAT"
           }
 
-          body_object['name'] = options[:name] ? options[:name] : 'External NAT'
-          body_object['natIP'] = options[:address] if options[:address]
+          body_object["name"] = options[:name] ? options[:name] : "External NAT"
+          body_object["natIP"] = options[:address] if options[:address]
 
           request(api_method, parameters, body_object)
         end

data/lib/fog/{google/requests/compute → compute/google/requests}/add_target_pool_health_checks.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class Google
       class Mock
-        def add_target_pool_health_checks(target_pool, health_checks)
+        def add_target_pool_health_checks(_target_pool, _health_checks)
           Fog::Mock.not_implemented
         end
       end
@@ -11,15 +11,15 @@ module Fog
         def add_target_pool_health_checks(target_pool, health_checks)
           api_method = @compute.target_pools.add_health_check
           parameters = {
-            'project' => @project,
-            'targetPool' => target_pool.name,
-            'region' => target_pool.region.split('/')[-1]
+            "project" => @project,
+            "targetPool" => target_pool.name,
+            "region" => target_pool.region.split("/")[-1]
           }
           body = {
-            'healthChecks' => health_checks.map { |i| { 'healthCheck' => i } }
+            "healthChecks" => health_checks.map { |i| { "healthCheck" => i } }
           }
 
-          request(api_method, parameters, body_object=body)
+          request(api_method, parameters, body_object = body)
         end
       end
     end