backup 2.3.3 → 2.3.3.1

data/CHANGELOG

@@ -1,3 +1,16 @@
+PATCH
+=== 2.3.3.1 =====================================
+
+  Fixes an issue when trying to use S3. It would try to create a bucket
+  when one already exists and this raises an error.
+  
+
+UPDATE
+=== 2.3.3 =======================================
+
+  Set final_file to encrypted_file only when encryption is used.
+
+
 UPDATE
 === 2.3.2 =======================================
   

data/VERSION

@@ -1 +1 @@
-2.3.3
+2.3.3.1

data/lib/backup/adapters/mysql.rb

@@ -3,40 +3,7 @@ module Backup
     class MySQL < Backup::Adapters::Base
       
       attr_accessor :user, :password, :database, :skip_tables, :host, :port, :socket, :additional_options, :tables
-
-      # the adapter declares his own configuration
-      adapter_configuration do
-        # :required => true # by default, optional
-        string :user, :password, :database, :additional_options
-        # array allows to call the same configuration multiple times:
-        # skip_tables 't1', 't2'
-        # skip_tables 't3'
-        # the result will always combined
-        array :skip_tables
-        configuration_group :options do
-          string :host, :port, :socket
-        end
-        # settings to be applied globally
-        global do
-          string :mysqldump_full_path
-        end
-      end
-
-#      adapter :mysql do
-#        user        'user'
-#        password    'password'
-#        database    'database'
-#      
-#        # skip_tables ['table1', 'table2', 'table3']
-#        # 
-#        # options do
-#        #   host    '123.45.678.90'
-#        #   port    '80'
-#        #   socket  '/tmp/socket.sock'
-#        # end
-#        # additional_options '--single-transaction  --quick'
-#      end
-
+      
       private
 
         # Dumps and Compresses the MySQL file 

data/lib/backup/configuration/helpers.rb

@@ -2,11 +2,6 @@ module Backup
   module Configuration
     module Helpers
       
-      def global_settings(&block)
-        @global_settings = Backup::Configuration::GlobalSettings.new
-        @global_settings.instance_eval &block
-      end
-
       # A helper method for the config/backup.rb configuration file
       # Expects a trigger in argument one (STRING)
       # Expects a block of settings
@@ -26,4 +21,4 @@ module Backup
       
     end
   end
-end
+end

data/lib/backup/connection/s3.rb

@@ -37,8 +37,14 @@ module Backup
 
       # Wrapper for the Bucket object
       def bucket
-        bucket = service.buckets.build(s3_bucket)
-        bucket.save
+        begin
+          # Find existing bucket:
+          bucket = service.buckets.find(s3_bucket)
+        rescue ::S3::Error::NoSuchBucket => e
+          # Apparently the bucket doesn't exist yet, so create a new one:
+          bucket = service.buckets.build(s3_bucket)
+          bucket.save
+        end
         bucket.retrieve
       end
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: backup
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 121
   prerelease: false
   segments: 
   - 2
   - 3
   - 3
-  version: 2.3.3
+  - 1
+  version: 2.3.3.1
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -03:00
+date: 2010-09-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,52 +180,50 @@ files:
 - CHANGELOG
 - LICENSE
 - VERSION
-- lib/backup/esboco.txt
-- lib/backup/environment/base.rb
-- lib/backup/environment/unix.rb
-- lib/backup/environment/rails.rb
-- lib/backup/command_helper.rb
-- lib/backup/connection/cloudfiles.rb
-- lib/backup/connection/s3.rb
+- lib/backup/adapters/archive.rb
+- lib/backup/adapters/base.rb
 - lib/backup/adapters/custom.rb
-- lib/backup/adapters/postgresql.rb
 - lib/backup/adapters/mysql.rb
+- lib/backup/adapters/postgresql.rb
 - lib/backup/adapters/sqlite.rb
