fog-google 1.24.1 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32fba42f750f2248b67a52b9c90e4ad74afeee359c7b8eec325de6e61e958e3d
-  data.tar.gz: 6b34cbc9704516e06f9dbff7a6cb37eb403acaefd06e5be5361bcad5e065ebc3
+  metadata.gz: f5f068b5166ef1e1c12d9bef6ae6da15c489df03929d86047709ef19c3dd70e9
+  data.tar.gz: 4e94f5cfb3be3fec06535efd74368720b42c37537ea8ffcf2c42888b68bcf283
 SHA512:
-  metadata.gz: 06b4ca2279ada450d5036ed62e54187bdb82172fb48873446929dd409b8c45ab1e2fb59f63bfdd1498e1d8917e7276ebc69a718ae7a6c188c8279fffe4eb36a1
-  data.tar.gz: 3f2201ff0d673c300b89d69ee228301afd660bc59bfdde91dcc1da48894798f9c64a6e9847c0818c8c32dcca1097ad33646966d484988c0959a7a0dd91b35678
+  metadata.gz: 7fed398133b6232a92ada212c143d65228dbb3a0d6c49b1842256ef79b1fea2a2bf9add46947459d2afb4b3df4f69fb74b49bfe14f0a6459cceab7adb4518ae1
+  data.tar.gz: 53397624bfcdb357853bba55725c9c60336c734fe0ecb81f812cabed0945cb9009b93b2d3b6ff04e3673082ebee82d1fdda647f55631dced3f27673a8f6f1430

data/.github/workflows/integration-compute-core.yml

@@ -36,13 +36,13 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2' ]
+        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       # TODO(fog-google#626): remove this once cleanup is fixed
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-compute-instance_groups.yml

@@ -37,12 +37,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2' ]
+        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-compute-loadbalancing.yml

@@ -37,12 +37,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2' ]
+        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-compute-networking.yml

@@ -36,12 +36,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2' ]
+        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-monitoring.yml

@@ -37,12 +37,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2' ]
+        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-pubsub.yml

@@ -37,12 +37,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2' ]
+        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-sql.yml

@@ -37,12 +37,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2' ]
+        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-storage.yml

@@ -38,12 +38,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2' ]
+        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/unit.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', 'head', 'truffleruby-head']
+        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4', 'head', 'truffleruby-head']
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/CHANGELOG.md

@@ -4,8 +4,39 @@ The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## Next
+## 1.26.0
 
+### User-facing
+
+#### Fixed
+
+- #632 remove unused files from package [temikus]
+- #643 update disk attachment method to use new attached_disk_obj method [geemus]
+- #644 improve mock bucket name regex validation [geemus]
+- #646 fix frozen string literal warnings in storage [krororo]
+
+### Development changes
+
+#### Added
+
+- #645 add ruby 3.3 and 3.4 to CI test matrix [krororo]
+
+#### Fixed
+
+- #641 Updated actions/checkout from 4 to 5 [dependabot]
+- #642 Updated actions/stale from 9 to 10 [dependabot]
+- remove stale workflow [geemus]
+
+## 1.25.0
+
+### User-facing
+
+fog-core v2.2 and up now requires `Fog::Google:<service>` instead of `Fog::<service>::Google`.
+There are shims in place that will provide backwards compatibility for the latter with
+a deprecation warning, but you should update your code accordingly. The next major release
+will drop support of the old format.
+
+- #636 Support fog-core 2.5 and up [stanhu]
 
 ## 1.24.1
 
@@ -323,7 +354,7 @@ Drop travis usage
 
 #### Fixed
 
-- \#448 Add `:google_application_default` as recognized argument in 
+- \#448 Add `:google_application_default` as recognized argument in
   Fog::Compute::Google client [mavin]
 
 ### Development changes
@@ -339,14 +370,14 @@ Drop travis usage
 #### Added
 
 - \#442 Add support for Application Default credentials [mavin]
-  - This change allows the use of Application Default Credentials so that end 
+  - This change allows the use of Application Default Credentials so that end
     users can authenticate without a service account for development, testing,
-    and one-off interactions by using `:google_application_default`client 
+    and one-off interactions by using `:google_application_default`client
     option. See README for more details.
 
 ### Fixed
 
-- \#444 Remove deprecated `google_client_email` option from client parameters 
+- \#444 Remove deprecated `google_client_email` option from client parameters
   [temikus]
 - \#446 Updating service parameters to avoid "unrecognised parameter" warnings
   when initializing Fog client with application default auth [temikus]
@@ -371,7 +402,7 @@ Drop travis usage
 
 #### Fixed
 
-- \#433 Allow the api to close Tempfiles inline, improving disk utilization. 
+- \#433 Allow the api to close Tempfiles inline, improving disk utilization.
         [itopalov]
 
 ### Development changes
@@ -413,12 +444,12 @@ Drop travis usage
 - \#419 Locked down fog upstream dependencies to alleviate deprecation warnings
   until they can be properly dealt with. [temikus]
 - \#400 Small `%Collection%.get` and `%Collection%.all` behaviour fixes [temikus]
-  - `Fog::Google::SQL::Instances.get(nil)` no longer returns an invalid 
+  - `Fog::Google::SQL::Instances.get(nil)` no longer returns an invalid
     `sql#instancesList` object.
-  - `Fog::Compute::Google::InstanceGroups.get` and `.all` methods now support 
+  - `Fog::Compute::Google::InstanceGroups.get` and `.all` methods now support
     more than just `:filter` option, fixed `.all` output without `zone` option.
   - Fix a typo causing `Operations.get(region:REGION)` to fail.
-  - `Fog::Compute::Google::Images.get(IMAGE, PROJECT)`, now returns `nil` if 
+  - `Fog::Compute::Google::Images.get(IMAGE, PROJECT)`, now returns `nil` if
     image is not found rather than throwing `Google::Apis::ClientError`.
 
 ### Development changes
@@ -426,13 +457,13 @@ Drop travis usage
 #### Added
 
 - \#400 Additional test coverage [temikus]
-  - Expanded tests for `%Collection%.get` behavior - scoped requests 
-    (e.g. `get(zone:ZONE)`) and their corresponding code paths are now also 
+  - Expanded tests for `%Collection%.get` behavior - scoped requests
+    (e.g. `get(zone:ZONE)`) and their corresponding code paths are now also
     properly tested.
   - Increase `Fog::Compute::Google::Images` integration test coverage.
   - Unit tests now work without a `~/.fog` config file set up.
   - Expanded unit test coverage.
-- \#424 Add simple integration tests to check client proxy options being 
+- \#424 Add simple integration tests to check client proxy options being
   applied.
 
 #### Changed
@@ -449,7 +480,7 @@ Drop travis usage
 
 #### Fixed
 
-- \#412 Fixed `Fog::Storage::GoogleXML::GetObjectHttpUrl#get_object_http_url` 
+- \#412 Fixed `Fog::Storage::GoogleXML::GetObjectHttpUrl#get_object_http_url`
   request
 
 ## 1.7.0
@@ -466,8 +497,8 @@ Drop travis usage
 
 #### Changed
 
-- \#394 `save/update/destroy` and other operations now wait until they are in a 
-  DONE state, instead of !PENDING. This should be a no-op for users but should 
+- \#394 `save/update/destroy` and other operations now wait until they are in a
+  DONE state, instead of !PENDING. This should be a no-op for users but should
   safeguard from issues in the future. [temikus]
 - \#383 `Fog::Compute::Google::Address` resources are now created synchronously
   by default. [temikus]
@@ -485,7 +516,7 @@ Drop travis usage
 - \#376 Add doc coverage tracking. [temikus]
 - \#383 Increase integration test coverage further. [temikus]
   - Add collection tests and factories (when mutable) for following resources:
-    - Addresses 
+    - Addresses
     - Disks
     - Projects
     - Routes
@@ -509,7 +540,7 @@ Drop travis usage
 
 #### Changed
 
-- \#338 `Fog::Google::SQL` resources are now created and destroyed synchronously by default. 
+- \#338 `Fog::Google::SQL` resources are now created and destroyed synchronously by default.
 You can override it in a standard manner by passing a parameter to async method, e.g.:
  `Fog::Google::SQL::Instance.create(true)` [temikus]
 - \#367 `Fog::Compute::Google::Server.bootstrap` changes [temikus]
@@ -578,30 +609,30 @@ You can override it in a standard manner by passing a parameter to async method,
 #### Added
 
 - \#336 `Fog::Compute::Google::Server.set_metadata` is now working properly and adopted a simpler format, e.g. `{'foo' => 'bar', 'baz'=>'foo'}`
-- \#334 Added a new helper method: `Fog::Compute::Google::Server.public_ip_address` [temikus] 
-- \#314 Added `Fog::Compute::Google::InstanceGroup.add_instance` method back [temikus] 
+- \#334 Added a new helper method: `Fog::Compute::Google::Server.public_ip_address` [temikus]
+- \#314 Added `Fog::Compute::Google::InstanceGroup.add_instance` method back [temikus]
 - \#326 Added support for using predefined ACLs, refactor valid ACLs [vimutter]
 - \#318 Added fog_public support in Storage JSON API [jayhsu21]
 
 #### Fixed
 
-- \#354 Bump Google API client to 0.23 [temikus] 
-- \#346 Fixed get_health when called with an instance name [bpaquet] 
-- \#317 Fixed source_image selection to get the image from name if the format is not compatible with new Google API Client [temikus] 
-- \#321 Fix string key instead of symbol for subnetworks listing [tumido] 
-- \#351 Fixed trailing spaces and added data presence check to `Fog::Storage::GoogleJSON.put_object` [vimutter] 
+- \#354 Bump Google API client to 0.23 [temikus]
+- \#346 Fixed get_health when called with an instance name [bpaquet]
+- \#317 Fixed source_image selection to get the image from name if the format is not compatible with new Google API Client [temikus]
+- \#321 Fix string key instead of symbol for subnetworks listing [tumido]
+- \#351 Fixed trailing spaces and added data presence check to `Fog::Storage::GoogleJSON.put_object` [vimutter]
 
 ### Development changes
 
 #### Added
 
-- \#353 Added collection/model unit tests to be run by Travis CI [temikus] 
-- \#347 Added target pool tests [temikus] 
+- \#353 Added collection/model unit tests to be run by Travis CI [temikus]
+- \#347 Added target pool tests [temikus]
 
 #### Fixed
 
 - \#322 Fixed all broken integration tests, all tests now pass in CI [temikus]
-- \#344 Updated CI pipeline to run in parallel, broke out test tasks [temikus] 
+- \#344 Updated CI pipeline to run in parallel, broke out test tasks [temikus]
 
 ## 1.0.1
 

data/CONTRIBUTING.md

@@ -1,9 +1,9 @@
 # Getting Involved
 
-New contributors are always welcome, and when in doubt please ask questions! 
+New contributors are always welcome, and when in doubt please ask questions!
 We strive to be an open and welcoming community. Please be nice to one another.
 
-We recommend heading over to fog's [CONTRIBUTING](https://github.com/fog/fog/blob/master/CONTRIBUTING.md) 
+We recommend heading over to fog's [CONTRIBUTING](https://github.com/fog/fog/blob/master/CONTRIBUTING.md)
 and having a look around as well.  It has information and context about the state of the `fog` project as a whole.
 
 ### Coding
@@ -62,7 +62,7 @@ $ rake console
 ### Documentation
 
 Code should be documented using [YARDoc](https://yardoc.org/) syntax.
-We use [inch](https://github.com/rrrene/inch) to keep track of overall doc 
+We use [inch](https://github.com/rrrene/inch) to keep track of overall doc
 coverage and [inch-ci](https://inch-ci.org/) to keep track of changes over time.
 
 You can view a doc coverage report by running:
@@ -72,19 +72,19 @@ $ inch
 
 Or view suggestions on a specific method:
 ```
-$ inch show Fog::Compute::Google::Server#set_metadata
+$ inch show Fog::Google::Compute::Server#set_metadata
 ```
 
 ### Testing
 
-This module is tested with [Minitest](https://github.com/seattlerb/minitest).  
+This module is tested with [Minitest](https://github.com/seattlerb/minitest).
 
 #### Integration tests
 
-Live integration tests can be found in `test/integration/`.  
+Live integration tests can be found in `test/integration/`.
 
 Most of the library functionality is currently covered with them. To simplify things for contributors we have a
-CI system that runs all integration tests in parallel against all pull requests marked with `integrate` label 
+CI system that runs all integration tests in parallel against all pull requests marked with `integrate` label
 that anyone in `fog-google` team can set. Read [CI section](https://github.com/fog/fog-google/blob/master/CONTRIBUTING.md#continuous-integration)
 for more info.
 
@@ -137,7 +137,7 @@ We're in progress of extending the library with more unit tests and contribution
 
 #### The transition from `shindo` to Minitest
 
-Previously, [shindo](https://github.com/geemus/shindo) was the primary testing framework. 
+Previously, [shindo](https://github.com/geemus/shindo) was the primary testing framework.
 We've moved away from it, and to Minitest, but some artifacts may remain.
 
 For more information on transition, read [#50](https://github.com/fog/fog-google/issues/50).
@@ -158,10 +158,10 @@ and contains the standard tests to run for all resources, (e.g. `test_lifecycle`
 It also calls `cleanup` on the resource's factory during teardown, to make sure
 that resources are getting destroyed before the next test run.
 - The **factory**, (e.g. `ServersFactory`, in `test/integration/factories/servers_factory.rb`,)
-automates the creation of resources and/or supplies parameters for explicit 
+automates the creation of resources and/or supplies parameters for explicit
 creation of resources.  For example, `ServersFactory` initializes a `DisksFactory`
 to supply disks in order to create servers, and implements the `params` method
-so that tests can create servers with unique names, correct zones and machine 
+so that tests can create servers with unique names, correct zones and machine
 types, and automatically-created disks.  `ServersFactory` inherits the `create`
 method from `CollectionFactory`, which allows tests to create servers on-demand.
 - The **main test**, (e.g. `TestServers`, in `test/integration/compute/test_servers.rb`,)
@@ -170,6 +170,6 @@ method from `CollectionFactory`, which allows tests to create servers on-demand.
  it initializes a `ServersFactory`, and it includes any other tests specific to
  this collection, (e.g. `test_bootstrap_ssh_destroy`).
 
-If you want to create another resource, you should add live integration tests; 
+If you want to create another resource, you should add live integration tests;
 all you need to do is create a factory in `test/integration/factories/my_resource_factory.rb`
 and a main test in `test/integration/compute/test_my_resource.rb` that mixes in `TestCollection`.

data/README.md

@@ -24,7 +24,7 @@ We're proud to be sponsored by MeisterLabs who are generously funding our CI sta
 
 ## Storage
 
-There are two ways to access [Google Cloud Storage](https://cloud.google.com/storage/). The old S3 API and the new JSON API. `Fog::Storage::Google` will automatically direct you to the appropriate API based on the credentials you provide it.
+There are two ways to access [Google Cloud Storage](https://cloud.google.com/storage/). The old S3 API and the new JSON API. `Fog::Google::Storage` will automatically direct you to the appropriate API based on the credentials you provide it.
 
  * The [XML API](https://cloud.google.com/storage/docs/xml-api-overview/) is almost identical to S3. Use [Google's interoperability keys](https://cloud.google.com/storage/docs/migrating#keys) to access it.
  * The new [JSON API](https://cloud.google.com/storage/docs/json_api/) is faster and uses auth similarly to the rest of the Google Cloud APIs using a [service account private key](https://developers.google.com/identity/protocols/OAuth2ServiceAccount).
@@ -33,7 +33,7 @@ There are two ways to access [Google Cloud Storage](https://cloud.google.com/sto
 
 Google Compute Engine is a Virtual Machine hosting service. Currently it is built on version [v1](https://cloud.google.com/compute/docs/reference/v1/) of the GCE API.
 
-As of 2017-12-15, we are still working on making Fog for Google Compute engine (`Fog::Compute::Google`) feature complete. If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog-google/issues) for any anomalies you see or features you would like.
+As of 2017-12-15, we are still working on making Fog for Google Compute engine (`Fog::Google::Compute`) feature complete. If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog-google/issues) for any anomalies you see or features you would like.
 
 ## SQL
 
@@ -112,10 +112,10 @@ Example workflow for a GCE instance with [service account scopes](https://cloud.
 defined:
 
 ```
-> connection = Fog::Compute::Google.new(:google_project => "my-project", :google_application_default => true)
-=> #<Fog::Compute::Google::Real:32157700...
+> connection = Fog::Google::Compute.new(:google_project => "my-project", :google_application_default => true)
+=> #<Fog::Google::Compute::Real:32157700...
 > connection.servers
-=> [  <Fog::Compute::Google::Server ...  ]
+=> [  <Fog::Google::Compute::Server ...  ]
 ```
 
 #### CarrierWave integration
@@ -166,9 +166,9 @@ Once you've specified your credentials, you should be good to go!
 $ bundle exec pry
 [1] pry(main)> require 'fog/google'
 => true
-[2] pry(main)> connection = Fog::Compute::Google.new
+[2] pry(main)> connection = Fog::Google::Compute.new
 [3] pry(main)> connection.servers
-=> [  <Fog::Compute::Google::Server
+=> [  <Fog::Google::Compute::Server
     name="xxxxxxx",
     kind="compute#instance",
 ```

data/SECURITY.md

@@ -1,16 +1,5 @@
-# Security Policy
+# Security contact information
 
-Our README.md is the end all be all for authoritative information, but the following is our security policy.
+To report a security vulnerability, please contact [Tidelift security](https://tidelift.com/security).
 
-## Supported Versions
-
-Versions with :white_check_mark: are supported. All other versions need to be upgraded.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.9.x   | :white_check_mark: |
-| 0.1.x   | :white_check_mark: until July 1st, 2019 |
-
-## Reporting a Vulnerability
-
-Please file an issue here to report a vulnerability. For immediate escalations, please email nat@natwelch.com and temikus@google.com with the subject `[Fog-Google Security Issue] Description`.
+Tidelift will coordinate the fix and disclosure.

data/examples/create_instance_and_attach_disk_later.rb

@@ -49,8 +49,8 @@ def example
 
   p "Attach second disk to the running server"
   device_name = "fog-smoke-test-device-#{Time.now.to_i}"
-  # See https://github.com/fog/fog-google/blob/master/lib/fog/compute/google/models/disk.rb#L75-L107
-  # See https://github.com/fog/fog-google/blob/master/lib/fog/compute/google/models/server.rb#L35-L50
+  # See https://github.com/fog/fog-google/blob/master/lib/fog/google/compute/models/disk.rb#L75-L107
+  # See https://github.com/fog/fog-google/blob/master/lib/fog/google/compute/models/server.rb#L35-L50
   config_hash = {
     :device_name => device_name,
     :source => "https://www.googleapis.com/compute/v1/projects/#{PROJECT}/zones/#{ZONE}/disks/#{attached_disk.name}"
@@ -58,13 +58,13 @@ def example
   raise "Could not attach second disk" unless connection.attach_disk(server.name, ZONE, config_hash)
 
   p "Waiting for disk to be attached"
-  attached_disk.wait_for { ! users.nil? && users != []}
+  attached_disk.wait_for { !users.nil? && users != [] }
 
   p "Detach second disk"
   raise "Could not detach second disk" unless connection.detach_disk(server.name, ZONE, device_name)
 
   p "Waiting for second disk to be detached"
-  attached_disk.wait_for { users.nil? || users == []}
+  attached_disk.wait_for { users.nil? || users == [] }
 
   p "Deleting server"
   raise "Could not delete server." unless server.destroy
@@ -74,9 +74,8 @@ def example
 
   p "Waiting for second disk to be destroyed"
   begin
-    rc = attached_disk.wait_for { status.nil? || status == 'DELETING' }
-
-  rescue => e
+    rc = attached_disk.wait_for { status.nil? || status == "DELETING" }
+  rescue StandardError => e
     if e.message !~ /not found/ && e.message !~ /notFound/
       raise e
     end

data/examples/dns/project.rb

@@ -1,5 +1,5 @@
 def test
-  connection = Fog::DNS::Google.new
+  connection = Fog::Google::DNS.new
 
   puts "Get the Project limits..."
   puts "-------------------------"

data/examples/dns/zones.rb

@@ -1,5 +1,5 @@
 def test
-  connection = Fog::DNS::Google.new
+  connection = Fog::Google::DNS.new
 
   puts "Create a Zone..."
   puts "----------------"

data/examples/storage.rb

@@ -11,7 +11,7 @@ Bundler.require(:default, :development)
 # Storage -> Storage -> Settings -> "Interoperability" tab -> "Create a new key"
 
 def test
-  connection = Fog::Storage::Google.new
+  connection = Fog::Google::Storage.new
 
   puts "Put a bucket..."
   puts "----------------"

data/examples/storage_json.rb

@@ -11,7 +11,7 @@ Bundler.require(:default, :development)
 # Storage -> Storage -> Settings -> "Interoperability" tab -> "Create a new key"
 
 def test
-  connection = Fog::Storage::Google.new
+  connection = Fog::Google::Storage.new
 
   puts "Put a bucket..."
   puts "----------------"

data/fog-google.gemspec

@@ -12,15 +12,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/fog/fog-google"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.start_with?("test/") }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   # As of 0.1.1
   spec.required_ruby_version = ">= 2.0"
 
-  spec.add_dependency "fog-core", "< 2.5"
+  spec.add_dependency "fog-core", "~> 2.5"
   spec.add_dependency "fog-json", "~> 1.2"
   spec.add_dependency "fog-xml", "~> 0.1.0"
 
@@ -39,7 +38,7 @@ Gem::Specification.new do |spec|
   # Debugger
   # Locked because pry-byebug is broken with 13+
   # see: https://github.com/deivid-rodriguez/pry-byebug/issues/343
-  spec.add_development_dependency "pry", "= 0.14.2"
+  spec.add_development_dependency "pry", "= 0.15.2"
 
   # Testing gems
   spec.add_development_dependency "retriable"