fog-maestrodev 1.18.0.20131218202447 → 1.18.0.20131219022322

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.20131218202447'
+  s.version           = '1.18.0.20131219022322'
   s.date              = '2013-12-18'
   s.rubyforge_project = 'fog'
 

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

@@ -63,6 +63,7 @@ module Fog
           }
 
           if image_name
+            # New disk from image
             image = images.get(image_name)
             raise ArgumentError.new("Invalid image specified: #{image_name}") unless image
             @image_url = @api_url + image.resource_url
@@ -71,18 +72,23 @@ module Fog
 
           body_object = { 'name' => disk_name }
 
-          # These must be present if image_name is not specified
+          # According to Google docs, if image name is not present, only one of
+          # sizeGb or sourceSnapshot need to be present, one will create blank
+          # disk of desired size, other will create disk from snapshot
           if image_name.nil?
-            unless opts.has_key?('sourceSnapshot') and opts.has_key?('sizeGb')
-              raise ArgumentError.new('Must specify image OR snapshot and '\
+            if opts.has_key?('sourceSnapshot')
+              # New disk from snapshot
+              snap = snapshots.get(opts.delete('sourceSnapshot'))
+              raise ArgumentError.new('Invalid source snapshot') unless snap
+              body_object['sourceSnapshot'] = @api_url + snap.resource_url
+            elsif opts.has_key?('sizeGb')
+              # New blank disk
+              body_object['sizeGb'] = opts.delete('sizeGb')
+            else
+              raise ArgumentError.new('Must specify image OR snapshot OR '\
                                       'disk size when creating a disk.')
             end
 
-            body_object['sizeGb'] = opts.delete('sizeGb')
-
-            snap = snapshots.get(opts.delete('sourceSnapshot'))
-            raise ArgumentError.new('Invalid source snapshot') unless snap
-            body_object['sourceSnapshot'] = @api_url + snap.resource_url
           end
 
           # Merge in any remaining options (only 'description' should remain)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-maestrodev
 version: !ruby/object:Gem::Version
-  version: 1.18.0.20131218202447
+  version: 1.18.0.20131219022322
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &12572000 !ruby/object:Gem::Requirement
+  requirement: &8989500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12572000
+  version_requirements: *8989500
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &12627900 !ruby/object:Gem::Requirement
+  requirement: &8988620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.31.0
   type: :runtime
   prerelease: false
-  version_requirements: *12627900
+  version_requirements: *8988620
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &12626580 !ruby/object:Gem::Requirement
+  requirement: &8987500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *12626580
+  version_requirements: *8987500
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &12625760 !ruby/object:Gem::Requirement
+  requirement: &8986260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *12625760
+  version_requirements: *8986260
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &12625240 !ruby/object:Gem::Requirement
+  requirement: &8985160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12625240
+  version_requirements: *8985160
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &12624180 !ruby/object:Gem::Requirement
+  requirement: &9015740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *12624180
+  version_requirements: *9015740
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &12622120 !ruby/object:Gem::Requirement
+  requirement: &9014120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *12622120
+  version_requirements: *9014120
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12621180 !ruby/object:Gem::Requirement
+  requirement: &9013080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *12621180
+  version_requirements: *9013080
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &12637480 !ruby/object:Gem::Requirement
+  requirement: &9011920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12637480
+  version_requirements: *9011920
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &12632980 !ruby/object:Gem::Requirement
+  requirement: &9011160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12632980
+  version_requirements: *9011160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12631300 !ruby/object:Gem::Requirement
+  requirement: &9010420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12631300
+  version_requirements: *9010420
 - !ruby/object:Gem::Dependency
   name: rbvmomi
-  requirement: &12630260 !ruby/object:Gem::Requirement
+  requirement: &9009880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12630260
+  version_requirements: *9009880
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &12745060 !ruby/object:Gem::Requirement
+  requirement: &9029560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12745060
+  version_requirements: *9029560
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &12743920 !ruby/object:Gem::Requirement
+  requirement: &9028500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12743920
+  version_requirements: *9028500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12742420 !ruby/object:Gem::Requirement
+  requirement: &9027300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *12742420
+  version_requirements: *9027300
 - !ruby/object:Gem::Dependency
   name: rbovirt
-  requirement: &12741440 !ruby/object:Gem::Requirement
+  requirement: &9026140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 0.0.11
   type: :development
   prerelease: false
-  version_requirements: *12741440
+  version_requirements: *9026140
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &12740640 !ruby/object:Gem::Requirement
+  requirement: &9025500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *12740640
+  version_requirements: *9025500
 - !ruby/object:Gem::Dependency
   name: fission
-  requirement: &12739460 !ruby/object:Gem::Requirement
+  requirement: &9025040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12739460
+  version_requirements: *9025040
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &12738620 !ruby/object:Gem::Requirement
+  requirement: &9024360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12738620
+  version_requirements: *9024360
 - !ruby/object:Gem::Dependency
   name: google-api-client
-  requirement: &12800480 !ruby/object:Gem::Requirement
+  requirement: &9023320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,10 +230,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *12800480
+  version_requirements: *9023320
 - !ruby/object:Gem::Dependency
   name: unf
-  requirement: &12798820 !ruby/object:Gem::Requirement
+  requirement: &9045540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,7 +241,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12798820
+  version_requirements: *9045540
 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.
@@ -5413,7 +5413,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 913114980532765100
+      hash: -947790068550500217
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: