gcloud 0.2.0 → 0.3.0

data/lib/gcloud/credentials.rb

@@ -29,8 +29,8 @@ module Gcloud
     TOKEN_CREDENTIAL_URI = "https://accounts.google.com/o/oauth2/token"
     AUDIENCE = "https://accounts.google.com/o/oauth2/token"
     SCOPE = []
-    PATH_ENV_VARS = ["GOOGLE_CLOUD_KEYFILE"]
-    JSON_ENV_VARS = ["GOOGLE_CLOUD_KEYFILE_JSON"]
+    PATH_ENV_VARS = %w(GCLOUD_KEYFILE GOOGLE_CLOUD_KEYFILE)
+    JSON_ENV_VARS = %w(GCLOUD_KEYFILE_JSON GOOGLE_CLOUD_KEYFILE_JSON)
     DEFAULT_PATHS = ["~/.config/gcloud/application_default_credentials.json"]
 
     attr_accessor :client
@@ -133,7 +133,7 @@ module Gcloud
       # client options for initializing signet client
       { token_credential_uri: options["token_credential_uri"],
         audience: options["audience"],
-        scope: options["scope"],
+        scope: Array(options["scope"]),
         issuer: options["client_email"],
         signing_key: OpenSSL::PKey::RSA.new(options["private_key"]) }
     end

data/lib/gcloud/datastore.rb

@@ -33,6 +33,18 @@ module Gcloud
   # +keyfile+::
   #   Keyfile downloaded from Google Cloud. If file path the file must be
   #   readable. (+String+ or +Hash+)
+  # +options+::
+  #   An optional Hash for controlling additional behavior. (+Hash+)
+  # <code>options[:scope]</code>::
+  #   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
+  #   APIs}[https://developers.google.com/identity/protocols/OAuth2]. (+String+
+  #   or +Array+)
+  #
+  #   The default scopes are:
+  #
+  #   * +https://www.googleapis.com/auth/datastore+
+  #   * +https://www.googleapis.com/auth/userinfo.email+
   #
   # === Returns
   #
@@ -52,12 +64,12 @@ module Gcloud
   #
   #   dataset.save entity
   #
-  def self.datastore project = nil, keyfile = nil
+  def self.datastore project = nil, keyfile = nil, options = {}
     project ||= Gcloud::Datastore::Dataset.default_project
     if keyfile.nil?
-      credentials = Gcloud::Datastore::Credentials.default
+      credentials = Gcloud::Datastore::Credentials.default options
     else
-      credentials = Gcloud::Datastore::Credentials.new keyfile
+      credentials = Gcloud::Datastore::Credentials.new keyfile, options
     end
     Gcloud::Datastore::Dataset.new project, credentials
   end

data/lib/gcloud/datastore/credentials.rb

@@ -26,8 +26,9 @@ module Gcloud
     class Credentials < Gcloud::Credentials #:nodoc:
       SCOPE = ["https://www.googleapis.com/auth/datastore",
                "https://www.googleapis.com/auth/userinfo.email"]
-      PATH_ENV_VARS = %w(DATASTORE_KEYFILE GOOGLE_CLOUD_KEYFILE)
-      JSON_ENV_VARS = %w(DATASTORE_KEYFILE_JSON GOOGLE_CLOUD_KEYFILE_JSON)
+      PATH_ENV_VARS = %w(DATASTORE_KEYFILE GCLOUD_KEYFILE GOOGLE_CLOUD_KEYFILE)
+      JSON_ENV_VARS = %w(DATASTORE_KEYFILE_JSON GCLOUD_KEYFILE_JSON
+                         GOOGLE_CLOUD_KEYFILE_JSON)
 
       ##
       # Sign OAuth 2.0 API calls.

data/lib/gcloud/datastore/dataset.rb

@@ -52,6 +52,8 @@ module Gcloud
       #
       # See Gcloud#datastore
       def initialize project, credentials #:nodoc:
+        project = project.to_s # Always cast to a string
+        fail ArgumentError, "project is missing" if project.empty?
         @connection = Connection.new project, credentials
       end
 
@@ -75,7 +77,9 @@ module Gcloud
       ##
       # Default project.
       def self.default_project #:nodoc:
-        ENV["DATASTORE_PROJECT"] || ENV["GOOGLE_CLOUD_PROJECT"]
+        ENV["DATASTORE_PROJECT"] ||
+          ENV["GCLOUD_PROJECT"] ||
+          ENV["GOOGLE_CLOUD_PROJECT"]
       end
 
       ##

