fog-google 0.1.3 → 0.2.0

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

@@ -1,14 +1,11 @@
-require 'fog/core/collection'
-require 'fog/google/models/compute/http_health_check'
-
 module Fog
   module Compute
     class Google
       class HttpHealthChecks < Fog::Collection
         model Fog::Compute::Google::HttpHealthCheck
 
-        def all(filters={})
-          data = service.list_http_health_checks.body['items'] || []
+        def all(_filters = {})
+          data = service.list_http_health_checks.body["items"] || []
           load(data)
         end
 

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Google
@@ -8,13 +6,13 @@ module Fog
 
         attribute :id
         attribute :kind
-        attribute :archive_size_bytes, :aliases => 'archiveSizeBytes'
-        attribute :creation_timestamp, :aliases => 'creationTimestamp'
+        attribute :archive_size_bytes, :aliases => "archiveSizeBytes"
+        attribute :creation_timestamp, :aliases => "creationTimestamp"
         attribute :deprecated
         attribute :description
-        attribute :disk_size_gb, :aliases => 'diskSizeGb'
-        attribute :self_link, :aliases => 'selfLink'
-        attribute :source_type, :aliases => 'sourceType'
+        attribute :disk_size_gb, :aliases => "diskSizeGb"
+        attribute :self_link, :aliases => "selfLink"
+        attribute :source_type, :aliases => "sourceType"
         attribute :status
 
         # This attribute is not available in the representation of an
@@ -30,9 +28,9 @@ module Fog
         #   :container_type => 'TAR',
         #   :sha1Checksum   => ,
         # }
-        attribute :raw_disk, :aliases => 'rawDisk'
+        attribute :raw_disk, :aliases => "rawDisk"
 
-        def preferred_kernel=(args)
+        def preferred_kernel=(_args)
           Fog::Logger.deprecation("preferred_kernel= is no longer used [light_black](#{caller.first})[/]")
         end
 
@@ -44,25 +42,23 @@ module Fog
         READY_STATE = "READY"
 
         def ready?
-          self.status == READY_STATE
+          status == READY_STATE
         end
 
-        def destroy(async=true)
+        def destroy(async = true)
           data = service.delete_image(name)
-          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.body['name'])
-          unless async
-            operation.wait_for { ready? }
-          end
+          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.body["name"])
+          operation.wait_for { ready? } unless async
           operation
         end
 
         def reload
           requires :name
 
-          self.project = self.service.project
-          data = service.get_image(name, self.project).body
+          self.project = service.project
+          data = service.get_image(name, project).body
 
-          self.merge_attributes(data)
+          merge_attributes(data)
           self
         end
 
@@ -71,18 +67,18 @@ module Fog
           requires :raw_disk
 
           options = {
-            'rawDisk'         => raw_disk,
-            'description'     => description,
+            "rawDisk"         => raw_disk,
+            "description"     => description
           }
 
           data = service.insert_image(name, options)
-          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.body['name'])
+          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.body["name"])
           operation.wait_for { !pending? }
           reload
         end
 
         def resource_url
-          "#{self.project}/global/images/#{name}"
+          "#{project}/global/images/#{name}"
         end
       end
     end

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

@@ -1,29 +1,28 @@
-require 'fog/core/collection'
-require 'fog/google/models/compute/image'
-
 module Fog
   module Compute
     class Google
       class Images < Fog::Collection
         model Fog::Compute::Google::Image
 
-        # NOTE: Not everyone has access to these projects because of the
-        # licenses needed to use some of them.
-        # https://developers.google.com/compute/docs/premium-operating-systems
+        # NOTE: some of these operating systems are premium and users will be
+        # charged a license fee beyond the base Google Compute Engine VM
+        # charges. See https://cloud.google.com/compute/docs/operating-systems/
+        # for more info.
         GLOBAL_PROJECTS = [
-          'centos-cloud',
-          'coreos-cloud',
-          'debian-cloud',
-          'google-containers',
-          'opensuse-cloud',
-          'rhel-cloud',
-          'suse-cloud',
-          'ubuntu-os-cloud'
+          "centos-cloud",
+          "coreos-cloud",
+          "debian-cloud",
+          "google-containers",
+          "opensuse-cloud",
+          "rhel-cloud",
+          "suse-cloud",
+          "ubuntu-os-cloud",
+          "windows-cloud"
         ]
 
         def all
           data = []
-          all_projects = [ self.service.project ] + global_projects
+          all_projects = [service.project] + global_projects
 
           all_projects.each do |project|
             begin
@@ -42,9 +41,17 @@ module Fog
           load(data)
         end
 
