fog-maestrodev 1.18.0.20131205181604 → 1.18.0.20131206115947

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjA5MTFmZDFkNDkyMDdjNWI3MWFjMmVlOTY3YzNhNTBmMjQxZDEwZQ==
+    ZDI2NDMwZWYwYzY1YmNiMTRlMDIwZWMyNjlhNTJiNjk5NDAwNDljOA==
   data.tar.gz: !binary |-
-    MWUzMTY3YmI4YmViNTI0M2E5NDJhODE5YzlkYTc2OGZmOWYwMjVmMw==
+    YjM2ZTgyMDA3ZTRmMThmOGVhZjI0MGIwOWNlNWY5Y2M5NGFlNzkxYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2E4YTBiNDI0ZmZjYzBmNWJmZmEwNDk5MWQzNThiZTQxODg0MzlmMWRkZTBl
-    ZjFlN2FhNTY2NjZiMTMxMjY0ZjQ0ZDY3NzZmMTExNDBmYTBkOWJjYmRjMmZh
-    NTM4NGU4NDQ5NGM3Y2Y0YTE2Zjk0MGI1ODgwNjJlYjhmZTViZDU=
+    NjM2ZGZjZDE5MDY0MTIwMDBkZDZhOWFmMGQ1NTlmMWYwZWNiNDkyNzZjYjA0
+    NjhhMGNjYTVjYmJlY2Q5MDZiMzY4YTk5ZTRlMDg4MjBjYWIyMzNlNDRlMmFk
+    YWE2OTQ1ZjcxZWIyODY2OWIwNGQ2NmM4NzdlN2FiYTNhMWY4MDE=
   data.tar.gz: !binary |-
-    NTBkMTI4MWE2ZDhkYzRhNWQyNDA4NTJmODFhMzk5N2YxZjg1NWMxMDBiOGU4
-    ZDIxMDgxMjM0MjhmZDg5MDAzZjhmOGUyMmI4ODkyOGQ4MzIyNmZlOGY4NDc5
-    NDg5OTJmMDZiOTJhNTMxMDkwODgyNDA3ZWRlMThlYzA3MGFlMjA=
+    ZWY1ODkyOWEzYjVhZTc3MjEyOGQ5ZjYyMjQ0OGMzZGE2MjNlOWI1ZDY1NDQ2
+    MTg0MmUxZWFjZmE4NjA3NmU3YjJmMDViZTg4MzMxNWRlMDg2NWE4NWI4Yjlh
+    YjQ5M2U1ZDgxODBkNzkwNmRmZWM5NWZkMDU2YzRlYThhY2NiY2I=

data/Rakefile

@@ -56,6 +56,8 @@ Fog::Rake::TestTask.new
 namespace :test do
   mock = 'true' || ENV['FOG_MOCK']
   task :travis do
+      # jruby coveralls causes an OOM in travis
+      ENV['COVERAGE'] = 'false' if RUBY_PLATFORM == 'java'
       sh("export FOG_MOCK=#{mock} && bundle exec shindont")
   end
   task :vsphere do

data/fog.gemspec

@@ -6,8 +6,8 @@ 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.20131205181604'
-  s.date              = '2013-12-05'
+  s.version           = '1.18.0.20131206115947'
+  s.date              = '2013-12-06'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb

@@ -11,7 +11,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash>:
-        #   * 'AutoScalingGroupsName'<~String> - The name of the Auto Scaling
+        #   * 'AutoScalingGroupNames'<~String> - The name of the Auto Scaling
         #     group.
         #   * 'MaxRecords'<~Integer> - The maximum number of records to return.
         #   * 'NextToken'<~String> - A string that is used to mark the start of

data/lib/fog/aws/requests/storage/delete_multiple_objects.rb

@@ -32,9 +32,10 @@ module Fog
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/multiobjectdeleteapi.html
         
         def delete_multiple_objects(bucket_name, object_names, options = {})
+          headers = options.dup
           data = "<Delete>"
-          data << "<Quiet>true</Quiet>" if options.delete(:quiet)
-          version_ids = options.delete('versionId')
+          data << "<Quiet>true</Quiet>" if headers.delete(:quiet)
+          version_ids = headers.delete('versionId')
           object_names.each do |object_name|
             data << "<Object>"
             data << "<Key>#{CGI.escapeHTML(object_name)}</Key>"
@@ -46,7 +47,6 @@ module Fog
           end
           data << "</Delete>"
 
-          headers = options
           headers['Content-Length'] = data.length
           headers['Content-MD5'] = Base64.encode64(Digest::MD5.digest(data)).
                                    gsub("\n", '')
@@ -67,11 +67,13 @@ module Fog
       class Mock # :nodoc:all
 
         def delete_multiple_objects(bucket_name, object_names, options = {})
+          headers = options.dup
+          headers.delete(:quiet)
           response = Excon::Response.new
           if bucket = self.data[:buckets][bucket_name]
             response.status = 200
             response.body = { 'DeleteResult' => [] }
-            version_ids = options.delete('versionId')
+            version_ids = headers.delete('versionId')
             object_names.each do |object_name|
               object_version = version_ids.nil? ? nil : version_ids[object_name]
               response.body['DeleteResult'] << delete_object_helper(bucket,

data/lib/fog/xenserver/compute.rb

@@ -86,7 +86,8 @@ module Fog
           @username    = options[:xenserver_username]
           @password    = options[:xenserver_password]
           @defaults    = options[:xenserver_defaults] || {}
-          @connection  = Fog::XenServer::Connection.new(@host)
+          @timeout     = options[:xenserver_timeout] || 30
+          @connection  = Fog::XenServer::Connection.new(@host, @timeout)
           @connection.authenticate(@username, @password)
         end
 

data/lib/fog/xenserver.rb

@@ -14,9 +14,10 @@ module Fog
     class Connection
       require 'xmlrpc/client'
     
-      def initialize(host)
+      def initialize(host, timeout)
         @factory = XMLRPC::Client.new(host, '/')
         @factory.set_parser(NokogiriStreamParser.new)
+        @factory.timeout = timeout
       end
     
       def authenticate( username, password )

data/tests/aws/requests/storage/delete_multiple_objects_tests.rb

@@ -0,0 +1,12 @@
+Shindo.tests('AWS::Storage | delete_multiple_objects', ['aws']) do
+  @directory = Fog::Storage[:aws].directories.create(:key => 'fogobjecttests-' + Time.now.to_i.to_s(32))
+
+  tests("doesn't alter options") do
+    version_id = {'fog_object' => ['12345']}
+    options = {:quiet => true, 'versionId' => version_id}
+    Fog::Storage[:aws].delete_multiple_objects(@directory.identity, ['fog_object'], options)
+
+    test(":quiet is unchanged") { options[:quiet] }
+    test("'versionId' is unchanged") { options['versionId'] == version_id }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-maestrodev
 version: !ruby/object:Gem::Version
-  version: 1.18.0.20131205181604
+  version: 1.18.0.20131206115947
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -4684,6 +4684,7 @@ files:
 - tests/aws/requests/storage/acl_utils_tests.rb
 - tests/aws/requests/storage/bucket_tests.rb
 - tests/aws/requests/storage/cors_utils_tests.rb
+- tests/aws/requests/storage/delete_multiple_objects_tests.rb
 - tests/aws/requests/storage/multipart_upload_tests.rb
 - tests/aws/requests/storage/object_tests.rb
 - tests/aws/requests/storage/versioning_tests.rb
@@ -5611,6 +5612,7 @@ test_files:
 - tests/aws/requests/storage/acl_utils_tests.rb
 - tests/aws/requests/storage/bucket_tests.rb
 - tests/aws/requests/storage/cors_utils_tests.rb
+- tests/aws/requests/storage/delete_multiple_objects_tests.rb
 - tests/aws/requests/storage/multipart_upload_tests.rb
 - tests/aws/requests/storage/object_tests.rb
 - tests/aws/requests/storage/versioning_tests.rb