fog-maestrodev 1.18.0.20131125083406 → 1.18.0.20131125111730

data/fog.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog-maestrodev'
-  s.version           = '1.18.0.20131125083406'
+  s.version           = '1.18.0.20131125111730'
   s.date              = '2013-11-25'
   s.rubyforge_project = 'fog'
 

data/lib/fog/google/requests/compute/insert_server.rb

@@ -2,24 +2,27 @@ module Fog
   module Compute
     class Google
 
-      module Shared
-        private
+      class Mock
+        include Shared
 
-        def handle_disks(options)
+        def handle_disks(options, zone_name)
           disks = []
+          i = 0
           options.delete('disks').each do |disk|
-            if disk.is_a? Disk
-              disks << disk.get_object
-            else
-              disks << disk
-            end
+            disk = Disk.new(disk) unless disk.is_a? Disk
+            disks << {
+              "kind"=>"compute#attachedDisk",
+              "index"=>i,
+              "type"=>"PERSISTENT",
+              "mode"=>"READ_WRITE",
+              "source"=>"https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk.name}",
+              "deviceName"=>disk.name,
+              "boot"=>true
+            }
+            i+=1
           end
           disks
         end
-      end
-
-      class Mock
-        include Shared
 
         def insert_server(server_name, zone_name, options={}, *deprecated_args)
 
@@ -61,7 +64,7 @@ module Fog
                 ]
               }
             ],
-            "disks" => options['disks'] ? handle_disks(options) : [
+            "disks" => options['disks'] ? handle_disks(options, zone_name) : [
               {
                 "kind" => "compute#attachedDisk",
                 "index" => 0,
@@ -103,6 +106,18 @@ module Fog
       class Real
         include Shared
 
+        def handle_disks(options)
+          disks = []
+          options.delete('disks').each do |disk|
+            if disk.is_a? Disk
+              disks << disk.get_object
+            else
+              disks << disk
+            end
+          end
+          disks
+        end
+
         def format_metadata(metadata)
           { "items" => metadata.map {|k,v| {"key" => k, "value" => v}} }
         end

data/tests/google/models/compute/server_tests.rb

@@ -5,7 +5,7 @@ Shindo.tests("Fog::Compute[:google] | server model", ['google']) do
   tests('servers') do
     @instance = nil
     test('#bootstrap') do
-      attributes = Fog.mocking? ? {:public_key_path => nil} : {}
+      attributes = Fog.mocking? ? {:public_key_path => nil, :private_key_path => nil} : {}
       @instance = Fog::Compute[:google].servers.bootstrap(attributes)
       @instance.ready?
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-maestrodev
 version: !ruby/object:Gem::Version
-  version: 1.18.0.20131125083406
+  version: 1.18.0.20131125111730
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &11531940 !ruby/object:Gem::Requirement
+  requirement: &21750480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11531940
+  version_requirements: *21750480
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &11529920 !ruby/object:Gem::Requirement
+  requirement: &21748360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.28.0
   type: :runtime
   prerelease: false
-  version_requirements: *11529920
+  version_requirements: *21748360
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &11528440 !ruby/object:Gem::Requirement
+  requirement: &21746840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *11528440
+  version_requirements: *21746840
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &11527320 !ruby/object:Gem::Requirement
+  requirement: &21745700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *11527320
+  version_requirements: *21745700
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &12926400 !ruby/object:Gem::Requirement
+  requirement: &21756380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12926400
+  version_requirements: *21756380
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &12938280 !ruby/object:Gem::Requirement
+  requirement: &23216740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *12938280
+  version_requirements: *23216740
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &12933820 !ruby/object:Gem::Requirement
+  requirement: &23212220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *12933820
+  version_requirements: *23212220
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12932400 !ruby/object:Gem::Requirement
+  requirement: &23210800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *12932400
+  version_requirements: *23210800
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &12931700 !ruby/object:Gem::Requirement
+  requirement: &23210180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12931700
+  version_requirements: *23210180
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &12953400 !ruby/object:Gem::Requirement
+  requirement: &23236480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12953400
+  version_requirements: *23236480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12951840 !ruby/object:Gem::Requirement
+  requirement: &23235020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12951840
+  version_requirements: *23235020
 - !ruby/object:Gem::Dependency
   name: rbvmomi
-  requirement: &12950020 !ruby/object:Gem::Requirement
+  requirement: &23233060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12950020
+  version_requirements: *23233060
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &12949060 !ruby/object:Gem::Requirement
+  requirement: &23232140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12949060
+  version_requirements: *23232140
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &12947280 !ruby/object:Gem::Requirement
+  requirement: &23230880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12947280
+  version_requirements: *23230880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12969540 !ruby/object:Gem::Requirement
+  requirement: &23228920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *12969540
+  version_requirements: *23228920
 - !ruby/object:Gem::Dependency
   name: rbovirt
-  requirement: &12966320 !ruby/object:Gem::Requirement
+  requirement: &23249880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 0.0.11
   type: :development
   prerelease: false
-  version_requirements: *12966320
+  version_requirements: *23249880
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &12963980 !ruby/object:Gem::Requirement
+  requirement: &23247580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *12963980
+  version_requirements: *23247580
 - !ruby/object:Gem::Dependency
   name: fission
-  requirement: &12975200 !ruby/object:Gem::Requirement
+  requirement: &23258940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12975200
+  version_requirements: *23258940
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &12973960 !ruby/object:Gem::Requirement
+  requirement: &23257480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12973960
+  version_requirements: *23257480
 - !ruby/object:Gem::Dependency
   name: google-api-client
-  requirement: &12970660 !ruby/object:Gem::Requirement
+  requirement: &23255180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,10 +230,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *12970660
+  version_requirements: *23255180
 - !ruby/object:Gem::Dependency
   name: unf
-  requirement: &13005320 !ruby/object:Gem::Requirement
+  requirement: &23291080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,7 +241,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13005320
+  version_requirements: *23291080
 description: The Ruby cloud services library. Supports all major cloud providers including
   AWS, Rackspace, Linode, Blue Box, StormOnDemand, and many others. Full support for
   most AWS services including EC2, S3, CloudWatch, SimpleDB, ELB, and RDS.
@@ -5354,7 +5354,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3110525105966462162
+      hash: 2767433852425085725
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: