fog-google 0.3.2 → 0.4.0

data/lib/fog/storage/google_xml/requests/put_bucket.rb

@@ -8,7 +8,7 @@ module Fog
         # * bucket_name<~String> - name of bucket to create
         # * options<~Hash> - config arguments for bucket.  Defaults to {}.
         #   * 'LocationConstraint'<~Symbol> - sets the location for the bucket
-        #   * 'x-amz-acl'<~String> - Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
+        #   * 'x-goog-acl'<~String> - The predefined access control list (ACL) that you want to apply to the bucket.
         #
         # ==== Returns
         # * response<~Excon::Response>:

data/tasks/console.rake

@@ -3,10 +3,8 @@
 
 desc "Project IRB console"
 task :console do
-  require "irb"
-  require "irb/completion"
-  require "fog/google"
-  Fog.credential = :test
+  require "bundler"
+  Bundler.require(:default, :development)
   ARGV.clear
-  IRB.start
+  Pry.start
 end

data/test/integration/compute/test_servers.rb

@@ -14,7 +14,7 @@ class TestServers < FogIntegrationTest
     instance = @subject.bootstrap(:name => resource_name)
     assert instance.ready?
     instance.wait_for { sshable? }
-    assert_match /Linux/, instance.ssh("uname").first.stdout
+    assert_match(/Linux/, instance.ssh("uname").first.stdout)
     assert_equal instance.destroy.operation_type, "delete"
     Fog.wait_for { !@subject.all.map(&:identity).include? instance.identity }
     # XXX clean up after bootstrap's automatic creation of disks

data/test/integration/factories/backend_services_factory.rb

@@ -13,7 +13,7 @@ class BackendServicesFactory < CollectionFactory
   end
 
   def params
-    params = { :name => resource_name,
-               :health_checks => [@http_health_checks.create.self_link] }
+    { :name => resource_name,
+      :health_checks => [@http_health_checks.create.self_link] }
   end
 end

data/test/integration/factories/forwarding_rules_factory.rb

@@ -13,8 +13,8 @@ class ForwardingRulesFactory < CollectionFactory
   end
 
   def params
-    params = { :name => resource_name,
-               :region => TEST_REGION,
-               :target => @target_pools.create.self_link }
+    { :name => resource_name,
+      :region => TEST_REGION,
+      :target => @target_pools.create.self_link }
   end
 end

data/test/integration/factories/global_forwarding_rules_factory.rb

@@ -13,7 +13,7 @@ class GlobalForwardingRulesFactory < CollectionFactory
   end
 
   def params
-    params = { :name => resource_name,
-               :target => @targets.create.self_link }
+    { :name => resource_name,
+      :target => @targets.create.self_link }
   end
 end

data/test/integration/factories/images_factory.rb

@@ -6,7 +6,7 @@ class ImagesFactory < CollectionFactory
   end
 
   def params
-    params = { :name => resource_name,
-               :raw_disk => { :source => TEST_RAW_DISK_SOURCE } }
+    { :name => resource_name,
+      :raw_disk => { :source => TEST_RAW_DISK_SOURCE } }
   end
 end

data/test/integration/factories/servers_factory.rb

@@ -13,9 +13,9 @@ class ServersFactory < CollectionFactory
   end
 
   def params
-    params = { :name => resource_name,
-               :zone_name => TEST_ZONE,
-               :machine_type => TEST_MACHINE_TYPE,
-               :disks => [@disks.create] }
+    { :name => resource_name,
+      :zone_name => TEST_ZONE,
+      :machine_type => TEST_MACHINE_TYPE,
+      :disks => [@disks.create] }
   end
 end

data/test/integration/factories/target_http_proxies_factory.rb

@@ -13,7 +13,7 @@ class TargetHttpProxiesFactory < CollectionFactory
   end
 
   def params
-    params = { :name => resource_name,
-               :url_map => @url_maps.create.self_link }
+    { :name => resource_name,
+      :url_map => @url_maps.create.self_link }
   end
 end

data/test/integration/factories/target_pools_factory.rb

@@ -16,9 +16,9 @@ class TargetPoolsFactory < CollectionFactory
   end
 
   def params
-    params = { :name => resource_name,
-               :region => TEST_REGION,
-               :instances => [@servers.create.self_link],
-               :healthChecks => [@http_health_checks.create.self_link] }
+    { :name => resource_name,
+      :region => TEST_REGION,
+      :instances => [@servers.create.self_link],
+      :healthChecks => [@http_health_checks.create.self_link] }
   end
 end

data/test/integration/factories/url_maps_factory.rb

@@ -13,7 +13,7 @@ class UrlMapsFactory < CollectionFactory
   end
 
   def params
-    params = { :name => resource_name,
-               :default_service => @backend_services.create.self_link }
+    { :name => resource_name,
+      :default_service => @backend_services.create.self_link }
   end
 end

data/test/integration/storage/test_buckets.rb

@@ -2,7 +2,6 @@ require "helpers/integration_test_helper"
 
 class TestBuckets < FogIntegrationTest
   begin
-    client_email = Fog.credentials[:google_client_email]
     @@connection = Fog::Storage::Google.new
     @@connection.delete_bucket("fog-smoke-test")
   rescue Exception => e
@@ -24,7 +23,7 @@ class TestBuckets < FogIntegrationTest
   end
 
   def test_put_bucket_acl
-    response = @connection.put_bucket("fog-smoke-test", options = { "x-goog-acl" => "publicReadWrite" })
+    response = @connection.put_bucket("fog-smoke-test", options: { "x-goog-acl" => "publicReadWrite" })
     assert_equal response.status, 200
     acl = { :entity => "domain-google.com",
             :role => "READER" }
@@ -48,7 +47,7 @@ class TestBuckets < FogIntegrationTest
 
   def test_get_bucket_acl
     response = @connection.put_bucket("fog-smoke-test",
-                                      options = { "acl" => [{ :entity => "user-fake@developer.gserviceaccount.com", :role => "OWNER" }] })
+                                      options: { "acl" => [{ :entity => "user-fake@developer.gserviceaccount.com", :role => "OWNER" }] })
     assert_equal response.status, 200
     response = @connection.get_bucket_acl("fog-smoke-test")
     assert_equal response.status, 200

data/test/integration/storage/test_directories.rb

@@ -4,7 +4,7 @@ class TestDirectories < FogIntegrationTest
   begin
     client_email = Fog.credentials[:google_client_email]
     @@connection = Fog::Storage::Google.new
-    @@connection.put_bucket("fog-smoke-test", options = { "acl" => [{ :entity => "user-" + client_email, :role => "OWNER" }] })
+    @@connection.put_bucket("fog-smoke-test", options: { "acl" => [{ :entity => "user-" + client_email, :role => "OWNER" }] })
     @@connection.put_bucket_acl("fog-smoke-test", :entity => "allUsers", :role => "READER")
     @@directory = @@connection.directories.get("fog-smoke-test")
   rescue Exception => e
@@ -42,8 +42,8 @@ class TestDirectories < FogIntegrationTest
 
   def test_public_url
     public_url = @directory.public_url
-    assert_match /storage\.googleapis\.com/, public_url
-    assert_match /fog-smoke-test/, public_url
+    assert_match(/storage\.googleapis\.com/, public_url)
+    assert_match(/fog-smoke-test/, public_url)
   end
 
   def test_public

data/test/integration/storage/test_objects.rb

@@ -5,7 +5,7 @@ class TestObjects < FogIntegrationTest
     @connection = Fog::Storage::Google.new
 
     begin
-      @connection.put_bucket("fog-smoke-test", options = { "x-goog-acl" => "publicReadWrite" })
+      @connection.put_bucket("fog-smoke-test", options: { "x-goog-acl" => "publicReadWrite" })
     rescue
     end
   end
@@ -85,12 +85,12 @@ class TestObjects < FogIntegrationTest
 
   def test_get_object_https_url
     skip
-    response = @connection.put_object("fog-smoke-test", "my file", "THISISATESTFILE", options = { :predefinedAcl => "publicRead" })
+    response = @connection.put_object("fog-smoke-test", "my file", "THISISATESTFILE", options: { :predefinedAcl => "publicRead" })
     assert_equal response.status, 200
     https_url = @connection.get_object_https_url("fog-smoke-test", "my file")
-    assert_match /https/, https_url
-    assert_match /fog-smoke-test/, https_url
-    assert_match /my%20file/, https_url
+    assert_match(/https/, https_url)
+    assert_match(/fog-smoke-test/, https_url)
+    assert_match(/my%20file/, https_url)
   end
 
   def test_get_object_url
@@ -101,10 +101,6 @@ class TestObjects < FogIntegrationTest
     assert_equal https_url, "https://www.googleapis.com/storage/v1/b/fog-smoke-test/o/my%20file"
   end
 
-  def test_get_object_torrent
-    skip
-  end
-
   def test_head_object
     skip
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Nat Welch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -300,7 +300,7 @@ files:
 - lib/fog/compute/google/models/zones.rb
 - lib/fog/compute/google/real.rb
 - lib/fog/compute/google/requests/add_backend_service_backends.rb
-- lib/fog/compute/google/requests/add_instance_group_instance.rb
+- lib/fog/compute/google/requests/add_instance_group_instances.rb
 - lib/fog/compute/google/requests/add_region_view_resources.rb
 - lib/fog/compute/google/requests/add_server_access_config.rb
 - lib/fog/compute/google/requests/add_target_pool_health_checks.rb
@@ -346,6 +346,7 @@ files:
 - lib/fog/compute/google/requests/get_global_operation.rb
 - lib/fog/compute/google/requests/get_http_health_check.rb
 - lib/fog/compute/google/requests/get_image.rb
+- lib/fog/compute/google/requests/get_image_from_family.rb
 - lib/fog/compute/google/requests/get_instance_group.rb
 - lib/fog/compute/google/requests/get_machine_type.rb
 - lib/fog/compute/google/requests/get_network.rb
@@ -424,7 +425,7 @@ files:
 - lib/fog/compute/google/requests/list_zone_view_resources.rb
 - lib/fog/compute/google/requests/list_zone_views.rb
 - lib/fog/compute/google/requests/list_zones.rb
-- lib/fog/compute/google/requests/remove_instance_group_instance.rb
+- lib/fog/compute/google/requests/remove_instance_group_instances.rb
 - lib/fog/compute/google/requests/remove_target_pool_health_checks.rb
 - lib/fog/compute/google/requests/remove_target_pool_instance.rb
 - lib/fog/compute/google/requests/remove_target_pool_instances.rb
@@ -559,10 +560,9 @@ files:
 - lib/fog/storage/google_json/requests/get_object_acl.rb
 - lib/fog/storage/google_json/requests/get_object_http_url.rb
 - lib/fog/storage/google_json/requests/get_object_https_url.rb
-- lib/fog/storage/google_json/requests/get_object_torrent.rb
 - lib/fog/storage/google_json/requests/get_object_url.rb
-- lib/fog/storage/google_json/requests/get_service.rb
 - lib/fog/storage/google_json/requests/head_object.rb
+- lib/fog/storage/google_json/requests/list_buckets.rb
 - lib/fog/storage/google_json/requests/put_bucket.rb
 - lib/fog/storage/google_json/requests/put_bucket_acl.rb
 - lib/fog/storage/google_json/requests/put_object.rb
@@ -585,7 +585,6 @@ files:
 - lib/fog/storage/google_xml/requests/get_object_acl.rb
 - lib/fog/storage/google_xml/requests/get_object_http_url.rb
 - lib/fog/storage/google_xml/requests/get_object_https_url.rb
-- lib/fog/storage/google_xml/requests/get_object_torrent.rb
 - lib/fog/storage/google_xml/requests/get_object_url.rb
 - lib/fog/storage/google_xml/requests/get_service.rb
 - lib/fog/storage/google_xml/requests/head_object.rb
@@ -720,7 +719,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.

data/lib/fog/storage/google_json/requests/get_object_torrent.rb

@@ -1,13 +0,0 @@
-module Fog
-  module Storage
-    class GoogleJSON
-      class Real
-        # Get torrent for an Google Storage object
-        # * Deprecated
-        def get_object_torrent(_bucket_name, _object_name)
-          Fog::Logger.deprecation("Fog::Storage::Google => ##{get_object_torrent} is deprecated.[/] [light_black](#{caller.first})")
-        end
-      end
-    end
-  end
-end

data/lib/fog/storage/google_json/requests/get_service.rb

@@ -1,54 +0,0 @@
-module Fog
-  module Storage
-    class GoogleJSON
-      class Real
-        # TODO: Implement in JSON API
-
-        # List information about Google Storage buckets for authorized user
-        #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'Buckets'<~Hash>:
-        #       * 'Name'<~String> - Name of bucket
-        #       * 'CreationTime'<~Time> - Timestamp of bucket creation
-        #     * 'Owner'<~Hash>:
-        #       * 'DisplayName'<~String> - Display name of bucket owner
-        #       * 'ID'<~String> - Id of bucket owner
-        def get_service
-          # api_method = @storage_json.buckets.list
-          # parameters = {
-          #   "project" => Fog.credentials[:google_project],
-          #   "maxResults" => 9999
-          # }
-
-          # request(api_method, parameters)
-
-          # request(:expects  => 200,
-          #         :headers  => {},
-          #         :host     => @host,
-          #         :idempotent => true,
-          #         :method   => "GET",
-          #         :parser   => Fog::Parsers::Storage::Google::GetService.new)
-        end
-      end
-
-      class Mock
-        def get_service
-          # response = Excon::Response.new
-          # response.headers["Status"] = 200
-          # buckets = data[:buckets].values.map do |bucket|
-          #   bucket.reject do |key, _value|
-          #     !%w(CreationDate Name).include?(key)
-          #   end
-          # end
-          # response.body = {
-          #   "Buckets" => buckets,
-          #   "Owner"   => { "ID" => "some_id" }
-          # }
-          # response
-        end
-      end
-    end
-  end
-end

data/lib/fog/storage/google_xml/requests/get_object_torrent.rb

@@ -1,39 +0,0 @@
-module Fog
-  module Storage
-    class GoogleXML
-      class Real
-        # Get torrent for an Google Storage object
-        #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket containing object
-        # * object_name<~String> - name of object to get torrent for
-        #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'AccessControlPolicy'<~Hash>
-        #       * 'Owner'<~Hash>:
-        #         * 'DisplayName'<~String> - Display name of object owner
-        #         * 'ID'<~String> - Id of object owner
-        #       * 'AccessControlList'<~Array>:
-        #         * 'Grant'<~Hash>:
-        #           * 'Grantee'<~Hash>:
-        #             * 'DisplayName'<~String> - Display name of grantee
-        #             * 'ID'<~String> - Id of grantee
-        #           * 'Permission'<~String> - Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
-        #
-        def get_object_torrent(bucket_name, object_name)
-          raise ArgumentError.new("bucket_name is required") unless bucket_name
-          raise ArgumentError.new("object_name is required") unless object_name
-          request(:expects    => 200,
-                  :headers    => {},
-                  :host       => "#{bucket_name}.#{@host}",
-                  :idempotent => true,
-                  :method     => "GET",
-                  :path       => Fog::Google.escape(object_name),
-                  :query      => { "torrent" => nil })
-        end
-      end
-    end
-  end
-end