fog-google 0.0.5 → 0.0.6

data/test/integration/factories/backend_services_factory.rb

@@ -0,0 +1,19 @@
+require "integration/factories/collection_factory"
+require "integration/factories/http_health_checks_factory"
+
+class BackendServicesFactory < CollectionFactory
+  def initialize(example)
+    @http_health_checks = HttpHealthChecksFactory.new(example)
+    super(Fog::Compute[:google].backend_services, example)
+  end
+
+  def cleanup
+    super
+    @http_health_checks.cleanup
+  end
+
+  def params
+    params = {:name => resource_name,
+              :health_checks => [@http_health_checks.create.self_link]}
+  end
+end

data/test/integration/factories/collection_factory.rb

@@ -0,0 +1,27 @@
+class CollectionFactory
+  PREFIX = 'fog-test'
+
+  def initialize(subject, example)
+    @subject = subject
+    @example = example
+    @resource_counter = 0
+  end
+
+  def cleanup
+    resources = @subject.all.select { |resource| resource.name.start_with? PREFIX }
+    resources.each { |r| r.destroy }
+    resources.each { |r| Fog.wait_for { !@subject.all.map(&:identity).include? r.identity } }
+  end
+
+  def create
+    @subject.create(params)
+  end
+
+  def resource_name(base=@example, prefix=PREFIX)
+    index = @resource_counter += 1
+    # In prefix, convert - to _ to make sure that it doesn't get stripped by the \W strip below.
+    # Then, concatenate prefix, index, and base; strip all non-alphanumerics except _;
+    # convert _ to -; downcase; truncate to 62 characters; delete trailing -
+    ([prefix.gsub(/-/, '_'), index, base] * "_").gsub(/\W/, '').gsub(/_/, '-').downcase[0..61].chomp('-')
+  end
+end

data/test/integration/factories/disks_factory.rb

@@ -0,0 +1,13 @@
+require "integration/factories/collection_factory"
+
+class DisksFactory < CollectionFactory
+  def initialize(example)
+    super(Fog::Compute[:google].disks, example)
+  end
+
+  def params
+    {:name => resource_name,
+     :zone_name => TEST_ZONE,
+     :size_gb => TEST_SIZE_GB}
+  end
+end

data/test/integration/factories/forwarding_rules_factory.rb

@@ -0,0 +1,21 @@
+require "integration/factories/collection_factory"
+require "integration/factories/target_pools_factory"
+
+class ForwardingRulesFactory < CollectionFactory
+  def initialize(example)
+    @target_pools = TargetPoolsFactory.new(example)
+    super(Fog::Compute[:google].forwarding_rules, example)
+  end
+
+  def cleanup
+    super
+    @target_pools.cleanup
+  end
+
+  def params
+    params = {:name => resource_name,
+              :region => TEST_REGION,
+              :target => @target_pools.create.self_link}
+  end
+end
+

data/test/integration/factories/global_forwarding_rules_factory.rb

@@ -0,0 +1,19 @@
+require "integration/factories/collection_factory"
+require "integration/factories/target_http_proxies_factory"
+
+class GlobalForwardingRulesFactory < CollectionFactory
+  def initialize(example)
+    @targets = TargetHttpProxiesFactory.new(example)
+    super(Fog::Compute[:google].global_forwarding_rules, example)
+  end
+
+  def cleanup
+    super
+    @targets.cleanup
+  end
+
+  def params
+    params = {:name => resource_name,
+              :target => @targets.create.self_link}
+  end
+end

data/test/integration/factories/http_health_checks_factory.rb

@@ -0,0 +1,11 @@
+require "integration/factories/collection_factory"
+
+class HttpHealthChecksFactory < CollectionFactory
+  def initialize(example)
+    super(Fog::Compute[:google].http_health_checks, example)
+  end
+
+  def params
+    {:name => resource_name}
+  end
+end

data/test/integration/factories/images_factory.rb

@@ -0,0 +1,12 @@
+require "integration/factories/collection_factory"
+
+class ImagesFactory < CollectionFactory
+  def initialize(example)
+    super(Fog::Compute[:google].images, example)
+  end
+
+  def params
+    params = {:name => resource_name,
+              :raw_disk => {:source => TEST_RAW_DISK_SOURCE}}
+  end
+end

