heroku-mongo-backup 0.2.4 → 0.2.5

data/lib/heroku_mongo_backup.rb

@@ -10,6 +10,7 @@ require 'rubygems'
 
 module HerokuMongoBackup
   require 'heroku_mongo_backup/railtie' if defined?(Rails)
+  require 's3_helpers'
 
   class Backup
     def chdir
@@ -72,7 +73,7 @@ module HerokuMongoBackup
       end
     end
 
-    def connect
+    def db_connect
       uri = URI.parse(@url)
       connection = ::Mongo::Connection.new(uri.host, uri.port)
       @db = connection.db(uri.path.gsub(/^\//, ''))
@@ -80,8 +81,6 @@ module HerokuMongoBackup
     end
 
     def s3_connect
-      require 's3'
-
       bucket            = ENV['S3_BUCKET']
 
       access_key_id     = ENV['S3_KEY_ID']
@@ -94,22 +93,18 @@ module HerokuMongoBackup
         secret_access_key = ENV['S3_SECRET']
       end
 
-      service = S3::Service.new(:access_key_id => access_key_id,
-                                :secret_access_key => secret_access_key)
-      @bucket = service.buckets.find(bucket)
+      @bucket = HerokuMongoBackup::s3_connect(bucket, access_key_id, secret_access_key)
     end
 
     def s3_upload
-      object = @bucket.objects.build("backups/#{@file_name}")
-      object.content = open(@file_name)
-      object.save
+      HerokuMongoBackup::s3_upload(@bucket, @file_name)
     end
 
     def s3_download
       open(@file_name, 'w') do |file|
-        object = @bucket.objects.find("backups/#{@file_name}")
+        file_content = HerokuMongoBackup::s3_download(@bucket, @file_name)
         file.binmode
-        file.write object.content
+        file.write file_content
       end
     end
 
@@ -137,7 +132,7 @@ module HerokuMongoBackup
   
       puts "Using databased: #{@url}"
   
-      self.connect
+      self.db_connect
       self.s3_connect
     end
 
@@ -156,3 +151,4 @@ module HerokuMongoBackup
     end
   end
 end
+

data/lib/s3_helpers.rb

@@ -0,0 +1,46 @@
+require 's3'
+
+if defined?(S3)
+    puts "Using \'s3\' gem as Amazon S3 interface."
+    def HerokuMongoBackup::s3_connect(bucket, key, secret)
+      service = S3::Service.new(:access_key_id     => key,
+                                :secret_access_key => secret)
+      bucket  = service.buckets.find(bucket)
+      return bucket
+    end
+    def HerokuMongoBackup::s3_upload(bucket, filename)
+      object = bucket.objects.build("backups/#{filename}")
+      object.content = open(filename)
+      object.save
+    end
+    def HerokuMongoBackup::s3_download(bucket, filename)
+      object  = bucket.objects.find("backups/#{filename}")
+      content = object.content(reload=true)
+
+      puts "Backup file:"
+      puts "  name: #{filename}"
+      puts "  type: #{object.content_type}"
+      puts "  size: #{content.size} bytes"
+      puts "\n"
+
+      return content
+    end
+  else
+    require 'aws/s3'
+
+    if defined?(AWS)
+      puts "Using \'aws/s3\' gem as Amazon S3 interface."
+      def HerokuMongoBackup::s3_connect(bucket, key, secret)
+        AWS::S3::Base.establish_connection!(:access_key_id     => key,
+                                            :secret_access_key => secret)
+        puts Service.buckets
+      end
+      def HerokuMongoBackup::s3_upload(bucket, filename)
+      end
+      def HerokuMongoBackup::s3_download(bucket, filename)
+      end
+    else
+      puts "Please include 's3' or 'aws/s3' gem in applications Gemfile."
+    end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-mongo-backup
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,20 +11,9 @@ bindir: bin
 cert_chain: []
 date: 2012-01-09 00:00:00.000000000Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: s3
-  requirement: &70298259717780 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.11
-  type: :runtime
-  prerelease: false
-  version_requirements: *70298259717780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70298259717240 !ruby/object:Gem::Requirement
+  requirement: &70113567299480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298259717240
+  version_requirements: *70113567299480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70298259716620 !ruby/object:Gem::Requirement
+  requirement: &70113567298360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298259716620
+  version_requirements: *70113567298360
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &70298259716100 !ruby/object:Gem::Requirement
+  requirement: &70113567297800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70298259716100
+  version_requirements: *70113567297800
 description: Rake task for backing up mongo database on heroku and push it to S3.
   Library can be used as rake task or be easily integrated into daily cron job.
 email: a@alexkravets.com
@@ -64,6 +53,7 @@ extra_rdoc_files: []
 files:
 - lib/heroku_mongo_backup/railtie.rb
 - lib/heroku_mongo_backup.rb
+- lib/s3_helpers.rb
 - lib/tasks/heroku_mongo_backup.rake
 homepage: https://github.com/alexkravets/heroku-mongo-backup
 licenses: []