data/lib/gcloud/datastore/transaction.rb

@@ -102,7 +102,7 @@ module Gcloud
       # Transaction#start must be called afterwards.
       def reset!
         @shared_mutation = nil
-        @id  = nil
+        @id = nil
         @_auto_id_entities = []
       end
 

data/lib/gcloud/pubsub.rb

@@ -31,6 +31,17 @@ module Gcloud
   # +keyfile+::
   #   Keyfile downloaded from Google Cloud. If file path the file must be
   #   readable. (+String+ or +Hash+)
+  # +options+::
+  #   An optional Hash for controlling additional behavior. (+Hash+)
+  # <code>options[:scope]</code>::
+  #   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
+  #   APIs}[https://developers.google.com/identity/protocols/OAuth2]. (+String+
+  #   or +Array+)
+  #
+  #   The default scope is:
+  #
+  #   * +https://www.googleapis.com/auth/pubsub+
   #
   # === Returns
   #
@@ -45,12 +56,12 @@ module Gcloud
   #   topic = pubsub.topic "my-topic"
   #   topic.publish "task completed"
   #
-  def self.pubsub project = nil, keyfile = nil
+  def self.pubsub project = nil, keyfile = nil, options = {}
     project ||= Gcloud::Pubsub::Project.default_project
     if keyfile.nil?
-      credentials = Gcloud::Pubsub::Credentials.default
+      credentials = Gcloud::Pubsub::Credentials.default options
     else
-      credentials = Gcloud::Pubsub::Credentials.new keyfile
+      credentials = Gcloud::Pubsub::Credentials.new keyfile, options
     end
     Gcloud::Pubsub::Project.new project, credentials
   end

data/lib/gcloud/pubsub/credentials.rb

@@ -20,10 +20,10 @@ module Gcloud
     ##
     # Represents the OAuth 2.0 signing logic for Pub/Sub.
     class Credentials < Gcloud::Credentials #:nodoc:
-      SCOPE = ["https://www.googleapis.com/auth/pubsub",
-               "https://www.googleapis.com/auth/cloud-platform"]
-      PATH_ENV_VARS = %w(PUBSUB_KEYFILE GOOGLE_CLOUD_KEYFILE)
-      JSON_ENV_VARS = %w(PUBSUB_KEYFILE_JSON GOOGLE_CLOUD_KEYFILE_JSON)
+      SCOPE = ["https://www.googleapis.com/auth/pubsub"]
+      PATH_ENV_VARS = %w(PUBSUB_KEYFILE GCLOUD_KEYFILE GOOGLE_CLOUD_KEYFILE)
+      JSON_ENV_VARS = %w(PUBSUB_KEYFILE_JSON GCLOUD_KEYFILE_JSON
+                         GOOGLE_CLOUD_KEYFILE_JSON)
     end
   end
 end

data/lib/gcloud/pubsub/project.rb

@@ -47,6 +47,8 @@ module Gcloud
       ##
       # Creates a new Connection instance.
       def initialize project, credentials #:nodoc:
+        project = project.to_s # Always cast to a string
+        fail ArgumentError, "project is missing" if project.empty?
         @connection = Connection.new project, credentials
       end
 
@@ -69,7 +71,9 @@ module Gcloud
       ##
       # Default project.
       def self.default_project #:nodoc:
-        ENV["PUBSUB_PROJECT"] || ENV["GOOGLE_CLOUD_PROJECT"]
+        ENV["PUBSUB_PROJECT"] ||
+          ENV["GCLOUD_PROJECT"] ||
+          ENV["GOOGLE_CLOUD_PROJECT"]
       end
 
       ##

data/lib/gcloud/pubsub/topic.rb

@@ -512,6 +512,9 @@ module Gcloud
         @gapi.nil?
       end
 
+      # rubocop:disable Style/TrivialAccessors
+      # Disabled rubocop because you can't use "?" in an attr.
+
       ##
       # Determines whether the lazy topic object should create a topic on the
       # Pub/Sub service.
@@ -530,6 +533,8 @@ module Gcloud
         @autocreate
       end
 
+      # rubocop:enable Style/TrivialAccessors
+
       ##
       # New Topic from a Google API Client object.
       def self.from_gapi gapi, conn #:nodoc:

data/lib/gcloud/storage.rb

@@ -31,6 +31,17 @@ module Gcloud
   # +keyfile+::
   #   Keyfile downloaded from Google Cloud. If file path the file must be
   #   readable. (+String+ or +Hash+)
