google-cloud-core 0.21.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 003b83a4857751484cf66fe91a51631b2c5d4007
-  data.tar.gz: afc142807310926b5fd32e81763155114fb45c06
+  metadata.gz: f3b3286a9a2e4ebe6bf7cfd228acba475b78dc40
+  data.tar.gz: e8d02970e3a8ba6ef1c72a046c0e6c6065f8b75f
 SHA512:
-  metadata.gz: 415e2efaabdce670b3329e46b63bd1d5b40d95f8e0665889e11ac04370d9f3abe4cbc1842f04d6d8a7b469a191da74256cc1265168e8b9e4e98361ab39286cb5
-  data.tar.gz: 17d1c345c85fb27ec2359b0402d70fa7157af307e5853f89095b38b693cd83c2eba5c6e7d24a49631dc20b92733476c530f30b553703207515d09ad7352c2732
+  metadata.gz: 0e43a9d267eff76d96bbb39236ec953ac5d8fee64614bb2d5374f464c3d58d7faf2d94c3ee6b993525fe489532c9f1b3f68c27130e7a69705f8ac58fa0e39066
+  data.tar.gz: 14cf2efe270c65f98e5f668b00abaf58aa54af634a031e654bd84c9b8eae75dbc1155699bce00daf11b2ab614a59567297cf34441aa8942366e41c0462b6f3ac

data/README.md

@@ -2,7 +2,7 @@
 
 This library contains shared types, such as error classes, for the google-cloud project. Please see the top-level project [README](../README.md) for general information.
 
-- [google-cloud-core API documentation](http://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-core/master/google/cloud/errors)
+- [google-cloud-core API documentation](http://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-core/latest)
 
 ## Supported Ruby Versions
 

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Core
-      VERSION = "0.21.1"
+      VERSION = "1.0.0"
     end
   end
 end

data/lib/google/cloud/credentials.rb

@@ -68,12 +68,12 @@ module Google
         path = ->(p) { ::File.file? p }
 
         # First try to find keyfile file from environment variables.
-        self::PATH_ENV_VARS.map(&env).reject(&:nil?).select(&path)
+        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).reject(&:nil?).each do |hash|
+        self::JSON_ENV_VARS.map(&json).compact.each do |hash|
           return new hash, scope: scope
         end
         # Third try to find keyfile file from known file paths.
@@ -111,7 +111,7 @@ module Google
       ##
       # returns a new Hash with string keys instead of symbol keys.
       def stringify_hash_keys hash
-        Hash[hash.map { |(k, v)| [k.to_s, v] }]
+        Hash[hash.map { |k, v| [k.to_s, v] }]
       end
 
       def client_options options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-core
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: googleauth
@@ -25,20 +25,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: google-cloud-env
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +155,14 @@ dependencies:
   name: yard-doctest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
         version: 0.1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
         version: 0.1.8
 description: google-cloud-core is the internal shared library for google-cloud-ruby.
@@ -163,8 +177,6 @@ files:
 - LICENSE
 - README.md
 - lib/google/cloud.rb
-- lib/google/cloud/core/environment.rb
-- lib/google/cloud/core/grpc_utils.rb
 - lib/google/cloud/core/version.rb
 - lib/google/cloud/credentials.rb
 - lib/google/cloud/errors.rb
@@ -188,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Internal shared library for google-cloud-ruby

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

@@ -1,149 +0,0 @@
-# Copyright 2015 Google Inc. All rights reserved.
-#
-# 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
-#
-# 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.
-
-
-require "faraday"
-
-module Google
-  module Cloud
-    module Core
-      ##
-      # @private
-      # Represents the Google Cloud Platform environments.
-      module Environment
-        CHECK_URI = "http://169.254.169.254"
-        PROJECT_URI = "#{CHECK_URI}/computeMetadata/v1/project"
-        INSTANCE_METADATA_URI = "#{CHECK_URI}/computeMetadata/v1/instance"
-
-        ##
-        # Check if running from a gce vm, which actually hosts GCE, GKE, and
-        # GAE environments.
-        def self.gce_vm? connection: nil
-          @metadata ||= {}
-          return @metadata[:gce_vm] if @metadata.key? :gce_vm
-
-          conn = connection || Faraday.default_connection
-          resp = conn.get CHECK_URI do |req|
-            req.options.timeout = 0.1
-          end
-          @metadata[:gce_vm] = if resp.status != 200 ||
-                                  !resp.headers.key?("Metadata-Flavor")
-                                 false
-                               else
-                                 resp.headers["Metadata-Flavor"] == "Google"
-                               end
-        rescue Faraday::TimeoutError, Faraday::ConnectionFailed
-          @metadata ||= {}
-          @metadata[:gce_vm] = false
-        end
-
-        ##
-        # Check if running from Google Compute Engine, and not using GAE or GKE
-        #
-        # @return [Boolean] True if running from GCE and not GAE or GKE
-        def self.gce?
-          gce_vm? && !gae? && !gke?
-        end
-
-        ##
-        # Check if running from Google Container Engine by querying for
-        # GKE cluster name and VM instance_zone
-        #
-        # @return [Boolean] True if self.gke_cluster_name() and
-        # self.instance_zone() both return true values
-        def self.gke?
-          gke_cluster_name && instance_zone
-        end
-
-        ##
-        # Check if running from Google App Engine by checking existance of
-        # GAE_VM, GAE_MODULE_NAME, GAE_MODULE_VERSION environment variables.
-        #
-        # @return [Boolean] True if all three GAE environment variables are
-        #   defined
-        def self.gae?
-          # TODO: Remove ENV["GAE_VM"] when GAE Flex goes GA
-          (ENV["GAE_VM"] || ENV["GAE_INSTANCE"]) &&
-            gae_module_id && gae_module_version
-        end
-
-        def self.project_id
-          uri = "#{PROJECT_URI}/project-id"
-          get_metadata_attribute uri, :project_id
-        end
-
-        ##
-        # Retrieve GAE module name
-        def self.gae_module_id
-          # TODO: Remove ENV["GAE_MODULE_NAME"] when GAE Flex goes GA
-          ENV["GAE_MODULE_NAME"] || ENV["GAE_SERVICE"]
-        end
-
-        ##
-        # Retrieve GAE module version
-        def self.gae_module_version
-          # TODO: Remove ENV["GAE_MODULE_VERSION"] when GAE Flex goes GA
-          ENV["GAE_MODULE_VERSION"] || ENV["GAE_VERSION"]
-        end
-
-        ##
-        # Retrieve GKE cluster name
-        def self.gke_cluster_name
-          uri = "#{INSTANCE_METADATA_URI}/attributes/cluster-name"
-          get_metadata_attribute uri, :cluster_name
-        end
-
-        ##
-        # Retrieve GKE namespace id
-        def self.gke_namespace_id
-          ENV["GKE_NAMESPACE_ID"]
-        end
-
-        ##
-        # Retrieve GCE VM zone
-        def self.instance_zone
-          uri = "#{INSTANCE_METADATA_URI}/zone"
-          full_zone = get_metadata_attribute uri, :zone
-          full_zone.nil? ? nil : full_zone.split(%r{/}).last
-        end
-
-        ##
-        # Retrieve GCE VM instance_id
-        def self.instance_id
-          uri = "#{INSTANCE_METADATA_URI}/id"
-          get_metadata_attribute uri, :instance_id
-        end
-
-        ##
-        # Helper method to send HTTP request to GCP metadata service and
-        # retrieve environment information
-        def self.get_metadata_attribute uri, attr_name, connection: nil
-          @metadata ||= {}
-          return @metadata[attr_name] if @metadata.key? attr_name
-
-          conn = connection || Faraday.default_connection
-          conn.headers = { "Metadata-Flavor" => "Google" }
-          resp = conn.get uri do |req|
-            req.options.timeout = 0.1
-          end
-
-          @metadata[attr_name] = resp.status == 200 ? resp.body : nil
-        rescue Faraday::TimeoutError, Faraday::ConnectionFailed
-          @metadata ||= {}
-          @metadata[attr_name] = nil
-        end
-      end
-    end
-  end
-end

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

@@ -1,91 +0,0 @@
-# Copyright 2016 Google Inc. All rights reserved.
-#
-# 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
-#
-# 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.
-
-
-require "google/cloud"
-require "google/protobuf/struct_pb"
-
-module Google
-  module Cloud
-    module Core
-      ##
-      # @private Conversion to/from GRPC objects.
-      module GRPCUtils
-        ##
-        # @private Convert a Hash to a Google::Protobuf::Struct.
-        def self.hash_to_struct hash
-          # TODO: ArgumentError if hash is not a Hash
-          Google::Protobuf::Struct.new fields:
-            Hash[hash.map { |k, v| [String(k), object_to_value(v)] }]
-        end
-
-        ##
-        # @private Convert a Google::Protobuf::Struct to a Hash.
-        def self.struct_to_hash struct
-          # TODO: ArgumentError if struct is not a Google::Protobuf::Struct
-          Hash[struct.fields.map { |k, v| [k, value_to_object(v)] }]
-        end
-
-        ##
-        # @private Convert a Google::Protobuf::Value to an Object.
-        def self.value_to_object value
-          # TODO: ArgumentError if struct is not a Google::Protobuf::Value
-          if value.null_value
-            nil
-          elsif value.number_value
-            value.number_value
-          elsif value.struct_value
-            struct_to_hash value.struct_value
-          elsif value.list_value
-            value.list_value.values.map { |v| value_to_object(v) }
-          elsif !value.bool_value.nil? # Make sure its a bool, not nil
-            value.bool_value
-          else
-            nil # just in case
-          end
-        end
-
-        ##
-        # @private Convert an Object to a Google::Protobuf::Value.
-        def self.object_to_value obj
-          case obj
-          when String then Google::Protobuf::Value.new string_value: obj
-          when Array then Google::Protobuf::ListValue.new(values:
-            obj.map { |o| object_to_value(o) })
-          when Hash then Google::Protobuf::Value.new struct_value:
-            hash_to_struct(obj)
-          when Numeric then Google::Protobuf::Value.new number_value: obj
-          when TrueClass then Google::Protobuf::Value.new bool_value: true
-          when FalseClass then Google::Protobuf::Value.new bool_value: false
-          when NilClass then Google::Protobuf::Value.new null_value: :NULL_VALUE
-          else
-            # We could raise ArgumentError here, or we could convert to a string
-            Google::Protobuf::Value.new string_value: obj.to_s
-          end
-        end
-
-        ##
-        # @private Convert a Google::Protobuf::Map to a Hash
-        def self.map_to_hash map
-          if map.respond_to? :to_h
-            map.to_h
-          else
-            # Enumerable doesn't have to_h on ruby 2.0...
-            Hash[map.to_a]
-          end
-        end
-      end
-    end
-  end
-end