ey_cloud_server 1.4.41 → 1.4.42

data/lib/ey_backup/backend.rb

@@ -22,6 +22,8 @@ module EY
           rescue => e
             retries ||= 5
             retries -= 1
+            # remove partial or failed uploads
+            @s3.delete_object(@bucket_minder.bucket_name, object_name) rescue nil
             raise e if retries == 0
             warn "retrying upload of #{filename}. Got: #{e.inspect}"
             retry

data/lib/ey_backup/database.rb

@@ -19,7 +19,7 @@ module EY
       end
 
       def backups
-        s3_objects = bucket_minder.list("#{@environment}.#{@name}").select { |o| o[:name] =~ @engine.suffix }
+        s3_objects = bucket_minder.list("#{@environment}.#{@name}/").select { |o| o[:name] =~ @engine.suffix }
         s3_objects.map {|o| BackupSet.new(self, o[:name], nil, o[:keys]) }.sort
       end
 

data/lib/ey_backup.rb

@@ -13,26 +13,7 @@ module Fog
     class Storage < ::Fog::Service
       module Utils
         def region_to_endpoint(region_name)
-          case region_name
-          when 'us-east-1'
-            's3.amazonaws.com'
-          when 'us-west-2'
-            's3-us-west-2.amazonaws.com'
-          when 'us-west-1'
-            's3-us-west-1.amazonaws.com'
-          when 'eu-west-1'
-            's3-eu-west-1.amazonaws.com'
-          when 'ap-southeast-1'
-            's3-ap-southeast-1.amazonaws.com'
-          when 'ap-southeast-2'
-            's3-ap-southeast-2.amazonaws.com'
-          when 'ap-northeast-1'
-            's3-ap-northeast-1.amazonaws.com'
-          when 'sa-east-1'
-            's3-sa-east-1.amazonaws.com'
-          else
-            's3-#{region_name}.amazonaws.com'
-          end
+          region_name === 'us-east-1' ? 's3.amazonaws.com' : "s3-#{region_name}.amazonaws.com"
         end
       end
 

data/lib/ey_cloud_server/version.rb

@@ -1,5 +1,5 @@
 module EY
   module CloudServer
-    VERSION = '1.4.41'
+    VERSION = '1.4.42'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey_cloud_server
 version: !ruby/object:Gem::Version 
-  hash: 85
-  prerelease: false
+  hash: 83
+  prerelease: 
   segments: 
   - 1
   - 4
-  - 41
-  version: 1.4.41
+  - 42
+  version: 1.4.42
 platform: ruby
 authors: 
 - EngineYard
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-04 00:00:00 -05:00
-default_executable: 
+date: 2013-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -252,7 +251,6 @@ files:
 - spec/big-brother_spec.rb
 - spec/bucket_minder_spec.rb
 - spec/config-example.yml
-- spec/config.yml
 - spec/ey_api_spec.rb
 - spec/ey_backup/backend_spec.rb
 - spec/ey_backup/backup_spec.rb
@@ -274,7 +272,6 @@ files:
 - features/step_definitions/mysql.rb
 - features/step_definitions/postgresql.rb
 - features/support/env.rb
-has_rdoc: true
 homepage: http://developer.engineyard.com
 licenses: []
 
@@ -304,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Server side components for Engine Yard's cloud
@@ -312,7 +309,6 @@ test_files:
 - spec/big-brother_spec.rb
 - spec/bucket_minder_spec.rb
 - spec/config-example.yml
-- spec/config.yml
 - spec/ey_api_spec.rb
 - spec/ey_backup/backend_spec.rb
 - spec/ey_backup/backup_spec.rb

data/spec/config.yml

@@ -1,14 +0,0 @@
----
-tmp_dir: 
-data_json: 
-mysql_user: root
-mysql_password:
-mysql_host: localhost
-postgresql_user: root
-postgresql_password:
-postgresql_host: localhost
-mongodb_user: root
-mongodb_passwd:
-mongodb_host: localhost
-aws_secret_id: 'abcd123.id'
-aws_secret_key: 'abcd123.key'