+  # +options+::
+  #   An optional Hash for controlling additional behavior. (+Hash+)
+  # <code>options[:scope]</code>::
+  #   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
+  #   APIs}[https://developers.google.com/identity/protocols/OAuth2]. (+String+
+  #   or +Array+)
+  #
+  #   The default scope is:
+  #
+  #   * +https://www.googleapis.com/auth/devstorage.full_control+
   #
   # === Returns
   #
@@ -46,12 +57,12 @@ module Gcloud
   #   bucket = storage.bucket "my-bucket"
   #   file = bucket.file "path/to/my-file.ext"
   #
-  def self.storage project = nil, keyfile = nil
+  def self.storage project = nil, keyfile = nil, options = {}
     project ||= Gcloud::Storage::Project.default_project
     if keyfile.nil?
-      credentials = Gcloud::Storage::Credentials.default
+      credentials = Gcloud::Storage::Credentials.default options
     else
-      credentials = Gcloud::Storage::Credentials.new keyfile
+      credentials = Gcloud::Storage::Credentials.new keyfile, options
     end
     Gcloud::Storage::Project.new project, credentials
   end
@@ -338,26 +349,5 @@ module Gcloud
   #   file.acl.public!
   #
   module Storage
-    ##
-    # Retrieve resumable threshold.
-    # If uploads are larger in size than this value then
-    # resumable uploads are used.
-    #
-    # The default value is 5 MiB (5,000,000 bytes).
-    def self.resumable_threshold
-      @@resumable_threshold
-    end
-
-    ##
-    # Sets a new resumable threshold value.
-    def self.resumable_threshold= new_resumable_threshold
-      # rubocop:disable Style/ClassVars
-      # Disabled rubocop because this is the best option.
-      @@resumable_threshold = new_resumable_threshold.to_i
-      # rubocop:enable Style/ClassVars
-    end
-
-    # Set the default threshold to 5 MiB.
-    self.resumable_threshold = 5_000_000
   end
 end

data/lib/gcloud/storage/bucket.rb

@@ -16,6 +16,7 @@
 require "gcloud/storage/bucket/acl"
 require "gcloud/storage/bucket/list"
 require "gcloud/storage/file"
+require "gcloud/upload"
 
 module Gcloud
   module Storage
@@ -325,9 +326,7 @@ module Gcloud
       #
       def create_file file, path = nil, options = {}
         ensure_connection!
-        # TODO: Raise if file doesn't exist
-        # ensure_file_exists!
-        fail unless ::File.file? file
+        ensure_file_exists! file
 
         options[:acl] = File::Acl.predefined_rule_for options[:acl]
 
@@ -465,10 +464,17 @@ module Gcloud
         fail "Must have active connection" unless connection
       end
 
+      ##
+      # Raise an error if the file is not found.
+      def ensure_file_exists! file
+        return if ::File.file? file
+        fail ArgumentError, "cannot find file #{file}"
+      end
+
       ##
       # Determines if a resumable upload should be used.
       def resumable_upload? file #:nodoc:
-        ::File.size?(file).to_i > Storage.resumable_threshold
+        ::File.size?(file).to_i > Upload.resumable_threshold
       end
 
       def upload_multipart file, path, options = {}

data/lib/gcloud/storage/credentials.rb

@@ -21,8 +21,9 @@ module Gcloud
     # Represents the OAuth 2.0 signing logic for Storage.
     class Credentials < Gcloud::Credentials #:nodoc:
       SCOPE = ["https://www.googleapis.com/auth/devstorage.full_control"]
-      PATH_ENV_VARS = %w(STORAGE_KEYFILE GOOGLE_CLOUD_KEYFILE)
-      JSON_ENV_VARS = %w(STORAGE_KEYFILE_JSON GOOGLE_CLOUD_KEYFILE_JSON)
+      PATH_ENV_VARS = %w(STORAGE_KEYFILE GCLOUD_KEYFILE GOOGLE_CLOUD_KEYFILE)
+      JSON_ENV_VARS = %w(STORAGE_KEYFILE_JSON GCLOUD_KEYFILE_JSON
+                         GOOGLE_CLOUD_KEYFILE_JSON)
     end
   end
 end

data/lib/gcloud/storage/file.rb

@@ -463,6 +463,13 @@ module Gcloud
         @acl ||= File::Acl.new self
       end
 
+      ##
+      # URI of the location and file name in the format of
+      # <code>gs://my-bucket/file-name.json</code>.
+      def to_gs_url #:nodoc:
+        "gs://#{bucket}/#{name}"
+      end
+
       ##
       # New File from a Google API Client object.
       def self.from_gapi gapi, conn #:nodoc:
@@ -561,7 +568,7 @@ module Gcloud
         end
 
         def generate_signed_url issuer, signed_string, expires
-          signature = Base64.encode64(signed_string).gsub("\n", "")
+          signature = Base64.encode64(signed_string).delete("\n")
           "#{ext_url}?GoogleAccessId=#{CGI.escape issuer}" \
                     "&Expires=#{expires}" \
                     "&Signature=#{CGI.escape signature}"

data/lib/gcloud/storage/project.rb

@@ -52,6 +52,8 @@ module Gcloud
       #
       # See Gcloud#storage
       def initialize project, credentials #:nodoc:
+        project = project.to_s # Always cast to a string
+        fail ArgumentError, "project is missing" if project.empty?
         @connection = Connection.new project, credentials
       end
 
@@ -75,7 +77,9 @@ module Gcloud
       ##
       # Default project.
       def self.default_project #:nodoc:
-        ENV["STORAGE_PROJECT"] || ENV["GOOGLE_CLOUD_PROJECT"]
+        ENV["STORAGE_PROJECT"] ||
+          ENV["GCLOUD_PROJECT"] ||
+          ENV["GOOGLE_CLOUD_PROJECT"]
       end
 
       ##

data/lib/gcloud/upload.rb

@@ -0,0 +1,54 @@
+#--
+# Copyright 2014 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 "gcloud"
+
+#--
+# Google Cloud Upload
+module Gcloud
+  ##
+  # = Upload Settings
+  #
+  # Upload allows users to configure how files are uploaded to the Google Cloud
+  # Service APIs.
+  #
+  #   require "gcloud/upload"
+  #
+  #   # Set the default threshold to 10 MiB.
+  #   Gcloud::Upload.resumable_threshold = 10_000_000
+  module Upload
+    ##
+    # Retrieve resumable threshold.
+    # If uploads are larger in size than this value then
+    # resumable uploads are used.
+    #
+    # The default value is 5 MiB (5,000,000 bytes).
+    def self.resumable_threshold
+      @@resumable_threshold
+    end
+
+    ##
+    # Sets a new resumable threshold value.
+    def self.resumable_threshold= new_resumable_threshold
+      # rubocop:disable Style/ClassVars
+      # Disabled rubocop because this is the best option.
+      @@resumable_threshold = new_resumable_threshold.to_i
+      # rubocop:enable Style/ClassVars
+    end
+
+    # Set the default threshold to 5 MiB.
+    self.resumable_threshold = 5_000_000
+  end
+end

data/lib/gcloud/version.rb

@@ -16,5 +16,5 @@
 #--
 # Google Cloud Version
 module Gcloud
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcloud
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Silvano Luciani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -81,6 +81,62 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5.7'
+- !ruby/object:Gem::Dependency
+  name: minitest-autotest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-focus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: minitest-rg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: autotest-suffix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +223,25 @@ files:
 - OVERVIEW.md
 - lib/gcloud.rb
 - lib/gcloud/backoff.rb
+- lib/gcloud/bigquery.rb
+- lib/gcloud/bigquery/connection.rb
+- lib/gcloud/bigquery/copy_job.rb
+- lib/gcloud/bigquery/credentials.rb
+- lib/gcloud/bigquery/data.rb
+- lib/gcloud/bigquery/dataset.rb
+- lib/gcloud/bigquery/dataset/list.rb
+- lib/gcloud/bigquery/errors.rb
+- lib/gcloud/bigquery/extract_job.rb
+- lib/gcloud/bigquery/insert_response.rb
+- lib/gcloud/bigquery/job.rb
+- lib/gcloud/bigquery/job/list.rb
+- lib/gcloud/bigquery/load_job.rb
+- lib/gcloud/bigquery/project.rb
+- lib/gcloud/bigquery/query_data.rb
+- lib/gcloud/bigquery/query_job.rb
+- lib/gcloud/bigquery/table.rb
+- lib/gcloud/bigquery/table/list.rb
+- lib/gcloud/bigquery/view.rb
 - lib/gcloud/credentials.rb
 - lib/gcloud/datastore.rb
 - lib/gcloud/datastore/connection.rb
@@ -205,6 +280,7 @@ files:
 - lib/gcloud/storage/file/list.rb
 - lib/gcloud/storage/file/verifier.rb
 - lib/gcloud/storage/project.rb
+- lib/gcloud/upload.rb
 - lib/gcloud/version.rb
 homepage: http://googlecloudplatform.github.io/gcloud-ruby/
 licenses: