heroku-mongo-backup 0.2.3 → 0.2.4

data/lib/heroku_mongo_backup.rb

@@ -7,7 +7,6 @@ require 'zlib'
 require 'uri'
 require 'yaml'
 require 'rubygems'
-require 's3'
 
 module HerokuMongoBackup
   require 'heroku_mongo_backup/railtie' if defined?(Rails)
@@ -81,9 +80,19 @@ module HerokuMongoBackup
     end
 
     def s3_connect
+      require 's3'
+
       bucket            = ENV['S3_BUCKET']
+
       access_key_id     = ENV['S3_KEY_ID']
+      if access_key_id.nil?
+        access_key_id   = ENV['S3_KEY']
+      end
+
       secret_access_key = ENV['S3_SECRET_KEY']
+      if secret_access_key.nil?
+        secret_access_key = ENV['S3_SECRET']
+      end
 
       service = S3::Service.new(:access_key_id => access_key_id,
                                 :secret_access_key => secret_access_key)
@@ -112,8 +121,16 @@ module HerokuMongoBackup
         #uri = YAML.load(config_template.result)['production']['uri']
         uri = ENV['MONGO_URL']
       else
-        config = YAML.load_file("config/mongoid.yml")['development']
-        uri = "mongodb://#{config['host']}:#{config['port']}/#{config['database']}"
+        mongoid_config  = YAML.load_file("config/mongoid.yml")
+        config          = mongoid_config['defaults']
+        dev_config      = mongoid_config['development']
+
+        config.merge!(dev_config)
+
+        host            = config['host']
+        port            = config['port']
+        database        = config['database']
+        uri = "mongodb://#{host}:#{port}/#{database}"
       end
   
       @url = uri
@@ -138,4 +155,4 @@ module HerokuMongoBackup
       self.load
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-mongo-backup
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: s3
-  requirement: &70330032346760 !ruby/object:Gem::Requirement
+  requirement: &70298259717780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *70330032346760
+  version_requirements: *70298259717780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70330032346260 !ruby/object:Gem::Requirement
+  requirement: &70298259717240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330032346260
+  version_requirements: *70298259717240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70330032345680 !ruby/object:Gem::Requirement
+  requirement: &70298259716620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330032345680
+  version_requirements: *70298259716620
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &70330032345160 !ruby/object:Gem::Requirement
+  requirement: &70298259716100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330032345160
+  version_requirements: *70298259716100
 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