aws 2.4.2 → 2.4.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/ec2/ec2.rb +3 -3
  2. data/lib/s3/s3_interface.rb +3 -9
  3. metadata +56 -77
@@ -1110,10 +1110,10 @@ module Aws
1110
1110
  # :aws_size => 94}
1111
1111
  #
1112
1112
  def create_volume(snapshot_id, size, zone)
1113
+ params = {'Size' => size.to_s, 'AvailabilityZone' => zone.to_s}
1114
+ params['SnapshotId'] = snapshot_id if snapshot_id && snapshot_id.length > 0 # snapshotId is conditional
1113
1115
  link = generate_request("CreateVolume",
1114
- "SnapshotId" => snapshot_id.to_s,
1115
- "Size" => size.to_s,
1116
- "AvailabilityZone" => zone.to_s)
1116
+ params)
1117
1117
  request_info(link, QEc2CreateVolumeParser.new(:logger => @logger))
1118
1118
  rescue Exception
1119
1119
  on_exception
@@ -139,16 +139,10 @@ module Aws
139
139
  headers[:url].to_s[%r{^([a-z0-9._-]*)(/[^?]*)?(\?.+)?}i]
140
140
  bucket_name, key_path, params_list = $1, $2, $3
141
141
  # select request model
142
- if is_dns_bucket?(bucket_name)
143
- # fix a path
144
- server = "#{bucket_name}.#{server}"
145
- key_path ||= '/'
146
- path = "#{service}#{key_path}#{params_list}"
147
- else
148
- path = "#{service}/#{bucket_name}#{key_path}#{params_list}"
149
- end
142
+ #if is_dns_bucket?(bucket_name)
143
+ # is_dns_bucket isn't called since naming a bucket using URL's path always works (naming using dns cname may have an issue with Eucalyptus)
144
+ path = "#{service}/#{bucket_name}#{key_path}#{params_list}"
150
145
  path_to_sign = "#{service}/#{bucket_name}#{key_path}#{params_list}"
151
- # path_to_sign = "/#{bucket_name}#{key_path}#{params_list}"
152
146
  [server, path, path_to_sign]
153
147
  end
154
148
 
metadata CHANGED
@@ -1,85 +1,71 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: aws
3
- version: !ruby/object:Gem::Version
4
- prerelease: false
5
- segments:
6
- - 2
7
- - 4
8
- - 2
9
- version: 2.4.2
3
+ version: !ruby/object:Gem::Version
4
+ version: 2.4.3
5
+ prerelease:
10
6
  platform: ruby
11
- authors:
7
+ authors:
12
8
  - Travis Reeder
13
9
  - Chad Arimura
14
10
  - RightScale
15
11
  autorequire:
16
12
  bindir: bin
17
13
  cert_chain: []
18
-
19
- date: 2011-01-21 00:00:00 -08:00
14
+ date: 2011-02-24 00:00:00.000000000 -08:00
20
15
  default_executable:
21
- dependencies:
22
- - !ruby/object:Gem::Dependency
16
+ dependencies:
17
+ - !ruby/object:Gem::Dependency
23
18
  name: uuidtools
24
- prerelease: false
25
- requirement: &id001 !ruby/object:Gem::Requirement
19
+ requirement: &27201060 !ruby/object:Gem::Requirement
26
20
  none: false
27
- requirements:
28
- - - ">="
29
- - !ruby/object:Gem::Version
30
- segments:
31
- - 0
32
- version: "0"
21
+ requirements:
22
+ - - ! '>='
23
+ - !ruby/object:Gem::Version
24
+ version: '0'
33
25
  type: :runtime
34
- version_requirements: *id001
35
- - !ruby/object:Gem::Dependency
36
- name: http_connection
37
26
  prerelease: false
38
- requirement: &id002 !ruby/object:Gem::Requirement
27
+ version_requirements: *27201060
28
+ - !ruby/object:Gem::Dependency
29
+ name: http_connection
30
+ requirement: &27200772 !ruby/object:Gem::Requirement
39
31
  none: false
40
- requirements:
41
- - - ">="
42
- - !ruby/object:Gem::Version
43
- segments:
44
- - 0
45
- version: "0"
32
+ requirements:
33
+ - - ! '>='
34
+ - !ruby/object:Gem::Version
35
+ version: '0'
46
36
  type: :runtime
47
- version_requirements: *id002
48
- - !ruby/object:Gem::Dependency
49
- name: xml-simple
50
37
  prerelease: false
51
- requirement: &id003 !ruby/object:Gem::Requirement
38
+ version_requirements: *27200772
39
+ - !ruby/object:Gem::Dependency
40
+ name: xml-simple
41
+ requirement: &27200484 !ruby/object:Gem::Requirement
52
42
  none: false
53
- requirements:
54
- - - ">="
55
- - !ruby/object:Gem::Version
56
- segments:
57
- - 0
58
- version: "0"
43
+ requirements:
44
+ - - ! '>='
45
+ - !ruby/object:Gem::Version
46
+ version: '0'
59
47
  type: :runtime
60
- version_requirements: *id003
61
- - !ruby/object:Gem::Dependency
62
- name: activesupport
63
48
  prerelease: false
64
- requirement: &id004 !ruby/object:Gem::Requirement
49
+ version_requirements: *27200484
50
+ - !ruby/object:Gem::Dependency
51
+ name: activesupport
52
+ requirement: &27200196 !ruby/object:Gem::Requirement
65
53
  none: false
66
- requirements:
67
- - - ">="
68
- - !ruby/object:Gem::Version
69
- segments:
70
- - 0
71
- version: "0"
54
+ requirements:
55
+ - - ! '>='
56
+ - !ruby/object:Gem::Version
57
+ version: '0'
72
58
  type: :runtime
73
- version_requirements: *id004
74
- description: AWS Ruby Library for interfacing with Amazon Web Services including EC2, S3, SQS, SimpleDB and most of their other services as well. By http://www.appoxy.com
59
+ prerelease: false
60
+ version_requirements: *27200196
61
+ description: AWS Ruby Library for interfacing with Amazon Web Services including EC2,
62
+ S3, SQS, SimpleDB and most of their other services as well. By http://www.appoxy.com
75
63
  email: travis@appoxy.com
76
64
  executables: []
77
-
78
65
  extensions: []
79
-
80
- extra_rdoc_files:
66
+ extra_rdoc_files:
81
67
  - README.markdown
82
- files:
68
+ files:
83
69
  - lib/acf/acf_interface.rb
84
70
  - lib/aws.rb
85
71
  - lib/awsbase/aws_response_array.rb
@@ -131,36 +117,29 @@ files:
131
117
  has_rdoc: true
132
118
  homepage: http://github.com/appoxy/aws/
133
119
  licenses: []
134
-
135
120
  post_install_message:
136
121
  rdoc_options: []
137
-
138
- require_paths:
122
+ require_paths:
139
123
  - lib
140
- required_ruby_version: !ruby/object:Gem::Requirement
124
+ required_ruby_version: !ruby/object:Gem::Requirement
141
125
  none: false
142
- requirements:
143
- - - ">="
144
- - !ruby/object:Gem::Version
145
- segments:
146
- - 0
147
- version: "0"
148
- required_rubygems_version: !ruby/object:Gem::Requirement
126
+ requirements:
127
+ - - ! '>='
128
+ - !ruby/object:Gem::Version
129
+ version: '0'
130
+ required_rubygems_version: !ruby/object:Gem::Requirement
149
131
  none: false
150
- requirements:
151
- - - ">="
152
- - !ruby/object:Gem::Version
153
- segments:
154
- - 0
155
- version: "0"
132
+ requirements:
133
+ - - ! '>='
134
+ - !ruby/object:Gem::Version
135
+ version: '0'
156
136
  requirements: []
157
-
158
137
  rubyforge_project:
159
- rubygems_version: 1.3.7
138
+ rubygems_version: 1.5.2
160
139
  signing_key:
161
140
  specification_version: 3
162
141
  summary: AWS Ruby Library for interfacing with Amazon Web Services. By http://www.appoxy.com
163
- test_files:
142
+ test_files:
164
143
  - test/acf/test_acf.rb
165
144
  - test/acf/test_helper.rb
166
145
  - test/ec2/test_ec2.rb