Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'develop'

  • Loading branch information...
commit 9e0c2cba3e94238978bf72d482d94a981c8374b4 2 parents 81848fe + 5ab8f0c
@meskyanichi meskyanichi authored
View
3  .gitignore
@@ -1,2 +1,3 @@
.DS_Store
-*.gem
+*.gem
+.rvmrc
View
6 Gemfile.lock
@@ -1,7 +1,6 @@
GEM
remote: http://rubygems.org/
specs:
- Platform (0.4.0)
addressable (2.2.6)
builder (3.0.0)
crack (0.1.8)
@@ -60,11 +59,7 @@ GEM
net-ssh (2.1.4)
nokogiri (1.5.0)
oauth (0.4.5)
- open4 (1.1.0)
polyglot (0.3.2)
- popen4 (0.1.2)
- Platform (>= 0.4.0)
- open4 (>= 0.4.0)
rack (1.3.2)
rb-fsevent (0.4.0)
rb-inotify (0.8.5)
@@ -112,7 +107,6 @@ DEPENDENCIES
net-scp (~> 1.0.4)
net-sftp (~> 2.0.5)
net-ssh (~> 2.1.4)
- popen4 (~> 0.1.2)
rb-fsevent
rb-inotify
rspec
View
11 README.md
@@ -4,6 +4,8 @@ Backup 3
Backup is a RubyGem, written for Linux and Mac OSX, that allows you to easily perform backup operations on both your remote, as well as your local environment. It provides you with an elegant DSL in Ruby for modeling (configuring) your backups. Backup has built-in support for various databases, storage protocols/services, syncers, compressors, encryptors and notifiers which you can mix and match. It was built with modularity, extensibility and simplicity in mind.
[![Build Status](https://secure.travis-ci.org/meskyanichi/backup.png)](http://travis-ci.org/meskyanichi/backup)
+[![Still Maintained](http://stillmaintained.com/meskyanichi/backup.png)](http://stillmaintained.com/meskyanichi/backup)
+
Author
------
@@ -13,6 +15,14 @@ Author
Drop me a message for any questions, suggestions, requests, bugs or submit them to the [issue log](https://github.com/meskyanichi/backup/issues).
+Please Donate!
+--------------
+
+Please [DONATE](http://pledgie.com/campaigns/16065) to the Backup project. Backup was a huge amount of work and every donation received is encouraging and supports Backup's continued development! Thanks!
+
+[![Donate to Backup](http://pledgie.com/campaigns/16065.png)](http://pledgie.com/campaigns/16065)
+
+
Installation
------------
@@ -22,6 +32,7 @@ To get the latest stable version
You can view the list of released versions over at [RubyGems.org (Backup)](https://rubygems.org/gems/backup/versions)
+
Getting Started
---------------
View
2  lib/backup/configuration/storage/cloudfiles.rb
@@ -8,7 +8,7 @@ class << self
##
# Rackspace Cloud Files Credentials
- attr_accessor :api_key, :username
+ attr_accessor :api_key, :username, :auth_url
##
# Rackspace Cloud Files container name and path
View
2  lib/backup/model.rb
@@ -266,6 +266,8 @@ def show_exception!(exception)
Logger.normal "=" * 75 + "\nException that got raised:\n#{exception.class} - #{exception} \n" + "=" * 75 + "\n" + exception.backtrace.join("\n")
Logger.normal "=" * 75 + "\n\nYou are running Backup version \"#{Backup::Version.current}\" and Ruby version \"#{RUBY_VERSION} (patchlevel #{RUBY_PATCHLEVEL})\" on platform \"#{RUBY_PLATFORM}\".\n"
Logger.normal "If you've setup a \"Notification\" in your configuration file, the above error will have been sent."
+ #Notifies the shell an exception occured.
+ exit 1
end
end
View
5 lib/backup/storage/cloudfiles.rb
@@ -10,7 +10,7 @@ class CloudFiles < Base
##
# Rackspace Cloud Files Credentials
- attr_accessor :username, :api_key
+ attr_accessor :username, :api_key, :auth_url
##
# Rackspace Cloud Files container name and path
@@ -61,7 +61,8 @@ def connection
Fog::Storage.new(
:provider => provider,
:rackspace_username => username,
- :rackspace_api_key => api_key
+ :rackspace_api_key => api_key,
+ :rackspace_auth_url => auth_url
)
end
View
2  lib/backup/version.rb
@@ -13,7 +13,7 @@ class Version
# Defines the minor version
# PATCH:
# Defines the patch version
- MAJOR, MINOR, PATCH = 3, 0, 18
+ MAJOR, MINOR, PATCH = 3, 0, 19
##
# Returns the major version ( big release based off of multiple minor releases )
View
3  lib/templates/storage/cloudfiles
@@ -7,4 +7,5 @@
cf.container = 'my_container'
cf.path = '/path/to/my/backups'
cf.keep = 5
- end
+ cf.auth_url = 'lon.auth.api.rackspacecloud.com'
+ end
View
3  spec/configuration/storage/cloudfiles_spec.rb
@@ -9,6 +9,7 @@
cf.api_key = 'my_api_key'
cf.container = 'my_container'
cf.path = 'my_backups'
+ cf.auth_url = 'lon.auth.api.rackspacecloud.com'
end
end
@@ -18,6 +19,7 @@
cf.api_key.should == 'my_api_key'
cf.container.should == 'my_container'
cf.path.should == 'my_backups'
+ cf.auth_url.should == 'lon.auth.api.rackspacecloud.com'
end
describe '#clear_defaults!' do
@@ -29,6 +31,7 @@
cf.api_key.should == nil
cf.container.should == nil
cf.path.should == nil
+ cf.auth_url.should == nil
end
end
end
View
1  spec/spec_helper.rb
@@ -13,6 +13,7 @@
[:message, :error, :warn, :normal, :silent].each do |message_type|
Backup::Logger.stubs(message_type)
end
+ Backup::Model.extension = 'tar'
end
end
View
5 spec/storage/cloudfiles_spec.rb
@@ -11,6 +11,7 @@
cf.container = 'my_container'
cf.path = 'backups'
cf.keep = 20
+ cf.auth_url = 'lon.auth.api.rackspacecloud.com'
end
end
@@ -24,6 +25,7 @@
cf.container.should == 'my_container'
cf.path.should == 'backups'
cf.keep.should == 20
+ cf.auth_url.should == 'lon.auth.api.rackspacecloud.com'
end
it 'should use the defaults if a particular attribute has not been defined' do
@@ -48,7 +50,8 @@
Fog::Storage.expects(:new).with({
:provider => 'Rackspace',
:rackspace_username => 'my_username',
- :rackspace_api_key => 'my_api_key'
+ :rackspace_api_key => 'my_api_key',
+ :rackspace_auth_url => 'lon.auth.api.rackspacecloud.com'
})
cf.send(:connection)
Please sign in to comment.
Something went wrong with that request. Please try again.