data/test/integration/factories/servers_factory.rb

@@ -0,0 +1,21 @@
+require "integration/factories/collection_factory"
+require "integration/factories/disks_factory"
+
+class ServersFactory < CollectionFactory
+  def initialize(example)
+    @disks = DisksFactory.new(example)
+    super(Fog::Compute[:google].servers, example)
+  end
+
+  def cleanup
+    super
+    @disks.cleanup
+  end
+
+  def params
+    params = {:name => resource_name,
+              :zone_name => TEST_ZONE,
+              :machine_type => TEST_MACHINE_TYPE,
+              :disks => [@disks.create]}
+  end
+end

data/test/integration/factories/target_http_proxies_factory.rb

@@ -0,0 +1,19 @@
+require "integration/factories/collection_factory"
+require "integration/factories/url_maps_factory"
+
+class TargetHttpProxiesFactory < CollectionFactory
+  def initialize(example)
+    @url_maps = UrlMapsFactory.new(example)
+    super(Fog::Compute[:google].target_http_proxies, example)
+  end
+
+  def cleanup
+    super
+    @url_maps.cleanup
+  end
+
+  def params
+    params = {:name => resource_name,
+              :url_map => @url_maps.create.self_link}
+  end
+end

data/test/integration/factories/target_instances_factory.rb

@@ -0,0 +1,20 @@
+require "integration/factories/collection_factory"
+require "integration/factories/servers_factory"
+
+class TargetInstancesFactory < CollectionFactory
+  def initialize(example)
+    @servers = ServersFactory.new(example)
+    super(Fog::Compute[:google].target_instances, example)
+  end
+
+  def cleanup
+    super
+    @servers.cleanup
+  end
+
+  def params
+    {:name => resource_name,
+     :zone => TEST_ZONE,
+     :instance => @servers.create}
+  end
+end

data/test/integration/factories/target_pools_factory.rb

@@ -0,0 +1,24 @@
+require "integration/factories/collection_factory"
+require "integration/factories/servers_factory"
+require "integration/factories/http_health_checks_factory"
+
+class TargetPoolsFactory < CollectionFactory
+  def initialize(example)
+    @http_health_checks = HttpHealthChecksFactory.new(example)
+    @servers = ServersFactory.new(example)
+    super(Fog::Compute[:google].target_pools, example)
+  end
+
+  def cleanup
+    super
+    @servers.cleanup
+    @http_health_checks.cleanup
+  end
+
+  def params
+    params = {:name => resource_name,
+              :region => TEST_REGION,
+              :instances => [@servers.create.self_link],
+              :healthChecks => [@http_health_checks.create.self_link]}
+  end
+end

data/test/integration/factories/url_maps_factory.rb

@@ -0,0 +1,19 @@
+require "integration/factories/collection_factory"
+require "integration/factories/backend_services_factory"
+
+class UrlMapsFactory < CollectionFactory
+  def initialize(example)
+    @backend_services = BackendServicesFactory.new(example)
+    super(Fog::Compute[:google].url_maps, example)
+  end
+
+  def cleanup
+    super
+    @backend_services.cleanup
+  end
+
+  def params
+    params = {:name => resource_name,
+              :default_service => @backend_services.create.self_link}
+  end
+end

data/test/integration/test_authentication.rb

