ey_cloud_server 1.4.41 → 1.4.42

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.
@@ -22,6 +22,8 @@ module EY
22
22
  rescue => e
23
23
  retries ||= 5
24
24
  retries -= 1
25
+ # remove partial or failed uploads
26
+ @s3.delete_object(@bucket_minder.bucket_name, object_name) rescue nil
25
27
  raise e if retries == 0
26
28
  warn "retrying upload of #{filename}. Got: #{e.inspect}"
27
29
  retry
@@ -19,7 +19,7 @@ module EY
19
19
  end
20
20
 
21
21
  def backups
22
- s3_objects = bucket_minder.list("#{@environment}.#{@name}").select { |o| o[:name] =~ @engine.suffix }
22
+ s3_objects = bucket_minder.list("#{@environment}.#{@name}/").select { |o| o[:name] =~ @engine.suffix }
23
23
  s3_objects.map {|o| BackupSet.new(self, o[:name], nil, o[:keys]) }.sort
24
24
  end
25
25
 
data/lib/ey_backup.rb CHANGED
@@ -13,26 +13,7 @@ module Fog
13
13
  class Storage < ::Fog::Service
14
14
  module Utils
15
15
  def region_to_endpoint(region_name)
16
- case region_name
17
- when 'us-east-1'
18
- 's3.amazonaws.com'
19
- when 'us-west-2'
20
- 's3-us-west-2.amazonaws.com'
21
- when 'us-west-1'
22
- 's3-us-west-1.amazonaws.com'
23
- when 'eu-west-1'
24
- 's3-eu-west-1.amazonaws.com'
25
- when 'ap-southeast-1'
26
- 's3-ap-southeast-1.amazonaws.com'
27
- when 'ap-southeast-2'
28
- 's3-ap-southeast-2.amazonaws.com'
29
- when 'ap-northeast-1'
30
- 's3-ap-northeast-1.amazonaws.com'
31
- when 'sa-east-1'
32
- 's3-sa-east-1.amazonaws.com'
33
- else
34
- 's3-#{region_name}.amazonaws.com'
35
- end
16
+ region_name === 'us-east-1' ? 's3.amazonaws.com' : "s3-#{region_name}.amazonaws.com"
36
17
  end
37
18
  end
38
19
 
@@ -1,5 +1,5 @@
1
1
  module EY
2
2
  module CloudServer
3
- VERSION = '1.4.41'
3
+ VERSION = '1.4.42'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ey_cloud_server
3
3
  version: !ruby/object:Gem::Version
4
- hash: 85
5
- prerelease: false
4
+ hash: 83
5
+ prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 4
9
- - 41
10
- version: 1.4.41
9
+ - 42
10
+ version: 1.4.42
11
11
  platform: ruby
12
12
  authors:
13
13
  - EngineYard
@@ -15,8 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2013-01-04 00:00:00 -05:00
19
- default_executable:
18
+ date: 2013-06-13 00:00:00 Z
20
19
  dependencies:
21
20
  - !ruby/object:Gem::Dependency
22
21
  name: json
@@ -252,7 +251,6 @@ files:
252
251
  - spec/big-brother_spec.rb
253
252
  - spec/bucket_minder_spec.rb
254
253
  - spec/config-example.yml
255
- - spec/config.yml
256
254
  - spec/ey_api_spec.rb
257
255
  - spec/ey_backup/backend_spec.rb
258
256
  - spec/ey_backup/backup_spec.rb
@@ -274,7 +272,6 @@ files:
274
272
  - features/step_definitions/mysql.rb
275
273
  - features/step_definitions/postgresql.rb
276
274
  - features/support/env.rb
277
- has_rdoc: true
278
275
  homepage: http://developer.engineyard.com
279
276
  licenses: []
280
277
 
@@ -304,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
304
301
  requirements: []
305
302
 
306
303
  rubyforge_project:
307
- rubygems_version: 1.3.7
304
+ rubygems_version: 1.8.15
308
305
  signing_key:
309
306
  specification_version: 3
310
307
  summary: Server side components for Engine Yard's cloud
@@ -312,7 +309,6 @@ test_files:
312
309
  - spec/big-brother_spec.rb
313
310
  - spec/bucket_minder_spec.rb
314
311
  - spec/config-example.yml
315
- - spec/config.yml
316
312
  - spec/ey_api_spec.rb
317
313
  - spec/ey_backup/backend_spec.rb
318
314
  - spec/ey_backup/backup_spec.rb
data/spec/config.yml DELETED
@@ -1,14 +0,0 @@
1
- ---
2
- tmp_dir:
3
- data_json:
4
- mysql_user: root
5
- mysql_password:
6
- mysql_host: localhost
7
- postgresql_user: root
8
- postgresql_password:
9
- postgresql_host: localhost
10
- mongodb_user: root
11
- mongodb_passwd:
12
- mongodb_host: localhost
13
- aws_secret_id: 'abcd123.id'
14
- aws_secret_key: 'abcd123.key'