fog-google 1.3.3 → 1.4.0

data/test/integration/storage/test_files.rb

@@ -37,7 +37,7 @@ class TestStorageRequests < StorageShared
   end
 
   def test_files_create_invalid_predefined_acl
-    assert_raises(Google::Apis::ClientError) do
+    assert_raises(ArgumentError) do
       @client.directories.get(some_bucket_name).files.create(
         :key => new_object_name,
         :body => some_temp_file,

data/test/integration/storage/test_objects.rb

@@ -15,6 +15,12 @@ class TestStorageRequests < StorageShared
     assert_equal(temp_file_content, object[:body])
   end
 
+  def test_put_object_nil
+    assert_raises(ArgumentError) do
+      @client.put_object(some_bucket_name, new_object_name, nil)
+    end
+  end
+
   def test_put_object_file
     object_name = new_object_name
     expected_body = "A file body"

data/test/integration/test_authentication.rb

@@ -3,28 +3,10 @@ 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", &: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", &: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,

data/test/unit/compute/test_common_collections.rb

@@ -0,0 +1,31 @@
+require "helpers/test_helper"
+
+class UnitTestCollections < MiniTest::Test
+  def setup
+    Fog.mock!
+    @client = Fog::Compute.new(:provider => "Google", :google_project => "foo")
+
+    # Top-level ancestors we do not dest
+    common_ancestors = [Fog::Collection, Fog::Association, Fog::PagedCollection]
+    # Projects do not have a "list" method in compute API
+    exceptions = [Fog::Compute::Google::Projects]
+    # Enumerate all descendants of Fog::Collection
+    descendants = ObjectSpace.each_object(Fog::Collection.singleton_class).to_a
+
+    @collections = descendants - common_ancestors - exceptions
+  end
+
+  def teardown
+    Fog.unmock!
+  end
+
+  def test_common_methods
+    # This tests whether Fog::Compute::Google collections have common lifecycle methods
+    @collections.each do |klass|
+      obj = klass.new
+      assert obj.respond_to?(:all), "#{klass} should have an .all method"
+      assert obj.respond_to?(:get), "#{klass} should have a .get method"
+      assert obj.respond_to?(:each), "#{klass} should behave like Enumerable"
+    end
+  end
+end

data/test/unit/compute/test_common_models.rb

@@ -0,0 +1,36 @@
+require "helpers/test_helper"
+
+class UnitTestModels < MiniTest::Test
+  def setup
+    Fog.mock!
+    @client = Fog::Compute.new(:provider => "Google", :google_project => "foo")
+
+    # Top-level ancestors we do not test
+    common_ancestors = [Fog::Model, Fog::Compute::Server]
+    # Do not test models that do not have a create method in API
+    exceptions = [ Fog::Compute::Google::MachineType,
+                   Fog::Compute::Google::Region,
+                   Fog::Compute::Google::DiskType,
+                   Fog::Compute::Google::Operation,
+                   Fog::Compute::Google::Zone,
+                   Fog::Compute::Google::Snapshot,
+                   Fog::Compute::Google::Project ]
+    # Enumerate all descendants of Fog::Model
+    descendants = ObjectSpace.each_object(Fog::Model.singleton_class).to_a
+
+    @models = descendants - common_ancestors - exceptions
+  end
+
+  def teardown
+    Fog.unmock!
+  end
+
+  def test_common_methods
+    # This tests whether Fog::Compute::Google models have common lifecycle methods
+    @models.each do |klass|
+      obj = klass.new
+      assert obj.respond_to?(:save), "#{klass} should have a .save method"
+      assert obj.respond_to?(:destroy), "#{klass} should have a .destroy method"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Nat Welch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +251,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
@@ -231,7 +260,7 @@ files:
 - Rakefile
 - ci/.gitignore
 - ci/README.md
-- ci/credentials.yml.tpl
+- ci/credentials.yml.template
 - ci/docker-image/Dockerfile
 - ci/pipeline.yml
 - ci/tasks/run-int.sh
@@ -701,6 +730,8 @@ files:
 - test/integration/storage/test_files.rb
 - test/integration/storage/test_objects.rb
 - test/integration/test_authentication.rb
+- test/unit/compute/test_common_collections.rb
+- test/unit/compute/test_common_models.rb
 homepage: https://github.com/fog/fog-google
 licenses:
 - MIT
@@ -721,7 +752,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.
@@ -779,3 +810,5 @@ test_files:
 - test/integration/storage/test_files.rb
 - test/integration/storage/test_objects.rb
 - test/integration/test_authentication.rb
+- test/unit/compute/test_common_collections.rb
+- test/unit/compute/test_common_models.rb

data/ci/credentials.yml.tpl

@@ -1,13 +0,0 @@
----
-# Google Cloud Platform project to run under
-google_project:
-# Google Compute Engine Service Account email
-google_client_email:
-# Google Compute Engine Service Account JSON
-google_json_key_data: |
-
-# An access token with repo:status access
-github_access_token:
-# A SSH private key associated with the access token's account or
-# a repo push deploy key
-github_private_key: |