fog-google 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92c9efd9ddab995f14a3f4eeb4ffca1ba7ee6ccc
-  data.tar.gz: 28ea5908d53b53f5b893c1d235503083989e6aa3
+  metadata.gz: 60125d11954dd919a8685781db294ef96edcc0fc
+  data.tar.gz: 7df579f5e21c306d18112e12bad9e038b6a92b75
 SHA512:
-  metadata.gz: 6ddc1cd98ae4127f6c8ea549bbceee964c6cc15cb8e8f30def296bb7764a4f42455fc9c97f4fe1876e901644b9ba9227843566fb68f9cb38847d5e816c72fc55
-  data.tar.gz: 5c9ef2418309ff8ff900717fc2ea9650429e465a051aadec83b7809b0a6aebc1ff296bad96c788b0cba1679999f7de4ca557ccc9942ac95f1896e27569eb92fb
+  metadata.gz: 365da53d78669fe0d8c9d50fe81b10a9cf759152ea11b282ec452e15d7a292360b35f36b187df9a5dc0e47255886a8c8a954d521ad05991371c9189e711d165d
+  data.tar.gz: a2e8e2812ee8f084805858eee655d89ba10400e3c8585e3066dfbce7b4fc8ea1286c28cd8ac65095ebf4df86ff32dd9564bb5924fceb1a00536b0d78e99b1176

data/.travis.yml

@@ -3,10 +3,10 @@ sudo: false
 matrix:
   fast_finish: true
   include:
-    - rvm: 2.0
     - rvm: 2.1
     - rvm: 2.2
     - rvm: 2.3.0
+    - rvm: 2.3.1
     - rvm: jruby-head
   allow_failures:
     - rvm: jruby-head

data/README.md

@@ -60,7 +60,7 @@ Or install it yourself as:
 $ gem install fog-google
 ```
 
-### Setup
+## Setup
 
 #### Credentials
 
@@ -83,10 +83,23 @@ my_credentials:
 	google_storage_secret_access_key: XXXX+XXX/XXXXXXXX+XXXXXXXXXXXXXXXXXXXXX
 ```	
 
-
 #### SSH-ing into instances
 
-If you want to be able to bootstrap SSH-able instances, (using `servers.bootstrap`,) be sure you have a key in `~/.ssh/id_rsa` and `~/.ssh/id_rsa.pub`.
+If you want to be able to bootstrap SSH-able instances, (using `servers.bootstrap`,) be sure you have a key in `~/.ssh/id_rsa` and `~/.ssh/id_rsa.pub`
+
+## Quickstart
+
+Once you've specified your credentials, you should be good to go!
+```
+λ bundle exec pry
+[1] pry(main)> require 'fog/google'
+=> true
+[2] pry(main)> connection = Fog::Compute::Google.new
+[3] pry(main)> connection.servers
+=> [  <Fog::Compute::Google::Server
+    name="xxxxxxx",
+    kind="compute#instance",
+```
 
 ## Contributing
 

data/lib/fog/google/requests/pubsub/create_subscription.rb

@@ -26,9 +26,8 @@ module Fog
             "topic" => (topic.is_a?(Topic) ? topic.name : topic.to_s)
           }
 
-          if !push_config.nil? && push_config.key?("push_endpoint")
-            body["pushConfig"] = push_config["push_endpoint"].clone
-            body["pushConfig"]["attributes"] = push_config["attributes"] if push_config.key?("attributes")
+          unless push_config.empty?
+            body["pushConfig"] = push_config
           end
 
           body["ackDeadlineSeconds"] = ack_deadline_seconds unless ack_deadline_seconds.nil?

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "0.4.1".freeze
+    VERSION = "0.4.2".freeze
   end
 end

data/lib/fog/storage/google_json.rb

@@ -40,6 +40,7 @@ module Fog
       request :get_object_url
       request :head_object
       request :list_buckets
+      request :list_objects
       request :put_bucket
       request :put_bucket_acl
       request :put_object

data/lib/fog/storage/google_json/models/file.rb

@@ -2,7 +2,7 @@ module Fog
   module Storage
     class GoogleJSON
       class File < Fog::Model
-        identity :key, :aliases => "Key"
+        identity :key, :aliases => %w{Key name}
 
         attribute :acl
         attribute :predefined_acl

data/lib/fog/storage/google_json/models/files.rb

@@ -16,22 +16,8 @@ module Fog
 
         def all(options = {})
           requires :directory
-          options = {
-            "delimiter"   => delimiter,
-            "pageToken"   => page_token,
-            "maxResults"  => max_results,
-            "prefix"      => prefix
-          }.merge!(options)
-          options = options.reject { |_key, value| value.nil? || value.to_s.empty? }
-          merge_attributes(options)
-          parent = directory.collection.get(
-            directory.key,
-            options
-          )
-          if parent
-            merge_attributes(parent.files.attributes)
-            load(parent.files.map(&:attributes))
-          end
+
+          load(service.list_objects(directory.key, options)[:body]["items"])
         end
 
         alias_method :each_file_this_page, :each

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

@@ -0,0 +1,50 @@
+module Fog
+  module Storage
+    class GoogleJSON
+      class Real
+        # Lists objects in a bucket matching some criteria.
+        #
+        # @param bucket [String] name of bucket to list
+        # @param options [Hash] optional hash of options
+        # @option options [String] :delimiter Delimiter to collapse objects
+        #   under to emulate a directory-like mode
+        # @option options [Integer] :max_results Maximum number of results to
+        #   retrieve
+        # @option options [String] :page_token Token to select a particular page
+        #   of results
+        # @option options [String] :prefix String that an object must begin with
+        #   in order to be returned
+        # @option options ["full", "noAcl"] :projection Set of properties to
+        #   return (defaults to "noAcl")
+        # @option options [Boolean] :versions If true, lists all versions of an
+        #   object as distinct results (defaults to False)
+        def list_objects(bucket, options = {})
+          api_method = @storage_json.objects.list
+          parameters = {
+            "bucket" => bucket
+          }
+
+          # Optional parameters
+          {
+            :delimiter   => "delimiter",
+            :max_results => "maxResults",
+            :page_token  => "pageToken",
+            :prefix      => "prefix",
+            :projection  => "projection",
+            :versions    => "versions"
+          }.each do |k, v|
+            parameters[v] = options[k] unless options[k].nil?
+          end
+
+          request(api_method, parameters)
+        end
+      end
+
+      class Mock
+        def list_objects(_bucket, _options = {})
+          Fog::Mock.not_implemented
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Nat Welch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -563,6 +563,7 @@ files:
 - lib/fog/storage/google_json/requests/get_object_url.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/list_objects.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
@@ -719,7 +720,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.