fog-maestrodev 1.18.0.20131205181604 → 1.18.0.20131206115947
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
- data/Rakefile +2 -0
- data/fog.gemspec +2 -2
- data/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb +1 -1
- data/lib/fog/aws/requests/storage/delete_multiple_objects.rb +6 -4
- data/lib/fog/xenserver/compute.rb +2 -1
- data/lib/fog/xenserver.rb +2 -1
- data/tests/aws/requests/storage/delete_multiple_objects_tests.rb +12 -0
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ZDI2NDMwZWYwYzY1YmNiMTRlMDIwZWMyNjlhNTJiNjk5NDAwNDljOA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
YjM2ZTgyMDA3ZTRmMThmOGVhZjI0MGIwOWNlNWY5Y2M5NGFlNzkxYw==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NjM2ZGZjZDE5MDY0MTIwMDBkZDZhOWFmMGQ1NTlmMWYwZWNiNDkyNzZjYjA0
|
10
|
+
NjhhMGNjYTVjYmJlY2Q5MDZiMzY4YTk5ZTRlMDg4MjBjYWIyMzNlNDRlMmFk
|
11
|
+
YWE2OTQ1ZjcxZWIyODY2OWIwNGQ2NmM4NzdlN2FiYTNhMWY4MDE=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
ZWY1ODkyOWEzYjVhZTc3MjEyOGQ5ZjYyMjQ0OGMzZGE2MjNlOWI1ZDY1NDQ2
|
14
|
+
MTg0MmUxZWFjZmE4NjA3NmU3YjJmMDViZTg4MzMxNWRlMDg2NWE4NWI4Yjlh
|
15
|
+
YjQ5M2U1ZDgxODBkNzkwNmRmZWM5NWZkMDU2YzRlYThhY2NiY2I=
|
data/Rakefile
CHANGED
@@ -56,6 +56,8 @@ Fog::Rake::TestTask.new
|
|
56
56
|
namespace :test do
|
57
57
|
mock = 'true' || ENV['FOG_MOCK']
|
58
58
|
task :travis do
|
59
|
+
# jruby coveralls causes an OOM in travis
|
60
|
+
ENV['COVERAGE'] = 'false' if RUBY_PLATFORM == 'java'
|
59
61
|
sh("export FOG_MOCK=#{mock} && bundle exec shindont")
|
60
62
|
end
|
61
63
|
task :vsphere do
|
data/fog.gemspec
CHANGED
@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
|
|
6
6
|
## If your rubyforge_project name is different, then edit it and comment out
|
7
7
|
## the sub! line in the Rakefile
|
8
8
|
s.name = 'fog-maestrodev'
|
9
|
-
s.version = '1.18.0.
|
10
|
-
s.date = '2013-12-
|
9
|
+
s.version = '1.18.0.20131206115947'
|
10
|
+
s.date = '2013-12-06'
|
11
11
|
s.rubyforge_project = 'fog'
|
12
12
|
|
13
13
|
## Make sure your summary is short. The description may be as long
|
@@ -11,7 +11,7 @@ module Fog
|
|
11
11
|
#
|
12
12
|
# ==== Parameters
|
13
13
|
# * options<~Hash>:
|
14
|
-
# * '
|
14
|
+
# * 'AutoScalingGroupNames'<~String> - The name of the Auto Scaling
|
15
15
|
# group.
|
16
16
|
# * 'MaxRecords'<~Integer> - The maximum number of records to return.
|
17
17
|
# * 'NextToken'<~String> - A string that is used to mark the start of
|
@@ -32,9 +32,10 @@ module Fog
|
|
32
32
|
# @see http://docs.amazonwebservices.com/AmazonS3/latest/API/multiobjectdeleteapi.html
|
33
33
|
|
34
34
|
def delete_multiple_objects(bucket_name, object_names, options = {})
|
35
|
+
headers = options.dup
|
35
36
|
data = "<Delete>"
|
36
|
-
data << "<Quiet>true</Quiet>" if
|
37
|
-
version_ids =
|
37
|
+
data << "<Quiet>true</Quiet>" if headers.delete(:quiet)
|
38
|
+
version_ids = headers.delete('versionId')
|
38
39
|
object_names.each do |object_name|
|
39
40
|
data << "<Object>"
|
40
41
|
data << "<Key>#{CGI.escapeHTML(object_name)}</Key>"
|
@@ -46,7 +47,6 @@ module Fog
|
|
46
47
|
end
|
47
48
|
data << "</Delete>"
|
48
49
|
|
49
|
-
headers = options
|
50
50
|
headers['Content-Length'] = data.length
|
51
51
|
headers['Content-MD5'] = Base64.encode64(Digest::MD5.digest(data)).
|
52
52
|
gsub("\n", '')
|
@@ -67,11 +67,13 @@ module Fog
|
|
67
67
|
class Mock # :nodoc:all
|
68
68
|
|
69
69
|
def delete_multiple_objects(bucket_name, object_names, options = {})
|
70
|
+
headers = options.dup
|
71
|
+
headers.delete(:quiet)
|
70
72
|
response = Excon::Response.new
|
71
73
|
if bucket = self.data[:buckets][bucket_name]
|
72
74
|
response.status = 200
|
73
75
|
response.body = { 'DeleteResult' => [] }
|
74
|
-
version_ids =
|
76
|
+
version_ids = headers.delete('versionId')
|
75
77
|
object_names.each do |object_name|
|
76
78
|
object_version = version_ids.nil? ? nil : version_ids[object_name]
|
77
79
|
response.body['DeleteResult'] << delete_object_helper(bucket,
|
@@ -86,7 +86,8 @@ module Fog
|
|
86
86
|
@username = options[:xenserver_username]
|
87
87
|
@password = options[:xenserver_password]
|
88
88
|
@defaults = options[:xenserver_defaults] || {}
|
89
|
-
@
|
89
|
+
@timeout = options[:xenserver_timeout] || 30
|
90
|
+
@connection = Fog::XenServer::Connection.new(@host, @timeout)
|
90
91
|
@connection.authenticate(@username, @password)
|
91
92
|
end
|
92
93
|
|
data/lib/fog/xenserver.rb
CHANGED
@@ -14,9 +14,10 @@ module Fog
|
|
14
14
|
class Connection
|
15
15
|
require 'xmlrpc/client'
|
16
16
|
|
17
|
-
def initialize(host)
|
17
|
+
def initialize(host, timeout)
|
18
18
|
@factory = XMLRPC::Client.new(host, '/')
|
19
19
|
@factory.set_parser(NokogiriStreamParser.new)
|
20
|
+
@factory.timeout = timeout
|
20
21
|
end
|
21
22
|
|
22
23
|
def authenticate( username, password )
|
@@ -0,0 +1,12 @@
|
|
1
|
+
Shindo.tests('AWS::Storage | delete_multiple_objects', ['aws']) do
|
2
|
+
@directory = Fog::Storage[:aws].directories.create(:key => 'fogobjecttests-' + Time.now.to_i.to_s(32))
|
3
|
+
|
4
|
+
tests("doesn't alter options") do
|
5
|
+
version_id = {'fog_object' => ['12345']}
|
6
|
+
options = {:quiet => true, 'versionId' => version_id}
|
7
|
+
Fog::Storage[:aws].delete_multiple_objects(@directory.identity, ['fog_object'], options)
|
8
|
+
|
9
|
+
test(":quiet is unchanged") { options[:quiet] }
|
10
|
+
test("'versionId' is unchanged") { options['versionId'] == version_id }
|
11
|
+
end
|
12
|
+
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fog-maestrodev
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.18.0.
|
4
|
+
version: 1.18.0.20131206115947
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- geemus (Wesley Beary)
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-12-
|
11
|
+
date: 2013-12-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: builder
|
@@ -4684,6 +4684,7 @@ files:
|
|
4684
4684
|
- tests/aws/requests/storage/acl_utils_tests.rb
|
4685
4685
|
- tests/aws/requests/storage/bucket_tests.rb
|
4686
4686
|
- tests/aws/requests/storage/cors_utils_tests.rb
|
4687
|
+
- tests/aws/requests/storage/delete_multiple_objects_tests.rb
|
4687
4688
|
- tests/aws/requests/storage/multipart_upload_tests.rb
|
4688
4689
|
- tests/aws/requests/storage/object_tests.rb
|
4689
4690
|
- tests/aws/requests/storage/versioning_tests.rb
|
@@ -5611,6 +5612,7 @@ test_files:
|
|
5611
5612
|
- tests/aws/requests/storage/acl_utils_tests.rb
|
5612
5613
|
- tests/aws/requests/storage/bucket_tests.rb
|
5613
5614
|
- tests/aws/requests/storage/cors_utils_tests.rb
|
5615
|
+
- tests/aws/requests/storage/delete_multiple_objects_tests.rb
|
5614
5616
|
- tests/aws/requests/storage/multipart_upload_tests.rb
|
5615
5617
|
- tests/aws/requests/storage/object_tests.rb
|
5616
5618
|
- tests/aws/requests/storage/versioning_tests.rb
|