google-cloud-core 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e44ada22e203f330c8b70e746ce7b7fe79ff7a40587f993126f18438e18bebf1
-  data.tar.gz: a3eba190acf8259d8c9dd8c14ce8db08fa7f133a1c38c81958dac03cb74c3eeb
+  metadata.gz: dd3cf2a2e538cb37ffd2daae810180a7cf19dcad051f1fdce8d6b6c6dd13a566
+  data.tar.gz: e197ffcd7a014052eaeabba0f744ce0c3c86da7be88639bd9e91338eb122b7e4
 SHA512:
-  metadata.gz: e230827b88d66edb003623e9955e522f5695ffd7a5d7b095bf678ae886a049014917511bfc4d79a23dfa5d16a6b64f445c985a8e57dae0298354b243a9cf3e36
-  data.tar.gz: 4248b6744703cae1c167d6fcfc59c69a0ca99d155a17b5a7deef3137c197b7e625382d7935dab26383a64649ef692f713a933528e3a79f46406dfb94b2d6d2e4
+  metadata.gz: 27e11063ff53977170fa53a5559d272ac324225ee0ee9bc85f2b696b5b6f31f0719b605283eae7b73d12808a8326a97f9dd5308d89fab5b89df22dac5fdca8b3
+  data.tar.gz: 4ba78b2ef42de56f09660dd30c40eee1fcd7c74a6ba5c57fc126dcd05cb9af59e9087caa8f9745a44f8e332c67a6e8b16252ef8f600655ff811c74314635011b

data/LICENSE

@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

data/lib/google/cloud.rb

@@ -1,10 +1,10 @@
-# Copyright 2015 Google Inc. All rights reserved.
+# Copyright 2015 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 
+require "google/cloud/config"
 require "google/cloud/core/version"
 
 ##
@@ -23,10 +24,14 @@ require "google/cloud/core/version"
 # that allow you to create anything from simple websites to complex
 # applications.
 #
-# The goal of google-cloud is to provide a API that is familiar and comfortable
-# to Rubyists. Authentication is handled by providing project and credential
-# information, or if you are running on Google Compute Engine this configuration
-# is taken care of for you.
+# The goal of google-cloud is to provide an API that is comfortable to
+# Rubyists. Your authentication credentials are detected automatically in
+# Google Cloud Platform environments such as Google Compute Engine, Google
+# App Engine and Google Kubernetes Engine. In other environments you can
+# configure authentication easily, either directly in your code or via
+# environment variables. Read more about the options for connecting in the
+# [Authentication
+# Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
 #
 # You can learn more about various options for connection on the [Authentication
 # Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/authentication).
@@ -67,9 +72,51 @@ module Google
       gcloud.extend Google::Cloud
       gcloud
     end
+
+    ##
+    # Configure the default parameter for Google::Cloud. The values defined on
+    # this top level will be shared across all Google::Cloud libraries, which
+    # may also add fields to this object or add sub configuration options under
+    # this object.
+    #
+    # Possible configuration parameters:
+    #
+    # * `project_id`: The Google Cloud Project ID. Automatically discovered
+    #                 when running from GCP environments.
+    # * `credentials`: The service account JSON file path. Automatically
+    #                  discovered when running from GCP environments.
+    #
+    # @return [Google::Cloud::Config] The top-level configuration object for
+    #     Google::Cloud libraries.
+    #
+    def self.configure
+      @config ||= Config.create
+
+      yield @config if block_given?
+
+      @config
+    end
   end
 end
 
