heroku_cloud_backup 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46fa6b7d02e63f4e0b7f7b9e079e5d7fd2789c69
-  data.tar.gz: 7bc2897e71b6aa4a6a19323316170b642a6ca418
+  metadata.gz: 86f1065241b1b2639c0a0f4574a3628c37e44ce7
+  data.tar.gz: b2484d2e557de82ac81321a56d1dbaf076f969cc
 SHA512:
-  metadata.gz: b6bc4415214c6c7cf14407b63c848013412cdc1491f34e0c00219ec42abb311146678dd319a1f0b453f2d92b013e42ed4891ee371571140b96a851fdb30965c2
-  data.tar.gz: 2b8d028584c1f5f1795be74fb5fbda52a828fefebcb6f25c953ba19e4344695784aee57341673a515ece754d4a41f391450d2eda69ec0a361e4363e784ac1acf
+  metadata.gz: 903de573fbce10d153e16ff271eb46cbed06e51c8933108ea34032232139380ae9f5a0eccc57fe9d28a3d15d4e7c61e7c705faf0eb9f7a0361e30ef8bb7c9ab7
+  data.tar.gz: f4f69e08c0d640618a6688dcfb5a064f263c22c644fc52ac332239933b2ea345b22fdf230ebf8b9660c2f7e2c06b479c5900fb06209b1403ab9d5736a2a20beb

data/.travis.yml

@@ -1,11 +1,14 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
-  - ree
+  - 2.1.5
+  - 2.2.0
+  - rbx
+  - ruby-head
+  - jruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in heroku_cloud_backup.gemspec
 gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012 Jack Chu
+Copyright (c) 2011-2013 Jack Chu
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -55,17 +55,23 @@ HCB_MAX (Defaults to no limit) - The number of backups to store before the scrip
 
     heroku config:add HCB_MAX=10
 
+HCB_REGION (AWS defaults 'us-east-1', Rackspace defaults to :dfw) - The region of the provider. **Optional**
+
+    heroku config:add HCB_REGION=us-west-1
+
 Depending on which provider you specify, you'll need to provide different login credentials.
 
 For Amazon:
 
     heroku config:add HCB_KEY1="aws_access_key_id"
     heroku config:add HCB_KEY2="aws_secret_access_key"
+    heroku config:add HCB_REGION="us-east-1"
 
 For Rackspace:
 
     heroku config:add HCB_KEY1="rackspace_username"
     heroku config:add HCB_KEY2="rackspace_api_key"
+    heroku config:add HCB_REGION="dfw"
 
 For Google Storage:
 
@@ -82,17 +88,3 @@ You can run this manually like this:
 I would recommend you create a temporarily public url from your cloud storage. I do this with Cyberduck. It has a neat feature where you can right click on a file and it'll generate temporarily accessible urls to that file, with the auth params for it. So once you have that url you can store like this:
 
     heroku pgbackups:restore 'http://my-bucket-name.s3.amazonaws.com/db/DATABASE_URL/2011-06-09-014500.dump?authparameters'
-
-## Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-### Copyright
-
-Copyright (c) 2011-2012 Jack Chu. See LICENSE for details.

data/heroku_cloud_backup.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://jackchu.com/blog/2011/06/10/automated-heroku-database-backups-to-amazon-s3/"
   s.summary     = %q{Backup pg dumps to the cloud}
   s.description = %q{PG backups into the cloud with fog}
+  s.license       = "MIT"
 
   s.rubyforge_project = "heroku_cloud_backup"
 

data/lib/heroku_cloud_backup.rb

@@ -23,7 +23,7 @@ module HerokuCloudBackup
       end
 
       if !directory
-        directory = connection.directories.create(:key => bucket_name)
+        directory = connection.directories.create(key: bucket_name)
       end
 
       public_url = b["public_url"]
@@ -32,7 +32,7 @@ module HerokuCloudBackup
       name = "#{created_at.strftime('%Y-%m-%d-%H%M%S')}.dump"
       begin
         log "creating #{@backup_path}/#{b["from_name"]}/#{name}"
-        directory.files.create(:key => "#{backup_path}/#{b["from_name"]}/#{name}", :body => open(public_url))
+        directory.files.create(key: "#{backup_path}/#{b["from_name"]}/#{name}", body: open(public_url))
       rescue Exception => e
         raise HerokuCloudBackup::Errors::UploadError.new(e.message)
       end
@@ -52,20 +52,25 @@ module HerokuCloudBackup
         begin
           case provider
           when 'aws'
-            Fog::Storage.new(:provider => 'AWS',
-                             :aws_access_key_id     => key1,
-                             :aws_secret_access_key => key2
-                             )
+            Fog::Storage.new(
+              provider: 'AWS',
+              aws_access_key_id: key1,
+              aws_secret_access_key: key2,
+              region: region,
+            )
           when 'rackspace'
-            Fog::Storage.new(:provider => 'Rackspace',
-                             :rackspace_username => key1,
-                             :rackspace_api_key  => key2
-                             )
+            Fog::Storage.new(
+              provider: 'Rackspace',
+              rackspace_username: key1,
+              rackspace_api_key: key2,
+              rackspace_region: region.to_sym,
+            )
           when 'google'
-            Fog::Storage.new(:provider => 'Google',
-                             :google_storage_secret_access_key => key1,
-                             :google_storage_access_key_id     => key2
-                             )
+            Fog::Storage.new(
+              provider: 'Google',
+              google_storage_secret_access_key: key1,
+              google_storage_access_key_id: key2,
+            )
           else
             raise "Your provider was invalid. Valid values are 'aws', 'rackspace', or 'google'"
           end
@@ -103,6 +108,18 @@ module HerokuCloudBackup
       ENV['HCB_KEY2'] || raise(HerokuCloudBackup::Errors::NotFound.new("Please provide a 'HCB_KEY2' config variable."))
     end
 
+    def region
+      region =  case provider
+                when 'aws'
+                  'us-east-1'
+                when 'rackspace'
+                  'dfw'
+                else
+                  nil
+                end
+      ENV['HCB_REGION'] || region
+    end
+
     def log(message)
       puts "[#{Time.now}] #{message}"
     end
@@ -111,7 +128,7 @@ module HerokuCloudBackup
       number_of_files = ENV['HCB_MAX']
       if number_of_files && number_of_files.to_i > 0
         directory = connection.directories.get(bucket_name)
-        files = directory.files.all(:prefix => backup_path)
+        files = directory.files.all(prefix: backup_path)
         file_count = 0
         files.reverse.each do |file|
           if file.key =~ Regexp.new("/#{backup_path}\/\d{4}-\d{2}-\d{2}-\d{6}\.sql\.gz$/i")

data/lib/heroku_cloud_backup/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module HerokuCloudBackup
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: heroku_cloud_backup
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jack Chu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: heroku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.32.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.32.14
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: PG backups into the cloud with fog
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -88,7 +88,8 @@ files:
 - lib/heroku_cloud_backup/version.rb
 - spec/heroku_cloud_backup_spec.rb
 homepage: http://jackchu.com/blog/2011/06/10/automated-heroku-database-backups-to-amazon-s3/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -96,17 +97,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: heroku_cloud_backup
-rubygems_version: 2.0.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Backup pg dumps to the cloud