google-cloud-resource_manager 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '060830c577107ff755cdf39c28ddc22a60f97a3d'
-  data.tar.gz: b6e3cc0914f424055ec28e48e12b04f96c4cb475
+SHA256:
+  metadata.gz: f14d8ad4d2c7037398aee52815b98ec143a5578925ac85c75072132cb425d2db
+  data.tar.gz: 551fe2be47bcb38054ad62d7045b285a785491e24081e4977a9a840a06faf4b2
 SHA512:
-  metadata.gz: 31c11ff6696dae1baa98e75da32f152fccce3f1e08b47cecf8d8b9e6165cc6b88d7079fdc2125cd17736538ffd107c1d635d70526974fd6ed19eb3ba44b4ba8c
-  data.tar.gz: '08636b712c01d526f943642fc3475c05a6f3c06a595103217d1717bca038145a920983c7426d8a82275c1dee051123d3f9ea651900abb9346a2526f23a8e6453'
+  metadata.gz: 3382c7586ffbb2970fc042716cb262bb3ce9714a753a306827beb5d25383aeb52ade9e65e6c111da6a30e559798d755c4475faa52a502109a64cb20b2da0f7e7
+  data.tar.gz: 57860ebfabfe514dc895bcda275c91dbe5ba741f5bb5a60887ff906a37a5a9230a79b6c1c8eb76575a0ab934cf8398bd00b9d58333ac14343d5470d3db00eff2

data/lib/google-cloud-resource_manager.rb

@@ -13,9 +13,10 @@
 # limitations under the License.
 
 ##
-# This file is here to be autorequired by bundler, so that the .bigquery and
-# #bigquery methods can be available, but the library and all dependencies won't
-# be loaded until required and used.
+# This file is here to be autorequired by bundler, so that the
+# Google::Cloud.resource_manager and Google::Cloud#resource_manager methods can
+# be available, but the library and all dependencies won't be loaded until
+# required and used.
 
 
 gem "google-cloud-core"
@@ -74,8 +75,9 @@ module Google
     # For more information on connecting to Google Cloud see the [Authentication
     # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
     #
-    # @param [String, Hash] keyfile Keyfile downloaded from Google Cloud. If
-    #   file path the file must be readable.
+    # @param [String, Hash, Google::Auth::Credentials] credentials The path to
+    #   the keyfile as a String, the contents of the keyfile as a Hash, or a
+    #   Google::Auth::Credentials object. (See {ResourceManager::Credentials})
     # @param [String, Array<String>] scope The OAuth 2.0 scopes controlling the
     #   set of resources and operations that the connection can access. See
     #   [Using OAuth 2.0 to Access Google
@@ -98,10 +100,10 @@ module Google
     #     puts projects.project_id
     #   end
     #
-    def self.resource_manager keyfile = nil, scope: nil, retries: nil,
+    def self.resource_manager credentials = nil, scope: nil, retries: nil,
                               timeout: nil
       require "google/cloud/resource_manager"
-      Google::Cloud::ResourceManager.new keyfile: keyfile, scope: scope,
+      Google::Cloud::ResourceManager.new credentials: credentials, scope: scope,
                                          retries: retries, timeout: timeout
     end
   end

data/lib/google/cloud/resource_manager.rb

@@ -228,8 +228,9 @@ module Google
       # [Authentication
       # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
       #
-      # @param [String, Hash] keyfile Keyfile downloaded from Google Cloud. If
-      #   file path the file must be readable.
+      # @param [String, Hash, Google::Auth::Credentials] credentials The path to
+      #   the keyfile as a String, the contents of the keyfile as a Hash, or a
+      #   Google::Auth::Credentials object. (See {ResourceManager::Credentials})
       # @param [String, Array<String>] scope The OAuth 2.0 scopes controlling
       #   the set of resources and operations that the connection can access.
       #   See [Using OAuth 2.0 to Access Google
@@ -241,6 +242,8 @@ module Google
       # @param [Integer] retries Number of times to retry requests on server
       #   error. The default value is `3`. Optional.
       # @param [Integer] timeout Default timeout to use in requests. Optional.
+      # @param [String] keyfile Alias for the `credentials` argument.
+      #   Deprecated.
       #
       # @return [Google::Cloud::ResourceManager::Manager]
       #
@@ -252,16 +255,17 @@ module Google
       #     puts projects.project_id
       #   end
       #
-      def self.new keyfile: nil, scope: nil, retries: nil, timeout: nil
-        if keyfile.nil?
-          credentials = Google::Cloud::ResourceManager::Credentials.default(
-            scope: scope)
-        else
-          credentials = Google::Cloud::ResourceManager::Credentials.new(
-            keyfile, scope: scope)
+      def self.new credentials: nil, scope: nil, retries: nil, timeout: nil,
+                   keyfile: nil
+        credentials ||= keyfile
+        credentials ||= ResourceManager::Credentials.default(scope: scope)
+        unless credentials.is_a? Google::Auth::Credentials
+          credentials = ResourceManager::Credentials.new credentials,
+                                                         scope: scope
         end
-        Google::Cloud::ResourceManager::Manager.new(
-          Google::Cloud::ResourceManager::Service.new(
+
+        ResourceManager::Manager.new(
+          ResourceManager::Service.new(
             credentials, retries: retries, timeout: timeout))
       end
     end

data/lib/google/cloud/resource_manager/credentials.rb

@@ -13,19 +13,41 @@
 # limitations under the License.
 
 
-require "google/cloud/credentials"
+require "googleauth"
 
 module Google
   module Cloud
     module ResourceManager
       ##
-      # @private Represents the Oauth2 signing logic for Resource Manager.
-      class Credentials < Google::Cloud::Credentials
+      # # Credentials
+      #
+      # Represents the authentication and authorization used to connect to the
+      # Resource Manager API.
+      #
+      # @example
+      #   require "google/cloud/resource_manager"
+      #
+      #   keyfile = "/path/to/keyfile.json"
+      #   creds = Google::Cloud::ResourceManager::Credentials.new keyfile
+      #
+      #   resource_manager = Google::Cloud::ResourceManager.new(
+      #     credentials: creds
+      #   )
+      #
+      class Credentials < Google::Auth::Credentials
         SCOPE = ["https://www.googleapis.com/auth/cloud-platform"]
-        PATH_ENV_VARS = %w(RESOURCE_MANAGER_KEYFILE
-                           GOOGLE_CLOUD_KEYFILE GCLOUD_KEYFILE)
-        JSON_ENV_VARS = %w(RESOURCE_MANAGER_KEYFILE_JSON
-                           GOOGLE_CLOUD_KEYFILE_JSON GCLOUD_KEYFILE_JSON)
+        PATH_ENV_VARS = %w(RESOURCE_MANAGER_CREDENTIALS
+                           RESOURCE_MANAGER_KEYFILE
+                           GOOGLE_CLOUD_CREDENTIALS
+                           GOOGLE_CLOUD_KEYFILE
+                           GCLOUD_KEYFILE)
+        JSON_ENV_VARS = %w(RESOURCE_MANAGER_CREDENTIALS_JSON
+                           RESOURCE_MANAGER_KEYFILE_JSON
+                           GOOGLE_CLOUD_CREDENTIALS_JSON
+                           GOOGLE_CLOUD_KEYFILE_JSON
+                           GCLOUD_KEYFILE_JSON)
+        DEFAULT_PATHS = \
+          ["~/.config/gcloud/application_default_credentials.json"]
       end
     end
   end

data/lib/google/cloud/resource_manager/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module ResourceManager
-      VERSION = "0.27.0"
+      VERSION = "0.28.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-resource_manager
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -17,28 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.17.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: googleauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Resource Manager