-- lib/backup/adapters/base.rb
-- lib/backup/adapters/archive.rb
-- lib/backup/storage/cloudfiles.rb
-- lib/backup/storage/sftp.rb
-- lib/backup/storage/s3.rb
-- lib/backup/storage/local.rb
-- lib/backup/storage/base.rb
-- lib/backup/storage/scp.rb
-- lib/backup/storage/ftp.rb
+- lib/backup/command_helper.rb
+- lib/backup/configuration/adapter.rb
+- lib/backup/configuration/adapter_options.rb
+- lib/backup/configuration/attributes.rb
+- lib/backup/configuration/base.rb
+- lib/backup/configuration/helpers.rb
+- lib/backup/configuration/mail.rb
+- lib/backup/configuration/smtp.rb
+- lib/backup/configuration/storage.rb
+- lib/backup/connection/cloudfiles.rb
+- lib/backup/connection/s3.rb
+- lib/backup/environment/base.rb
+- lib/backup/environment/rails.rb
+- lib/backup/environment/unix.rb
 - lib/backup/mail/base.rb
 - lib/backup/mail/mail.txt
+- lib/backup/record/base.rb
 - lib/backup/record/cloudfiles.rb
-- lib/backup/record/sftp.rb
-- lib/backup/record/s3.rb
+- lib/backup/record/ftp.rb
 - lib/backup/record/local.rb
-- lib/backup/record/base.rb
+- lib/backup/record/s3.rb
 - lib/backup/record/scp.rb
-- lib/backup/record/ftp.rb
-- lib/backup/configuration/attributes.rb
-- lib/backup/configuration/mail.rb
-- lib/backup/configuration/smtp.rb
-- lib/backup/configuration/helpers.rb
-- lib/backup/configuration/base.rb
-- lib/backup/configuration/storage.rb
-- lib/backup/configuration/adapter.rb
-- lib/backup/configuration/global_settings.rb
-- lib/backup/configuration/adapter_options.rb
+- lib/backup/record/sftp.rb
+- lib/backup/storage/base.rb
+- lib/backup/storage/cloudfiles.rb
+- lib/backup/storage/ftp.rb
+- lib/backup/storage/local.rb
+- lib/backup/storage/s3.rb
+- lib/backup/storage/scp.rb
+- lib/backup/storage/sftp.rb
 - lib/backup.rb
 - bin/backup
-- generators/backup_update/templates/migrations/update_backup_tables.rb
-- generators/backup_update/backup_update_generator.rb
-- generators/backup/templates/migrations/create_backup_tables.rb
+- generators/backup/backup_generator.rb
 - generators/backup/templates/config/backup.rb
+- generators/backup/templates/migrations/create_backup_tables.rb
 - generators/backup/templates/tasks/backup.rake
-- generators/backup/backup_generator.rb
+- generators/backup_update/backup_update_generator.rb
+- generators/backup_update/templates/migrations/update_backup_tables.rb
 - setup/backup.rb
 - setup/backup.sqlite3
 has_rdoc: true

data/lib/backup/configuration/global_settings.rb

@@ -1,8 +0,0 @@
-module Backup
-  module Configuration
-    class GlobalSettings
-      extend Backup::Configuration::Attributes
-      generate_attributes %w(pg_dump_full_path mysqldump_full_path)
-    end
-  end
-end

data/lib/backup/esboco.txt

@@ -1,43 +0,0 @@
-# TODO como usar pipes para melhorar performance?
-
-BackupManager(params)
-Adapter.new(params).perform_backup # stores in tmp_path/filename
-Compressor.execute # stores in tmp_path/filename.gz or bz2
-Encryptor.execute # stores in tmp_path/filename.enc
-Splitter.execute # stores in tmp_path/filename.enc*
-# TODO store the "results" of the backup
-Storage.store # tmp_path/filename
-Notifier.notify
-
-
-RestoreManager
-# TODO store the "results" of the backup
-RETRIEVE em vez de get!
-Storage.get # gets the file and stores in tmp_path/filename*
-Splitter.undo # stores in tmp_path/filename.enc*
-Encryptor.undo # stores in tmp_path/filename.enc
-Compressor.undo # stores in tmp_path/filename.gz or bz2
-Adapter.perform_restore # stores in tmp_path/filename
-
-class Base
-  global_configuration do
-    string :bin_full_path
-  end
-  
-  configuration do
-    string :username, :required => true
-  end
-  
-  def initialize
-    # handle your options
-  end
-  
-  def perform_backup # or backup_command?? if we use a command, the manager can decide to add the filename or pipe to the next command
-    # do your backup here, and store it in tmp_path/filename
-  end
-  
-  def perform_restore # or restore_command?? so we can pipe the commands
-    # do your restore here from tmp_path/filename
-  end
-end
-