fog-google 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad43648d6ec49a3e00c06ef22da0f2c12e84919c
-  data.tar.gz: cf6f8b28815b5ee18dfdce87306559c058eb49b9
+  metadata.gz: 65e4868fbdd7a60000ea6a349ce4f693c39bd62c
+  data.tar.gz: 92c1d9a1f79427c290e499896a8d454eb9d78556
 SHA512:
-  metadata.gz: 5df9ade71b8ac3430be566e5f8006425f6b8dd38ffeb5130f53c6c0d76a12fa56d73eec811a2c72342cbb669fdc0de2df796c037c3fbd32a26be2e2e6c41e8b2
-  data.tar.gz: aaa5bbe014e6d4c44438f068d8137abeb18276b25196ebb212ed54af9e98ca3c9d46d794a780cfd5869399451f654aac190095d983f23a56a7a45de7c54adf87
+  metadata.gz: 8d14851bab45918fec8f0d4cbb48ad6768b6ddeb298e0241f4b09b7ba918615251758ec22ef2636e1d481ee84ffae8bef4952107242a722523953141b1e2f799
+  data.tar.gz: 4236f7940f9f9d86362cd18ea0e0eccf466768f9ebcb3ae7a54d7c48bbbdfbff8139f06107f69837593cfb3a1684f5529b2c2e59b252fc1ea5f4040760d1c6cd

data/examples/create_instance.rb

@@ -25,7 +25,7 @@ def test
     :private_key_path => File.expand_path("~/.ssh/id_rsa"),
     :public_key_path => File.expand_path("~/.ssh/id_rsa.pub"),
     :zone_name => "us-central1-f",
-    :user => ENV["USER"],
+    :username => ENV["USER"],
     :tags => ["fog"],
     :service_accounts => %w(sql-admin bigquery https://www.googleapis.com/auth/compute)
   )

data/lib/fog/compute/google/models/server.rb

@@ -207,21 +207,7 @@ module Fog
         end
 
         def add_ssh_key(username, key)
-          self.metadata = Hash.new("") if metadata.nil?
-
-          # The key "sshKeys" is deprecated and will be unsupported in the
-          # future - for now defer to using 'ssh-keys' unless the user is
-          # already using the deprecated version
-          # https://cloud.google.com/compute/docs/instances/adding-removing-ssh-keys#deprecated
-          metadata_key = metadata.key?("sshKeys") ? "sshKeys" : "ssh-keys"
-
-          # You can have multiple SSH keys, seperated by newlines.
-          # https://developers.google.com/compute/docs/console?hl=en#sshkeys
-          metadata[metadata_key] = "" unless metadata[metadata_key]
-          metadata[metadata_key] += "\n" unless metadata[metadata_key].empty?
-          metadata[metadata_key] += "#{username}:#{key.strip}"
-
-          set_metadata(metadata)
+          set_metadata(generate_ssh_key_metadata(username, key))
         end
 
         def map_service_accounts(scope_array)
@@ -259,7 +245,7 @@ module Fog
             raise ArgumentError.new "#{zone_name.inspect} is either down or you don't have permission to use it."
           end
 
-          add_ssh_key(username, public_key) if public_key
+          generate_ssh_key_metadata(username, public_key) if public_key
 
           options = {
             "machineType" => machine_type,
@@ -289,6 +275,26 @@ module Fog
           operation.wait_for { !pending? }
           reload
         end
+
+        private
+
+        def generate_ssh_key_metadata(username, key)
+          self.metadata = Hash.new("") if metadata.nil?
+
+          # The key "sshKeys" is deprecated and will be unsupported in the
+          # future - for now defer to using 'ssh-keys' unless the user is
+          # already using the deprecated version
+          # https://cloud.google.com/compute/docs/instances/adding-removing-ssh-keys#deprecated
+          metadata_key = metadata.key?("sshKeys") ? "sshKeys" : "ssh-keys"
+
+          # You can have multiple SSH keys, seperated by newlines.
+          # https://developers.google.com/compute/docs/console?hl=en#sshkeys
+          metadata[metadata_key] = "" unless metadata[metadata_key]
+          metadata[metadata_key] += "\n" unless metadata[metadata_key].empty?
+          metadata[metadata_key] += "#{username}:#{key.strip}"
+
+          metadata
+        end
       end
     end
   end

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "0.5.1".freeze
+    VERSION = "0.5.2".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Nat Welch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -725,7 +725,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.