+        # Only return the non-deprecated list of images
+        def current
+          data = []
+          all_images = all
+          all_images.each { |img| data.push(img) unless img.deprecated }
+          data
+        end
+
         def get(identity)
           # Search own project before global projects
-          all_projects = [ self.service.project ] + global_projects
+          all_projects = [service.project] + global_projects
 
           data = nil
           all_projects.each do |project|
@@ -64,7 +71,7 @@ module Fog
         private
 
         def global_projects
-          GLOBAL_PROJECTS + self.service.extra_global_projects
+          GLOBAL_PROJECTS + service.extra_global_projects
         end
       end
     end

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Google
@@ -8,12 +6,12 @@ module Fog
 
         attribute :id
         attribute :kind
-        attribute :creation_timestamp, :aliases => 'creationTimestamp'
+        attribute :creation_timestamp, :aliases => "creationTimestamp"
         attribute :description
         attribute :fingerprint
         attribute :namedPorts
         attribute :network
-        attribute :self_link, :aliases => 'selfLink'
+        attribute :self_link, :aliases => "selfLink"
         attribute :size
         attribute :zone, :aliases => :zone_name
 
@@ -23,16 +21,15 @@ module Fog
           data = service.insert_instance_group(name, zone)
         end
 
-        def destroy(async=true)
+        def destroy(_async = true)
           requires :name, :zone
-          
+
           data = service.delete_instance_group(name, zone_name)
         end
 
         def zone_name
-          zone.nil? ? nil : zone.split('/')[-1]
+          zone.nil? ? nil : zone.split("/")[-1]
         end
-
       end
     end
   end

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

@@ -1,34 +1,31 @@
-require 'fog/core/collection'
-require 'fog/google/models/compute/instance_group'
-
 module Fog
   module Compute
     class Google
       class InstanceGroups < Fog::Collection
         model Fog::Compute::Google::InstanceGroup
 
-        def all(filters={})
+        def all(filters = {})
           if filters[:zone]
             data = service.list_instance_groups(filters[:zone]).body
           else
             data = []
-            service.list_aggregated_instance_groups.body['items'].each_value do |group|
-              data.concat(group['instanceGroups']) if group['instanceGroups']
+            service.list_aggregated_instance_groups.body["items"].each_value do |group|
+              data.concat(group["instanceGroups"]) if group["instanceGroups"]
             end
           end
 
-          load(data['items'])
+          load(data["items"])
         end
 
-        def get(identity, zone=nil)
+        def get(identity, zone = nil)
           if zone.nil?
-            zones = service.list_aggregated_instance_groups(:filter => "name eq .*#{identity}").body['items']
-            target_zone = zones.each_value.select { |zone| zone.key?('instanceGroups') }
-            response = target_zone.first['instanceGroups'].first unless target_zone.empty?
-            zone = response['zone'].split('/')[-1]
+            zones = service.list_aggregated_instance_groups(:filter => "name eq .*#{identity}").body["items"]
+            target_zone = zones.each_value.select { |zone| zone.key?("instanceGroups") }
+            response = target_zone.first["instanceGroups"].first unless target_zone.empty?
+            zone = response["zone"].split("/")[-1]
           end
 
-          if instance_group = service.get_instance_group(identity,zone).body
+          if instance_group = service.get_instance_group(identity, zone).body
             new(instance_group)
           end
         rescue Fog::Errors::NotFound

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Google
@@ -12,29 +10,27 @@ module Fog
 
         attribute :kind
         attribute :id
-        attribute :ipv4_range, :aliases => 'IPv4Range'
-        attribute :creation_timestamp, :aliases => 'creationTimestamp'
+        attribute :ipv4_range, :aliases => "IPv4Range"
+        attribute :creation_timestamp, :aliases => "creationTimestamp"
         attribute :description
-        attribute :gateway_ipv4, :aliases => 'gatewayIPv4'
-        attribute :self_link, :aliases => 'selfLink'
+        attribute :gateway_ipv4, :aliases => "gatewayIPv4"
+        attribute :self_link, :aliases => "selfLink"
 
         def save
           requires :identity, :ipv4_range
 
-          data = service.insert_network(identity, self.ipv4_range, self.attributes)
-          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.body['name'])
+          data = service.insert_network(identity, ipv4_range, attributes)
+          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.body["name"])
           operation.wait_for { !pending? }
           reload
         end
 
-        def destroy(async=true)
+        def destroy(async = true)
           requires :identity
 
           data = service.delete_network(identity)
-          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.body['name'])
-          unless async
-            operation.wait_for { ready? }
-          end
+          operation = Fog::Compute::Google::Operations.new(:service => service).get(data.body["name"])
+          operation.wait_for { ready? } unless async
           operation
         end
       end

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

@@ -1,6 +1,3 @@
-require 'fog/core/collection'
-require 'fog/google/models/compute/network'
-
 module Fog
   module Compute
     class Google
@@ -9,7 +6,7 @@ module Fog
 
         def all
           data = service.list_networks.body
-          load(data['items'] || [])
+          load(data["items"] || [])
         end
 
         def get(identity)

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Google
@@ -8,40 +6,40 @@ module Fog
 
         attribute :kind
         attribute :id
-        attribute :client_operation_id, :aliases => 'clientOperationId'
-        attribute :creation_timestamp, :aliases => 'creationTimestamp'
-        attribute :end_time, :aliases => 'endTime'
+        attribute :client_operation_id, :aliases => "clientOperationId"
+        attribute :creation_timestamp, :aliases => "creationTimestamp"
+        attribute :end_time, :aliases => "endTime"
         attribute :error
-        attribute :http_error_message, :aliases => 'httpErrorMessage'
-        attribute :http_error_status_code, :aliases => 'httpErrorStatusCode'
-        attribute :insert_time, :aliases => 'insertTime'
-        attribute :operation_type, :aliases => 'operationType'
+        attribute :http_error_message, :aliases => "httpErrorMessage"
+        attribute :http_error_status_code, :aliases => "httpErrorStatusCode"
+        attribute :insert_time, :aliases => "insertTime"
+        attribute :operation_type, :aliases => "operationType"
         attribute :progress
         attribute :region
-        attribute :self_link, :aliases => 'selfLink'
-        attribute :start_time, :aliases => 'startTime'
+        attribute :self_link, :aliases => "selfLink"
+        attribute :start_time, :aliases => "startTime"
         attribute :status
-        attribute :status_message, :aliases => 'statusMessage'
-        attribute :target_id, :aliases => 'targetId'
-        attribute :target_link, :aliases => 'targetLink'
+        attribute :status_message, :aliases => "statusMessage"
+        attribute :target_id, :aliases => "targetId"
+        attribute :target_link, :aliases => "targetLink"
         attribute :user
         attribute :warnings
         attribute :zone
 
         def ready?
-          self.status == DONE_STATE
+          status == DONE_STATE
         end
 
         def pending?
-          self.status == PENDING_STATE
+          status == PENDING_STATE
         end
 
         def region_name
-          region.nil? ? nil : region.split('/')[-1]
+          region.nil? ? nil : region.split("/")[-1]
         end
 
         def zone_name
-          zone.nil? ? nil : zone.split('/')[-1]
+          zone.nil? ? nil : zone.split("/")[-1]
         end
 
         def destroy

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

@@ -1,6 +1,3 @@
-require 'fog/core/collection'
-require 'fog/google/models/compute/operation'
-
 module Fog
   module Compute
     class Google
@@ -8,20 +5,20 @@ module Fog
         model Fog::Compute::Google::Operation
 
         def all(filters = {})
-          if filters['zone']
-            data = service.list_zone_operations(filters['zone']).body
-          elsif filters['region']
-            data = service.list_region_operations(filters['region']).body
+          if filters["zone"]
+            data = service.list_zone_operations(filters["zone"]).body
+          elsif filters["region"]
+            data = service.list_region_operations(filters["region"]).body
           else
             data = service.list_global_operations.body
           end
-          load(data['items'] || [])
+          load(data["items"] || [])
         end
 
-        def get(identity, zone=nil, region=nil)
-          if not zone.nil?
+        def get(identity, zone = nil, region = nil)
+          if !zone.nil?
             response = service.get_zone_operation(zone, identity)
-          elsif not region.nil?
+          elsif !region.nil?
             response = service.get_region_operation(region, identity)
           else
             response = service.get_global_operation(identity)

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module Compute
     class Google
@@ -12,17 +10,17 @@ module Fog
 
         attribute :kind
         attribute :id
-        attribute :common_instance_metadata, :aliases => 'commonInstanceMetadata'
-        attribute :creation_timestamp, :aliases => 'creationTimestamp'
+        attribute :common_instance_metadata, :aliases => "commonInstanceMetadata"
+        attribute :creation_timestamp, :aliases => "creationTimestamp"
         attribute :description
         attribute :quotas
-        attribute :self_link, :aliases => 'selfLink'
+        attribute :self_link, :aliases => "selfLink"
 
         def set_metadata(metadata = {})
           requires :identity
 
-          data = service.set_common_instance_metadata(identity, self.common_instance_metadata['fingerprint'], metadata)
-          Fog::Compute::Google::Operations.new(:service => service).get(data.body['name'])
+          data = service.set_common_instance_metadata(identity, common_instance_metadata["fingerprint"], metadata)
+          Fog::Compute::Google::Operations.new(:service => service).get(data.body["name"])
         end
       end
     end