@@ -0,0 +1,59 @@
+require 'helpers/integration_test_helper'
+
+# TODO this is a port over from legacy tests.  It shouldn't be scoped under Google, but under Google::Shared.
+class TestAuthentication < FogIntegrationTest
+  def setup
+    @google_key_location = Fog.credentials[:google_key_location]
+    @google_key_string = File.open(File.expand_path(@google_key_location), 'rb') { |io| io.read }
+    @google_json_key_location = Fog.credentials[:google_json_key_location]
+    @google_json_key_string = File.open(File.expand_path(@google_json_key_location), 'rb') { |io| io.read }
+  end
+
+  def test_authenticates_with_p12_key_location
+    c = Fog::Compute::Google.new(:google_key_location => @google_key_location,
+                                 :google_key_string => nil,
+                                 :google_json_key_location => nil,
+                                 :google_json_key_string => nil)
+    assert_kind_of(Fog::Compute::Google::Real, c)
+  end
+
+  def test_authenticates_with_p12_key_string
+    c = Fog::Compute::Google.new(:google_key_location => nil,
+                                 :google_key_string => @google_key_string,
+                                 :google_json_key_location => nil,
+                                 :google_json_key_string => nil)
+    assert_kind_of(Fog::Compute::Google::Real, c)
+  end
+
+  def test_authenticates_with_json_key_location
+    c = Fog::Compute::Google.new(:google_key_location => nil,
+                                 :google_key_string => nil,
+                                 :google_json_key_location => @google_json_key_location,
+                                 :google_json_key_string => nil)
+    assert_kind_of(Fog::Compute::Google::Real, c)
+  end
+
+  def test_authenticates_with_json_key_string
+    c = Fog::Compute::Google.new(:google_key_location => nil,
+                                 :google_key_string => nil,
+                                 :google_json_key_location => nil,
+                                 :google_json_key_string => @google_json_key_string)
+    assert_kind_of(Fog::Compute::Google::Real, c)
+  end
+
+  def test_raises_argument_error_when_google_project_is_missing
+    assert_raises(ArgumentError) { Fog::Compute::Google.new(:google_project => nil) }
+  end
+
+  def test_raises_argument_error_when_google_client_email_is_missing
+    assert_raises(ArgumentError) { Fog::Compute::Google.new(:google_client_email => nil,
+                                                            :google_json_key_location => nil) } # JSON key overrides google_client_email
+  end
+
+  def test_raises_argument_error_when_google_keys_are_given
+    assert_raises(ArgumentError) { Fog::Compute::Google.new(:google_key_location => nil,
+                                                            :google_key_string => nil,
+                                                            :google_json_key_location => nil,
+                                                            :google_json_key_string => nil) }
+  end
+end

data/tests/helpers/collection_helper.rb

@@ -1,3 +1,5 @@
+# TODO REMOVE this testing functionality is now covered in `spec/helpers/model_helper.rb`
+
 def collection_tests(collection, params = {}, mocks_implemented = true)
   tests('success') do
 

data/tests/helpers/model_helper.rb

@@ -1,3 +1,5 @@
+# TODO REMOVE this testing functionality is now covered in `spec/helpers/model_helper.rb`
+
 def model_tests(collection, params = {}, mocks_implemented = true)
   tests('success') do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Nat Welch
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -200,7 +200,6 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-gemset"
-- ".ruby-version"
 - ".travis.yml"
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -410,6 +409,7 @@ files:
 - lib/fog/google/requests/compute/list_aggregated_disks.rb
 - lib/fog/google/requests/compute/list_aggregated_machine_types.rb
 - lib/fog/google/requests/compute/list_aggregated_servers.rb
+- lib/fog/google/requests/compute/list_aggregated_target_instances.rb
 - lib/fog/google/requests/compute/list_backend_services.rb
 - lib/fog/google/requests/compute/list_disk_types.rb
 - lib/fog/google/requests/compute/list_disks.rb
@@ -507,8 +507,35 @@ files:
 - lib/fog/google/sql.rb
 - lib/fog/google/storage.rb
 - lib/fog/google/version.rb
-- spec/minitest_helper.rb
-- tests/credentials_tests.rb
+- test/helpers/integration_test_helper.rb
+- test/helpers/test_collection.rb
+- test/helpers/test_helper.rb
+- test/integration/compute/test_backend_services.rb
+- test/integration/compute/test_disk_types.rb
+- test/integration/compute/test_disks.rb
+- test/integration/compute/test_forwarding_rules.rb
+- test/integration/compute/test_global_forwarding_rules.rb
+- test/integration/compute/test_http_health_checks.rb
+- test/integration/compute/test_images.rb
+- test/integration/compute/test_regions.rb
+- test/integration/compute/test_servers.rb
+- test/integration/compute/test_target_http_proxies.rb
+- test/integration/compute/test_target_instances.rb
+- test/integration/compute/test_target_pools.rb
+- test/integration/compute/test_url_maps.rb
+- test/integration/factories/backend_services_factory.rb
+- test/integration/factories/collection_factory.rb
+- test/integration/factories/disks_factory.rb
+- test/integration/factories/forwarding_rules_factory.rb
+- test/integration/factories/global_forwarding_rules_factory.rb
+- test/integration/factories/http_health_checks_factory.rb
+- test/integration/factories/images_factory.rb
+- test/integration/factories/servers_factory.rb
+- test/integration/factories/target_http_proxies_factory.rb
+- test/integration/factories/target_instances_factory.rb
+- test/integration/factories/target_pools_factory.rb
+- test/integration/factories/url_maps_factory.rb
+- test/integration/test_authentication.rb
 - tests/helper.rb
 - tests/helpers/collection_helper.rb
 - tests/helpers/compute/flavors_helper.rb
@@ -522,31 +549,6 @@ files:
 - tests/helpers/schema_validator_tests.rb
 - tests/helpers/succeeds_helper.rb
 - tests/lorem.txt
-- tests/models/compute/backend_service_tests.rb
-- tests/models/compute/backend_services_tests.rb
-- tests/models/compute/disk_tests.rb
-- tests/models/compute/disk_types_tests.rb
-- tests/models/compute/disks_tests.rb
-- tests/models/compute/forwarding_rule_tests.rb
-- tests/models/compute/forwarding_rules_tests.rb
-- tests/models/compute/global_forwarding_rule_tests.rb
-- tests/models/compute/global_forwarding_rules_tests.rb
-- tests/models/compute/http_health_check_tests.rb
-- tests/models/compute/http_health_checks_tests.rb
-- tests/models/compute/image_tests.rb
-- tests/models/compute/images_tests.rb
-- tests/models/compute/region_tests.rb
-- tests/models/compute/regions_tests.rb
-- tests/models/compute/server_tests.rb
-- tests/models/compute/servers_tests.rb
-- tests/models/compute/target_http_proxies_tests.rb
-- tests/models/compute/target_http_proxy_test.rb
-- tests/models/compute/target_instance_tests.rb
-- tests/models/compute/target_instances_tests.rb
-- tests/models/compute/target_pool_tests.rb
-- tests/models/compute/target_pools_tests.rb
-- tests/models/compute/url_map_tests.rb
-- tests/models/compute/url_maps_tests.rb
 - tests/models/dns/change_tests.rb
 - tests/models/dns/changes_tests.rb
 - tests/models/dns/projects_tests.rb
@@ -621,5 +623,33 @@ signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.
 test_files:
-- spec/minitest_helper.rb
+- test/helpers/integration_test_helper.rb
+- test/helpers/test_collection.rb
+- test/helpers/test_helper.rb
+- test/integration/compute/test_backend_services.rb
+- test/integration/compute/test_disk_types.rb
+- test/integration/compute/test_disks.rb
+- test/integration/compute/test_forwarding_rules.rb
+- test/integration/compute/test_global_forwarding_rules.rb
+- test/integration/compute/test_http_health_checks.rb
+- test/integration/compute/test_images.rb
+- test/integration/compute/test_regions.rb
+- test/integration/compute/test_servers.rb
+- test/integration/compute/test_target_http_proxies.rb
+- test/integration/compute/test_target_instances.rb
+- test/integration/compute/test_target_pools.rb
+- test/integration/compute/test_url_maps.rb
+- test/integration/factories/backend_services_factory.rb
+- test/integration/factories/collection_factory.rb
+- test/integration/factories/disks_factory.rb
+- test/integration/factories/forwarding_rules_factory.rb
+- test/integration/factories/global_forwarding_rules_factory.rb
+- test/integration/factories/http_health_checks_factory.rb
+- test/integration/factories/images_factory.rb
+- test/integration/factories/servers_factory.rb
+- test/integration/factories/target_http_proxies_factory.rb
+- test/integration/factories/target_instances_factory.rb
+- test/integration/factories/target_pools_factory.rb
+- test/integration/factories/url_maps_factory.rb
+- test/integration/test_authentication.rb
 has_rdoc: