google-cloud-dns 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '00983f35aaeeb1bf7adb3773db346ea4c8f02c81'
-  data.tar.gz: b195169daabe88e53e08e6b0e0d264e2ab5e8928
+SHA256:
+  metadata.gz: 2902040425bfc9edf2d23b29871cf6e0ad1fef4d4cd21b8f202cf273ad468ffb
+  data.tar.gz: ac4997dccb8fbd1c7308e1cddedfdc6f86e17210356b9f2b2aaf0b2fc09a20d1
 SHA512:
-  metadata.gz: ea30cc747ad5cc4d2218a1e0fc3d0ef4773aff5974228a5c53ae6f12589619621d49032e571e368b1bc17203f639ef9c52dda4b22184c18a847891f06640ea5a
-  data.tar.gz: 83dabd1c3469268bf751df28d164e8c1b9f5d7ca741fef9d73f5f3d5858d655e2176bf212c34e3cf794dfdfd960883d2e3d16ad778b8e884f0870fe350099653
+  metadata.gz: 65e7eac5bfbc6bdcc5cc90f0c342b1d8c2a95fa8a2fb5b67a2c39eb1acf59ae4f0cf35db6a1d6290f5134d33515a091c1c9e759a03c4a3c46a193682855b4ba1
+  data.tar.gz: 26810cfcf5449c54b746aa780dca37193c706219de9a30fb37ba348fe3bade65b9cbd2772d24c026384ad53bc188f71890bc3a0bb95b370a436b2576748c33e0

data/lib/google-cloud-dns.rb

@@ -13,9 +13,9 @@
 # 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.dns
+# and Google::Cloud#dns methods can be available, but the library and all
+# dependencies won't be loaded until required and used.
 
 
 gem "google-cloud-core"
@@ -74,10 +74,11 @@ 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] project Identifier for a DNS project. If not present, the
-    #   default project for the credentials is used.
-    # @param [String, Hash] keyfile Keyfile downloaded from Google Cloud. If
-    #   file path the file must be readable.
+    # @param [String] project_id Identifier for a DNS project. If not present,
+    #   the default project for the credentials is used.
+    # @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 {Dns::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
@@ -95,15 +96,15 @@ module Google
     # @example
     #   require "google/cloud"
     #
-    #   dns = Google::Cloud.dns "my-project-id", "/path/to/keyfile.json"
+    #   dns = Google::Cloud.dns "my-project", "/path/to/keyfile.json"
     #
     #   zone = dns.zone "example-com"
     #
-    def self.dns project = nil, keyfile = nil, scope: nil, retries: nil,
+    def self.dns project_id = nil, credentials = nil, scope: nil, retries: nil,
                  timeout: nil
       require "google/cloud/dns"
-      Google::Cloud::Dns.new project: project, keyfile: keyfile, scope: scope,
-                             retries: retries, timeout: timeout
+      Google::Cloud::Dns.new project_id: project_id, credentials: credentials,
+                             scope: scope, retries: retries, timeout: timeout
     end
   end
 end

data/lib/google/cloud/dns.rb

@@ -278,10 +278,11 @@ module Google
       # [Authentication
       # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
       #
-      # @param [String] project Identifier for a DNS project. If not present,
+      # @param [String] project_id Identifier for a DNS project. If not present,
       #   the default project for the credentials is used.
-      # @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 {Dns::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
@@ -293,6 +294,9 @@ 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] project Alias for the `project_id` argument. Deprecated.
+      # @param [String] keyfile Alias for the `credentials` argument.
+      #   Deprecated.
       #
       # @return [Google::Cloud::Dns::Project]
       #
@@ -300,28 +304,26 @@ module Google
       #   require "google/cloud/dns"
       #
       #   dns = Google::Cloud::Dns.new(
-      #           project: "my-dns-project",
-      #           keyfile: "/path/to/keyfile.json"
+      #           project_id: "my-dns-project",
+      #           credentials: "/path/to/keyfile.json"
       #         )
       #
       #   zone = dns.zone "example-com"
       #
-      def self.new project: nil, keyfile: nil, scope: nil, retries: nil,
-                   timeout: nil
-        project ||= Google::Cloud::Dns::Project.default_project
-        project = project.to_s # Always cast to a string
-        fail ArgumentError, "project is missing" if project.empty?
+      def self.new project_id: nil, credentials: nil, scope: nil, retries: nil,
+                   timeout: nil, project: nil, keyfile: nil
+        project_id ||= (project || Dns::Project.default_project_id)
+        project_id = project_id.to_s # Always cast to a string
+        fail ArgumentError, "project_id is missing" if project_id.empty?
 
-        if keyfile.nil?
-          credentials = Google::Cloud::Dns::Credentials.default scope: scope
-        else
-          credentials = Google::Cloud::Dns::Credentials.new(
-            keyfile, scope: scope)
+        credentials ||= (keyfile || Dns::Credentials.default(scope: scope))
+        unless credentials.is_a? Google::Auth::Credentials
+          credentials = Dns::Credentials.new credentials, scope: scope
         end
 
-        Google::Cloud::Dns::Project.new(
-          Google::Cloud::Dns::Service.new(
-            project, credentials, retries: retries, timeout: timeout))
+        Dns::Project.new(
+          Dns::Service.new(
+            project_id, credentials, retries: retries, timeout: timeout))
       end
     end
   end

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

@@ -13,18 +13,44 @@
 # limitations under the License.
 
 
-require "google/cloud/credentials"
+require "googleauth"
 
 module Google
   module Cloud
     module Dns
       ##
-      # @private Represents the Oauth2 signing logic for DNS.
-      class Credentials < Google::Cloud::Credentials
+      # # Credentials
+      #
+      # Represents the authentication and authorization used to connect to the
+      # DNS API.
+      #
+      # @example
+      #   require "google/cloud/dns"
+      #
+      #   keyfile = "/path/to/keyfile.json"
+      #   creds = Google::Cloud::Dns::Credentials.new keyfile
+      #
+      #   dns = Google::Cloud::Dns.new(
+      #     project_id: "my-project",
+      #     credentials: creds
+      #   )
+      #
+      #   dns.project_id #=> "my-project"
+      #
+      class Credentials < Google::Auth::Credentials
         SCOPE = ["https://www.googleapis.com/auth/ndev.clouddns.readwrite"]
-        PATH_ENV_VARS = %w(DNS_KEYFILE GOOGLE_CLOUD_KEYFILE GCLOUD_KEYFILE)
-        JSON_ENV_VARS = %w(DNS_KEYFILE_JSON GOOGLE_CLOUD_KEYFILE_JSON
+        PATH_ENV_VARS = %w(DNS_CREDENTIALS
+                           DNS_KEYFILE
+                           GOOGLE_CLOUD_CREDENTIALS
+                           GOOGLE_CLOUD_KEYFILE
+                           GCLOUD_KEYFILE)
+        JSON_ENV_VARS = %w(DNS_CREDENTIALS_JSON
+                           DNS_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/dns/project.rb

@@ -64,17 +64,17 @@ module Google
         #   require "google/cloud/dns"
         #
         #   dns = Google::Cloud::Dns.new(
-        #           project: "my-project-id",
-        #           keyfile: "/path/to/keyfile.json"
+        #     project_id: "my-project",
+        #     credentials: "/path/to/keyfile.json"
         #   )
         #
+        #   dns.project_id #=> "my-project"
         #
-        #   dns.project #=> "my-project-id"
-        #
-        def project
+        def project_id
           service.project
         end
-        alias_method :id, :project
+        alias_method :project, :project_id
+        alias_method :id, :project_id
 
         ##
         # The project number.
@@ -127,7 +127,7 @@ module Google
 
         ##
         # @private Default project.
-        def self.default_project
+        def self.default_project_id
           ENV["DNS_PROJECT"] ||
             ENV["GOOGLE_CLOUD_PROJECT"] ||
             ENV["GCLOUD_PROJECT"] ||

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Dns
-      VERSION = "0.26.0"
+      VERSION = "0.27.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-dns
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.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-14 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: zonefile
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +238,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 DNS