+# Set the default top-level configuration
+Google::Cloud.configure do |config|
+  default_project = Google::Cloud::Config.deferred do
+    ENV["GOOGLE_CLOUD_PROJECT"] || ENV["GCLOUD_PROJECT"]
+  end
+  default_creds = Google::Cloud::Config.deferred do
+    Google::Cloud::Config.credentials_from_env \
+      "GOOGLE_CLOUD_CREDENTIALS", "GOOGLE_CLOUD_CREDENTIALS_JSON",
+      "GOOGLE_CLOUD_KEYFILE", "GOOGLE_CLOUD_KEYFILE_JSON",
+      "GCLOUD_KEYFILE", "GCLOUD_KEYFILE_JSON"
+  end
+
+  config.add_field! :project_id, default_project, match: String, allow_nil: true
+  config.add_alias! :project, :project_id
+  config.add_field! :credentials, default_creds, match: Object
+  config.add_alias! :keyfile, :credentials
+end
+
 # Auto-load all Google Cloud service gems.
 Gem.find_files("google-cloud-*.rb").each do |google_cloud_service|
   require google_cloud_service

data/lib/google/cloud/config.rb

@@ -0,0 +1,607 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+module Google
+  module Cloud
+    ##
+    # Configuration mechanism for Google Cloud libraries. A Config object
+    # contains a list of predefined keys, some of which are values and others
+    # of which are subconfigurations, i.e. categories. Field access is
+    # generally validated to ensure that the field is defined, and when a
+    # a value is set, it is validated for the correct type. Warnings are
+    # printed when a validation fails.
+    #
+    # You generally access fields and subconfigs by calling accessor methods.
+    # Methods meant for "administration" such as adding options, are named
+    # with a trailing "!" or "?" so they don't pollute the method namespace.
+    # It is also possible to access a field using the `[]` operator.
+    #
+    # Note that config objects inherit from `BasicObject`. This means it does
+    # not define many methods you might expect to find in most Ruby objects.
+    # For example, `to_s`, `inspect`, `is_a?`, `instance_variable_get`, and so
+    # forth.
+    #
+    # @example
+    #   require "google/cloud/config"
+    #
+    #   config = Google::Cloud::Config.create do |c|
+    #     c.add_field! :opt1, 10
+    #     c.add_field! :opt2, :one, enum: [:one, :two, :three]
+    #     c.add_field! :opt3, "hi", match: [String, Symbol]
+    #     c.add_field! :opt4, "hi", match: /^[a-z]+$/, allow_nil: true
+    #     c.add_config! :sub do |c2|
+    #       c2.add_field! :opt5, false
+    #     end
+    #   end
+    #
+    #   config.opt1             #=> 10
+    #   config.opt1 = 20        #=> 20
+    #   config.opt1             #=> 20
+    #   config.opt1 = "hi"      #=> "hi" (but prints a warning)
+    #   config.opt1 = nil       #=> nil (but prints a warning)
+    #
+    #   config.opt2             #=> :one
+    #   config.opt2 = :two      #=> :two
+    #   config.opt2             #=> :two
+    #   config.opt2 = :four     #=> :four (but prints a warning)
+    #
+    #   config.opt3             #=> "hi"
+    #   config.opt3 = "hiho"    #=> "hiho"
+    #   config.opt3             #=> "hiho"
+    #   config.opt3 = "HI"      #=> "HI" (but prints a warning)
+    #
+    #   config.opt4             #=> "yo"
+    #   config.opt4 = :yo       #=> :yo (Strings and Symbols allowed)
+    #   config.opt4             #=> :yo
+    #   config.opt4 = 3.14      #=> 3.14 (but prints a warning)
+    #   config.opt4 = nil       #=> nil (no warning: nil allowed)
+    #
+    #   config.sub              #=> <Google::Cloud::Config>
+    #
+    #   config.sub.opt5         #=> false
+    #   config.sub.opt5 = true  #=> true  (true and false allowed)
+    #   config.sub.opt5         #=> true
+    #   config.sub.opt5 = nil   #=> nil (but prints a warning)
+    #
+    #   config.opt9 = "hi"      #=> "hi" (warning about unknown key)
+    #   config.opt9             #=> "hi" (no warning: key now known)
+    #   config.sub.opt9         #=> nil (warning about unknown key)
+    #
+    class Config < BasicObject
+      ##
+      # Constructs a Config object. If a block is given, yields `self` to the
+      # block, which makes it convenient to initialize the structure by making
+      # calls to `add_field!` and `add_config!`.
+      #
+      # @param [boolean] show_warnings Whether to print warnings when a
+      #     validation fails. Defaults to `true`.
+      # @return [Config] The constructed Config object.
+      #
+      def self.create show_warnings: true
+        config = new [], show_warnings: show_warnings
+        yield config if block_given?
+        config
+      end
+
+      ##
+      # Determines if the given object is a config. Useful because Config
+      # does not define the `is_a?` method.
+      #
+      # @return [boolean]
+      #
+      def self.config? obj
+        Config.send :===, obj
+      end
+
+      ##
+      # Internal constructor. Generally you should not call `new` directly,
+      # but instead use the `Config.create` method. The initializer is used
+      # directly by a few older clients that expect a legacy interface.
+      #
+      # @private
+      #
+      def initialize legacy_categories = {}, opts = {}
+        @show_warnings = opts.fetch :show_warnings, false
+        @values = {}
+        @defaults = {}
+        @validators = {}
+        add_options legacy_categories
+      end
+
+      ##
+      # Legacy method of adding subconfigs. This is used by older versions of
+      # the stackdriver client libraries but should not be used in new code.
+      #
+      # @deprecated
+      # @private
+      #
+      def add_options legacy_categories
+        [legacy_categories].flatten(1).each do |sub_key|
+          case sub_key
+          when ::Symbol
+            add_config! sub_key, Config.new
+          when ::Hash
+            sub_key.each do |k, v|
+              add_config! k, Config.new(v)
+            end
+          else
+            raise ArgumentError "Category must be a Symbol or Hash"
+          end
+        end
+      end
+
+      ##
+      # Add a value field to this configuration.
+      #
+      # You must provide a key, which becomes the field name in this config.
+      # Field names may comprise only letters, numerals, and underscores, and
+      # must begin with a letter. This will create accessor methods for the
+      # new configuration key.
+      #
+      # You may pass an initial value (which defaults to nil if not provided).
+      #
+      # You may also specify how values are validated. Validation is defined
+      # as follows:
+      #
+      # *   If you provide a block or a `:validator` option, it is used as the
+      #     validator. A proposed value is passed to the proc, which should
+      #     return `true` or `false` to indicate whether the value is valid.
+      # *   If you provide a `:match` option, it is compared to the proposed
+      #     value using the `===` operator. You may, for example, provide a
+      #     class, a regular expression, or a range. If you pass an array,
+      #     the value is accepted if _any_ of the elements match.
+      # *   If you provide an `:enum` option, it should be an `Enumerable`.
+      #     A proposed value is valid if it is included.
+      # *   Otherwise if you do not provide any of the above options, then a
+      #     default validation strategy is inferred from the initial value:
+      #     *   If the initial is `true` or `false`, then either boolean value
+      #         is considered valid. This is the same as `enum: [true, false]`.
+      #     *   If the initial is `nil`, then any object is considered valid.
+      #     *   Otherwise, any object of the same class as the initial value is
+      #         considered valid. This is effectively the same as
+      #         `match: initial.class`.
+      # *   You may also provide the `:allow_nil` option, which, if set to
+      #     true, alters any of the above validators to allow `nil` values.
+      #
+      # In many cases, you may find that the default validation behavior
+      # (interpreted from the initial value) is sufficient. If you want to
+      # accept any value, use `match: Object`.
+      #
+      # @param [String, Symbol] key The name of the option
+      # @param [Object] initial Initial value (defaults to nil)
+      # @param [Hash] opts Validation options
+      #
+      # @return [Config] self for chaining
+      #
+      def add_field! key, initial = nil, opts = {}, &block
+        key = validate_new_key! key
+        opts[:validator] = block if block
+        validator = resolve_validator! initial, opts
+        validate_value! key, validator, initial
+        @values[key] = initial
+        @defaults[key] = initial
+        @validators[key] = validator
+        self
+      end
+
+      ##
+      # Add a subconfiguration field to this configuration.
+      #
+      # You must provide a key, which becomes the method name that you use to
+      # navigate to the subconfig. Names may comprise only letters, numerals,
+      # and underscores, and must begin with a letter.
+      #
+      # If you provide a block, the subconfig object is passed to the block,
+      # so you can easily add fields to the subconfig.
+      #
+      # You may also pass in a config object that already exists. This will
+      # "attach" that configuration in this location.
+      #
+      # @param [String, Symbol] key The name of the subconfig
+      # @param [Config] config A config object to attach here. If not provided,
+      #     creates a new config.
+      #
+      # @return [Config] self for chaining
+      #
+      def add_config! key, config = nil, &block
+        key = validate_new_key! key
+        if config.nil?
+          config = Config.create(&block)
+        elsif block
+          yield config
+        end
+        @values[key] = config
+        @defaults[key] = config
+        @validators[key] = SUBCONFIG
+        self
+      end
+
+      ##
+      # Cause a key to be an alias of another key. The two keys will refer to
+      # the same field.
+      #
+      def add_alias! key, to_key
+        key = validate_new_key! key
+        @values.delete key
+        @defaults.delete key
+        @validators[key] = to_key.to_sym
+        self
+      end
+
+      ##
+      # Restore the original default value of the given key.
+      # If the key is omitted, restore the original defaults for all keys,
+      # and all keys of subconfigs, recursively.
+      #
+      # @param [Symbol, nil] key The key to reset. If omitted or `nil`,
+      #     recursively reset all fields and subconfigs.
+      #
+      def reset! key = nil
+        if key.nil?
+          @values.each_key { |k| reset! k }
+        else
+          key = key.to_sym
+          if @defaults.key? key
+            @values[key] = @defaults[key]
+            @values[key].reset! if @validators[key] == SUBCONFIG
+          elsif @values.key? key
+            warn! "Key #{key.inspect} has not been added, but has a value." \
+                  " Removing the value."
+            @values.delete key
+          else
+            warn! "Key #{key.inspect} does not exist. Nothing to reset."
+          end
+        end
+        self
+      end
+
+      ##
+      # Remove the given key from the configuration, deleting any validation
+      # and value. If the key is omitted, delete all keys. If the key is an
+      # alias, deletes the alias but leaves the original.
+      #
+      # @param [Symbol, nil] key The key to delete. If omitted or `nil`,
+      #     delete all fields and subconfigs.
+      #
+      def delete! key = nil
+        if key.nil?
+          @values.clear
+          @defaults.clear
+          @validators.clear
+        else
+          @values.delete key
+          @defaults.delete key
+          @validators.delete key
+        end
+        self
+      end
+
+      ##
+      # Assign an option with the given name to the given value.
+      #
+      # @param [Symbol, String] key The option name
+      # @param [Object] value The new option value
+      #
+      def []= key, value
+        key = resolve_key! key
+        validate_value! key, @validators[key], value
+        @values[key] = value
+      end
+
+      ##
+      # Get the option or subconfig with the given name.
+      #
+      # @param [Symbol, String] key The option or subconfig name
+      # @return [Object] The option value or subconfig object
+      #
+      def [] key
+        key = resolve_key! key
+        unless @validators.key? key
+          warn! "Key #{key.inspect} does not exist. Returning nil."
+        end
+        value = @values[key]
+        value = value.call if Config::DeferredValue === value
+        value
+      end
+
+      ##
+      # Check if the given key has been set in this object. Returns true if the
+      # key has been added as a normal field, subconfig, or alias, or if it has
+      # not been added explicitly but still has a value.
+      #
+      # @param [Symbol] key The key to check for.
+      # @return [boolean]
+      #
+      def value_set? key
+        @values.key? resolve_key! key
+      end
+      alias option? value_set?
+
+      ##
+      # Check if the given key has been explicitly added as a field name.
+      #
+      # @param [Symbol] key The key to check for.
+      # @return [boolean]
+      #
+      def field? key
+        @validators[key.to_sym].is_a? ::Proc
+      end
+
+      ##
+      # Check if the given key has been explicitly added as a subconfig name.
+      #
+      # @param [Symbol] key The key to check for.
+      # @return [boolean]
+      #
+      def subconfig? key
+        @validators[key.to_sym] == SUBCONFIG
+      end
+
+      ##
+      # Check if the given key has been explicitly added as an alias.
+      # If so, return the target, otherwise return nil.
+      #
+      # @param [Symbol] key The key to check for.
+      # @return [Symbol,nil] The alias target, or nil if not an alias.
+      #
+      def alias? key
+        target = @validators[key.to_sym]
+        target.is_a?(::Symbol) ? target : nil
+      end
+
+      ##
+      # Return a list of explicitly added field names.
+      #
+      # @return [Array<Symbol>] a list of field names as symbols.
+      #
+      def fields!
+        @validators.keys.find_all { |key| @validators[key].is_a? ::Proc }
+      end
+
+      ##
+      # Return a list of explicitly added subconfig names.
+      #
+      # @return [Array<Symbol>] a list of subconfig names as symbols.
+      #
+      def subconfigs!
+        @validators.keys.find_all { |key| @validators[key] == SUBCONFIG }
+      end
+
+      ##
+      # Return a list of alias names.
+      #
+      # @return [Array<Symbol>] a list of alias names as symbols.
+      #
+      def aliases!
+        @validators.keys.find_all { |key| @validators[key].is_a? ::Symbol }
+      end
+
+      ##
+      # Returns a string representation of this configuration state, including
+      # subconfigs. Only explicitly added fields and subconfigs are included.
+      #
+      # @return [String]
+      #
+      def to_s!
+        elems = @validators.keys.map do |k|
+          v = @values[k]
+          vstr = Config.config?(v) ? v.to_s! : value.inspect
+          " #{k}=#{vstr}"
+        end
+        "<Config:#{elems.join}>"
+      end
+
+      ##
+      # Returns a nested hash representation of this configuration state,
+      # including subconfigs. Only explicitly added fields and subconfigs are
+      # included.
+      #
+      # @return [Hash]
+      #
+      def to_h!
+        h = {}
+        @validators.each_key do |k|
+          v = @values[k]
+          h[k] = Config.config?(v) ? v.to_h! : v.inspect
+        end
+        h
+      end
+
+      ##
+      # Search the given environment variable names for valid credential data
+      # that can be passed to `Google::Auth::Credentials.new`.
+      # If a variable contains a valid file path, returns that path as a string.
+      # If a variable contains valid JSON, returns the parsed JSON as a hash.
+      # If no variables contain valid data, returns nil.
+      # @private
+      #
+      def self.credentials_from_env *vars
+        vars.each do |var|
+          data = ::ENV[var]
+          next unless data
+          str = data.strip
+          return str if ::File.file? str
+          json = begin
+            ::JSON.parse str
+          rescue ::StandardError
+            nil
+          end
+          return json if json.is_a? ::Hash
+        end
+        nil
+      end
+
+      ##
+      # @private
+      # Create a configuration value that will be invoked when retrieved.
+      #
+      def self.deferred &block
+        DeferredValue.new(&block)
+      end
+
+      ##
+      # @private
+      # Dynamic methods accessed as keys.
+      #
+      def method_missing name, *args
+        name_str = name.to_s
+        super unless name_str =~ /^[a-zA-Z]\w*=?$/
+        if name_str.chomp! "="
+          self[name_str] = args.first
+        else
+          self[name]
+        end
+      end
+
+      ##
+      # @private
+      # Dynamic methods accessed as keys.
+      #
+      def respond_to_missing? name, include_private
+        return true if value_set? name.to_s.chomp("=")
+        super
+      end
+
+      ##
+      # @private
+      # Implement standard nil check
+      #
+      # @return [false]
+      #
+      def nil?
+        false
+      end
+
+      private
+
+      ##
+      # @private A validator that allows all values
+      #
+      OPEN_VALIDATOR = ::Proc.new { true }
+
+      ##
+      # @private a list of key names that are technically illegal because
+      # they clash with method names.
+      #
+      ILLEGAL_KEYS = %i[
+        add_options
+        initialize
+        instance_eval
+        instance_exec
+        method_missing
+        singleton_method_added
+        singleton_method_removed
+        singleton_method_undefined
+      ].freeze
+
+      ##
+      # @private sentinel indicating a subconfig in the validators hash
+      #
+      SUBCONFIG = ::Object.new
+
+      def resolve_key! key
+        key = key.to_sym
+        alias_target = @validators[key]
+        alias_target.is_a?(::Symbol) ? alias_target : key
+      end
+
+      def validate_new_key! key
+        key_str = key.to_s
+        key = key.to_sym
+        if key_str !~ /^[a-zA-Z]\w*$/ || ILLEGAL_KEYS.include?(key)
+          warn! "Illegal key name: #{key_str.inspect}. Method dispatch will" \
+                " not work for this key."
+        end
+        if @validators.key? key
+          warn! "Key #{key.inspect} already exists. It will be replaced."
+        end
+        key
+      end
+
+      def resolve_validator! initial, opts
+        allow_nil = initial.nil? || opts[:allow_nil]
+        if opts.key? :validator
+          build_proc_validator! opts[:validator], allow_nil
+        elsif opts.key? :match
+          build_match_validator! opts[:match], allow_nil
+        elsif opts.key? :enum
+          build_enum_validator! opts[:enum], allow_nil
+        elsif [true, false].include? initial
+          build_enum_validator! [true, false], allow_nil
+        elsif initial.nil?
+          OPEN_VALIDATOR
+        else
+          klass = Config.config?(initial) ? Config : initial.class
+          build_match_validator! klass, allow_nil
+        end
+      end
+
+      def build_match_validator! matches, allow_nil
+        matches = ::Kernel.Array(matches)
+        matches += [nil] if allow_nil && !matches.include?(nil)
+        ->(val) { matches.any? { |m| m.send :===, val } }
+      end
+
+      def build_enum_validator! allowed, allow_nil
+        allowed = ::Kernel.Array(allowed)
+        allowed += [nil] if allow_nil && !allowed.include?(nil)
+        ->(val) { allowed.include? val }
+      end
+
+      def build_proc_validator! proc, allow_nil
+        ->(val) { proc.call(val) || (allow_nil && val.nil?) }
+      end
+
+      def validate_value! key, validator, value
+        value = value.call if Config::DeferredValue === value
+        case validator
+        when ::Proc
+          unless validator.call value
+            warn! "Invalid value #{value.inspect} for key #{key.inspect}." \
+                  " Setting anyway."
+          end
+        when Config
+          if value != validator
+            warn! "Key #{key.inspect} refers to a subconfig and shouldn't" \
+                  " be changed. Setting anyway."
+          end
+        else
+          warn! "Key #{key.inspect} has not been added. Setting anyway."
+        end
+      end
+
+      def warn! msg
+        return unless @show_warnings
+        location = ::Kernel.caller_locations.find do |s|
+          !s.to_s.include? "/google/cloud/config.rb:"
+        end
+        ::Kernel.warn "#{msg} at #{location}"
+      end
+
+      ##
+      # @private
+      #
+      class DeferredValue
+        def initialize &block
+          @callback = block
+        end
+
+        def call
+          @callback.call
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Core
-      VERSION = "1.1.0"
+      VERSION = "1.2.0".freeze
     end
   end
 end

data/lib/google/cloud/credentials.rb

@@ -1,10 +1,10 @@
-# Copyright 2014 Google Inc. All rights reserved.
+# Copyright 2014 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -33,8 +33,8 @@ module Google
       TOKEN_CREDENTIAL_URI = "https://accounts.google.com/o/oauth2/token"
       AUDIENCE = "https://accounts.google.com/o/oauth2/token"
       SCOPE = []
-      PATH_ENV_VARS = %w(GOOGLE_CLOUD_KEYFILE GCLOUD_KEYFILE)
-      JSON_ENV_VARS = %w(GOOGLE_CLOUD_KEYFILE_JSON GCLOUD_KEYFILE_JSON)
+      PATH_ENV_VARS = %w[GOOGLE_CLOUD_KEYFILE GCLOUD_KEYFILE]
+      JSON_ENV_VARS = %w[GOOGLE_CLOUD_KEYFILE_JSON GCLOUD_KEYFILE_JSON]
       DEFAULT_PATHS = ["~/.config/gcloud/application_default_credentials.json"]
 
       attr_accessor :client
@@ -72,10 +72,9 @@ module Google
         path = ->(p) { ::File.file? p }
 
         # First try to find keyfile file from environment variables.
-        self::PATH_ENV_VARS.map(&env).compact.select(&path)
-          .each do |file|
-            return new file, scope: scope
-          end
+        self::PATH_ENV_VARS.map(&env).compact.select(&path).each do |file|
+          return new file, scope: scope
+        end
         # Second try to find keyfile json from environment variables.
         self::JSON_ENV_VARS.map(&json).compact.each do |hash|
           return new hash, scope: scope
@@ -95,14 +94,14 @@ module Google
       ##
       # Verify that the keyfile argument is provided.
       def verify_keyfile_provided! keyfile
-        fail "You must provide a keyfile to connect with." if keyfile.nil?
+        raise "You must provide a keyfile to connect with." if keyfile.nil?
       end
 
       ##
       # Verify that the keyfile argument is a file.
       def verify_keyfile_exists! keyfile
         exists = ::File.file? keyfile
-        fail "The keyfile '#{keyfile}' is not a valid file." unless exists
+        raise "The keyfile '#{keyfile}' is not a valid file." unless exists
       end
 
       ##

data/lib/google/cloud/errors.rb

@@ -1,10 +1,10 @@
-# Copyright 2015 Google Inc. All rights reserved.
+# Copyright 2015 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -146,18 +146,21 @@ module Google
       def self.grpc_error_class_for grpc_error_code
         # The gRPC status code 0 is for a successful response.
         # So there is no error subclass for a 0 status code, use current class.
-        [self, CanceledError, UnknownError, InvalidArgumentError,
-         DeadlineExceededError, NotFoundError, AlreadyExistsError,
-         PermissionDeniedError, ResourceExhaustedError, FailedPreconditionError,
-         AbortedError, OutOfRangeError, UnimplementedError, InternalError,
-         UnavailableError, DataLossError, UnauthenticatedError
+        [
+          self, CanceledError, UnknownError, InvalidArgumentError,
+          DeadlineExceededError, NotFoundError, AlreadyExistsError,
+          PermissionDeniedError, ResourceExhaustedError,
+          FailedPreconditionError, AbortedError, OutOfRangeError,
+          UnimplementedError, InternalError, UnavailableError, DataLossError,
+          UnauthenticatedError
         ][grpc_error_code] || self
       end
 
       # @private Identify the subclass for a Google API Client error
       def self.gapi_error_class_for http_status_code
         # The http status codes mapped to their error classes.
-        { 400 => InvalidArgumentError, # FailedPreconditionError/OutOfRangeError
+        {
+          400 => InvalidArgumentError, # FailedPreconditionError/OutOfRangeError
           401 => UnauthenticatedError,
           403 => PermissionDeniedError,
           404 => NotFoundError,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-env
@@ -99,16 +99,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +163,7 @@ files:
 - LICENSE
 - README.md
 - lib/google/cloud.rb
+- lib/google/cloud/config.rb
 - lib/google/cloud/core/version.rb
 - lib/google/cloud/credentials.rb
 - lib/google/cloud/errors.rb
@@ -186,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Internal shared library for google-cloud-ruby