backup 2.3.2.pre2 → 2.3.2.pre3

data/VERSION

@@ -1 +1 @@
-2.3.1
+2.3.2.pre2

data/bin/backup

@@ -23,13 +23,14 @@ optparse = OptionParser.new do |opts|
     backup = Backup::Setup.new(trigger, @backup_procedures)
     records = Array.new
     case backup.procedure.storage_name.to_sym
-      when :s3    then records = Backup::Record::S3.all    :conditions => {:trigger => trigger}
-      when :scp   then records = Backup::Record::SCP.all   :conditions => {:trigger => trigger}
-      when :ftp   then records = Backup::Record::FTP.all   :conditions => {:trigger => trigger}
-      when :sftp  then records = Backup::Record::SFTP.all  :conditions => {:trigger => trigger}
-      when :local then records = Backup::Record::Local.all :conditions => {:trigger => trigger}
+      when :cloudfiles then records = Backup::Record::CloudFiles.all :conditions => {:trigger => trigger}
+      when :s3         then records = Backup::Record::S3.all         :conditions => {:trigger => trigger}
+      when :scp        then records = Backup::Record::SCP.all        :conditions => {:trigger => trigger}
+      when :ftp        then records = Backup::Record::FTP.all        :conditions => {:trigger => trigger}
+      when :sftp       then records = Backup::Record::SFTP.all       :conditions => {:trigger => trigger}
+      when :local      then records = Backup::Record::Local.all      :conditions => {:trigger => trigger}
     end
-    
+
     if options[:table]
       puts Hirb::Helpers::AutoTable.render(records)
     else
@@ -49,11 +50,12 @@ optparse = OptionParser.new do |opts|
     puts "Destroying backup records with trigger: #{trigger}."
     backup = Backup::Setup.new(trigger, @backup_procedures)
     case backup.procedure.storage_name.to_sym
-      when :s3    then Backup::Record::S3.destroy_all_backups     backup.procedure,  trigger
-      when :scp   then Backup::Record::SCP.destroy_all_backups    backup.procedure,  trigger
-      when :ftp   then Backup::Record::FTP.destroy_all_backups    backup.procedure,  trigger
-      when :sftp  then Backup::Record::SFTP.destroy_all_backups   backup.procedure,  trigger
-      when :local then Backup::Record::Local.destroy_all_backups  backup.procedure,  trigger
+      when :cloudfiles then Backup::Record::CloudFiles.destroy_all_backups backup.procedure,  trigger
+      when :s3         then Backup::Record::S3.destroy_all_backups         backup.procedure,  trigger
+      when :scp        then Backup::Record::SCP.destroy_all_backups        backup.procedure,  trigger
+      when :ftp        then Backup::Record::FTP.destroy_all_backups        backup.procedure,  trigger
+      when :sftp       then Backup::Record::SFTP.destroy_all_backups       backup.procedure,  trigger
+      when :local      then Backup::Record::Local.destroy_all_backups      backup.procedure,  trigger
     end
   end
   
@@ -68,11 +70,12 @@ optparse = OptionParser.new do |opts|
     backup = Backup::Setup.new(false, @backup_procedures)
     backup.procedures.each do |backup_procedure|
       case backup_procedure.storage_name.to_sym
-        when :s3    then Backup::Record::S3.destroy_all_backups     backup_procedure,  backup_procedure.trigger
-        when :scp   then Backup::Record::SCP.destroy_all_backups    backup_procedure,  backup_procedure.trigger
-        when :ftp   then Backup::Record::FTP.destroy_all_backups    backup_procedure,  backup_procedure.trigger
-        when :sftp  then Backup::Record::SFTP.destroy_all_backups   backup_procedure,  backup_procedure.trigger
-        when :local then Backup::Record::Local.destroy_all_backups  backup.procedure,  backup_procedure.trigger
+        when :cloudfiles then Backup::Record::CloudFiles.destroy_all_backups backup_procedure,  backup_procedure.trigger
+        when :s3         then Backup::Record::S3.destroy_all_backups         backup_procedure,  backup_procedure.trigger
+        when :scp        then Backup::Record::SCP.destroy_all_backups        backup_procedure,  backup_procedure.trigger
+        when :ftp        then Backup::Record::FTP.destroy_all_backups        backup_procedure,  backup_procedure.trigger
+        when :sftp       then Backup::Record::SFTP.destroy_all_backups       backup_procedure,  backup_procedure.trigger
+        when :local then Backup::Record::Local.destroy_all_backups           backup.procedure,  backup_procedure.trigger
       end
     end
   end

data/lib/backup.rb

@@ -51,20 +51,22 @@ module Backup
   end
 
   module Storage
-    autoload :S3,    'backup/storage/s3'
-    autoload :SCP,   'backup/storage/scp'
-    autoload :FTP,   'backup/storage/ftp'
-    autoload :SFTP,  'backup/storage/sftp'
-    autoload :Local, 'backup/storage/local'
+    autoload :CloudFiles, 'backup/storage/cloudfiles'
+    autoload :S3,         'backup/storage/s3'
+    autoload :SCP,        'backup/storage/scp'
+    autoload :FTP,        'backup/storage/ftp'
+    autoload :SFTP,       'backup/storage/sftp'
+    autoload :Local,      'backup/storage/local'
   end
 
   module Record
-    autoload :Base,  'backup/record/base'
-    autoload :S3,    'backup/record/s3'
-    autoload :SCP,   'backup/record/scp'
-    autoload :FTP,   'backup/record/ftp'
-    autoload :SFTP,  'backup/record/sftp'
-    autoload :Local, 'backup/record/local'
+    autoload :Base,       'backup/record/base'
+    autoload :CloudFiles, 'backup/record/cloudfiles'
+    autoload :S3,         'backup/record/s3'
+    autoload :SCP,        'backup/record/scp'
+    autoload :FTP,        'backup/record/ftp'
+    autoload :SFTP,       'backup/record/sftp'
+    autoload :Local,      'backup/record/local'
   end
 
   class Setup

data/lib/backup/configuration/base.rb

@@ -25,21 +25,23 @@ module Backup
       # Initializes the storing process depending on the store settings
       def initialize_storage(adapter)
         case @storage_name.to_sym
-          when :s3    then Backup::Storage::S3.new(adapter)
-          when :scp   then Backup::Storage::SCP.new(adapter)
-          when :ftp   then Backup::Storage::FTP.new(adapter)
-          when :sftp  then Backup::Storage::SFTP.new(adapter)
-          when :local then Backup::Storage::Local.new(adapter)
+          when :cloudfiles then Backup::Storage::CloudFiles.new(adapter)
+          when :s3         then Backup::Storage::S3.new(adapter)
+          when :scp        then Backup::Storage::SCP.new(adapter)
+          when :ftp        then Backup::Storage::FTP.new(adapter)
+          when :sftp       then Backup::Storage::SFTP.new(adapter)
+          when :local      then Backup::Storage::Local.new(adapter)
         end
       end
 
       def initialize_record
         case @storage_name.to_sym
-          when :s3    then Backup::Record::S3.new
-          when :scp   then Backup::Record::SCP.new
-          when :ftp   then Backup::Record::FTP.new
-          when :sftp  then Backup::Record::SFTP.new
-          when :local then Backup::Record::Local.new
+          when :cloudfiles then Backup::Record::CloudFiles.new
+          when :s3         then Backup::Record::S3.new
+          when :scp        then Backup::Record::SCP.new
+          when :ftp        then Backup::Record::FTP.new
+          when :sftp       then Backup::Record::SFTP.new
+          when :local      then Backup::Record::Local.new
         end        
       end
   

data/lib/backup/configuration/storage.rb

@@ -2,7 +2,7 @@ module Backup
   module Configuration
     class Storage
       extend Backup::Configuration::Attributes
-      generate_attributes %w(ip user password path access_key_id secret_access_key use_ssl bucket)
+      generate_attributes %w(ip user password path access_key_id secret_access_key use_ssl bucket username api_key container)
     end
   end
 end

data/lib/backup/connection/cloudfiles.rb

@@ -0,0 +1,75 @@
+require 'cloudfiles'
+
+module Backup
+  module Connection
+    class CloudFiles
+
+      attr_accessor :adapter, :procedure, :api_key, :username, :cf_container, :final_file, :tmp_path
+
+      # Initializes the Cloud Files connection, setting the values using the
+      # Cloud Files adapter
+      def initialize(adapter = false)
+        if adapter
+          self.adapter            = adapter
+          self.procedure          = adapter.procedure
+          self.final_file         = adapter.final_file
+          self.tmp_path           = adapter.tmp_path.gsub('\ ', ' ')
+          load_storage_configuration_attributes
+        end
+      end
+
+      # Sets values from a procedure, rather than from the adapter object
+      def static_initialize(procedure)
+        self.procedure = procedure
+        load_storage_configuration_attributes(true)
+      end
+
+      # Establishes a connection with Rackspace Cloud Files using the
+      # credentials provided by the user
+      def connect
+        connection
+      end
+
+      # Wrapper for the Connection object
+      def connection
+        ::CloudFiles::Connection.new(username, api_key)
+      end
+
+      # Wrapper for the Container object
+      def container
+        connection.container(cf_container)
+      end
+
+      # Initializes the file transfer to Rackspace Cloud Files
+      # This can only run after a connection has been made using the #connect method
+      def store
+        object = container.create_object(final_file)
+        object.write(open(File.join(tmp_path, final_file)))
+      end
+
+      # Destroys file from a bucket on Amazon S3
+      def destroy(file, c)
+        c = connection.container(c)
+        c.delete_object(file)
+      end
+
+      private
+
+        def load_storage_configuration_attributes(static = false)
+          %w(api_key username).each do |attribute|
+            if static
+              send("#{attribute}=", procedure.get_storage_configuration.attributes[attribute])
+            else
+              send("#{attribute}=", adapter.procedure.get_storage_configuration.attributes[attribute])
+            end
+          end
+
+          if static
+            self.cf_container = procedure.get_storage_configuration.attributes['container']
+          else
+            self.cf_container = adapter.procedure.get_storage_configuration.attributes['container']
+          end
+        end
+    end
+  end
+end

data/lib/backup/record/cloudfiles.rb

@@ -0,0 +1,28 @@
+require 'backup/connection/cloudfiles'
+
+module Backup
+  module Record
+    class CloudFiles < Backup::Record::Base
+
+      alias_attribute :container, :bucket
+
+      def load_specific_settings(adapter)
+        self.container = adapter.procedure.get_storage_configuration.attributes['container']
+      end
+
+      private
+
+        def self.destroy_backups(procedure, backups)
+          cf = Backup::Connection::CloudFiles.new
+          cf.static_initialize(procedure)
+          cf.connect
+          backups.each do |backup|
+            puts "\nDestroying backup \"#{backup.filename}\" from container \"#{backup.container}\"."
+            cf.destroy(backup.filename, backup.container)
+            backup.destroy
+          end
+        end
+
+    end
+  end
+end

data/lib/backup/storage/cloudfiles.rb

@@ -0,0 +1,16 @@
+require 'backup/connection/cloudfiles'
+
+module Backup
+  module Storage
+    class CloudFiles
+
+      # Stores the backup file on the remote server using Rackspace Cloud Files
+      def initialize(adapter)
+        cf = Backup::Connection::CloudFiles.new(adapter)
+        cf.connect
+        cf.store
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: backup
 version: !ruby/object:Gem::Version 
-  hash: -1876988207
+  hash: -1876988210
   prerelease: true
   segments: 
   - 2
   - 3
   - 2
-  - pre2
-  version: 2.3.2.pre2
+  - pre3
+  version: 2.3.2.pre3
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-11 00:00:00 +02:00
+date: 2010-07-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,6 +146,22 @@ dependencies:
         version: "0.5"
   type: :runtime
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: cloudfiles
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 4
+        - 7
+        version: 1.4.7
+  type: :runtime
+  version_requirements: *id009
 description: |-
   Backup is a Ruby Gem written for Unix and Rails environments. It can be used both with and without the
     Ruby on Rails framework! This gem offers a quick and simple solution to backing up databases such as
@@ -179,6 +195,7 @@ files:
 - 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
@@ -186,11 +203,13 @@ files:
 - lib/backup/mail/base.rb
 - lib/backup/mail/mail.txt
 - lib/backup/record/base.rb
+- lib/backup/record/cloudfiles.rb
 - lib/backup/record/ftp.rb
 - lib/backup/record/local.rb
 - lib/backup/record/s3.rb
 - lib/backup/record/scp.rb
 - lib/backup/record/sftp.rb
+- lib/backup/storage/cloudfiles.rb
 - lib/backup/storage/ftp.rb
 - lib/backup/storage/local.rb
 - lib/backup/storage/s3.rb