Merge branch 'develop'

.gitignore

@@ -1,3 +1,7 @@
 .DS_Store
 *.gem
 .rvmrc
+.bundle/
+vendor/bundle
+*.swp
+*.swo

Gemfile

@@ -1,20 +1,21 @@
-##
+# encoding: utf-8
+
 # RubyGems Source
 source 'http://rubygems.org'
 
-##
+# Include gem dependencies from the gemspec for development purposes
+gemspec
+
 # Load Backup::Dependency
-%w[cli dependency].each do |path|
-  require File.expand_path("../lib/backup/#{path}", __FILE__)
+["cli/helpers", "dependency"].each do |library|
+  require File.expand_path("../lib/backup/#{library}", __FILE__)
 end
 
-##
 # Dynamically define the dependencies specified in Backup::Dependency.all
 Backup::Dependency.all.each do |name, gemspec|
   gem(name, gemspec[:version])
 end
 
-##
 # Define gems to be used in the 'test' environment
 group :test do
   gem 'rspec'
@@ -24,8 +25,8 @@ group :test do
 
   gem 'guard'
   gem 'guard-rspec'
-  gem 'rb-fsevent' # guard notifications for osx 
+  gem 'rb-fsevent' # guard notifications for osx
   gem 'growl'      # $ brew install growlnotify
   gem 'rb-inotify' # guard notifications for linux
   gem 'libnotify'  # $ apt-get install ???
-end
+end

Gemfile.lock

@@ -1,6 +1,17 @@
+PATH
+  remote: .
+  specs:
+    backup (3.0.19)
+      POpen4 (~> 0.1.4)
+      thor (~> 0.14.6)
+
 GEM
   remote: http://rubygems.org/
   specs:
+    POpen4 (0.1.4)
+      Platform (>= 0.4.0)
+      open4
+    Platform (0.4.0)
     addressable (2.2.6)
     builder (3.0.0)
     crack (0.1.8)
@@ -38,6 +49,8 @@ GEM
     guard-rspec (0.3.1)
       guard (>= 0.2.2)
     hashie (1.1.0)
+    hipchat (0.4.1)
+      httparty
     httparty (0.7.4)
       crack (= 0.1.8)
     i18n (0.6.0)
@@ -59,7 +72,9 @@ GEM
     net-ssh (2.1.4)
     nokogiri (1.5.0)
     oauth (0.4.5)
+    open4 (1.2.0)
     polyglot (0.3.2)
+    prowler (1.3.1)
     rack (1.3.2)
     rb-fsevent (0.4.0)
     rb-inotify (0.8.5)
@@ -93,20 +108,23 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  backup!
   dropbox (~> 1.3.0)
   fog (>= 0.11.0)
   fuubar
   growl
   guard
   guard-rspec
+  hipchat (~> 0.4.1)
   httparty (~> 0.7.4)
   json (~> 1.5.1)
   libnotify
-  mail (~> 2.3.0)
+  mail (>= 2.2.15)
   mocha
   net-scp (~> 1.0.4)
   net-sftp (~> 2.0.5)
   net-ssh (~> 2.1.4)
+  prowler (>= 1.3.1)
   rb-fsevent
   rb-inotify
   rspec

Guardfile

@@ -1,17 +1,21 @@
-##
-# To run the test suite against all 3 rubies: 1.9.2, 1.8.7 and REE, simply run the following command:
+# encoding: utf-8
+
+# To run the test suite against all 3 rubies: 1.9.3, 1.9.2, and 1.8.7, simply run the following command:
+#
 # $ guard start
 #
-# Be use you are using RVM and have Ruby 1.9.2, 1.8.7 and REE installed as well as all
-# Backup's gem dependencies for each of these Ruby intepreters.
+# Be use you are using RVM and have Ruby 1.9.3, 1.9.2, 1.8.7 installed as well as all of Backup's gem
+# dependencies for each of these Ruby versions.
+#
+# Be sure to run `bundle install` against every Ruby version, as well as `gem install thor POpen4`
 
-guard 'rspec',
+guard "rspec",
   :version => 2,
-  :rvm     => ['1.9.3', '1.9.2', '1.8.7', 'ree'],
+  :rvm     => ["1.9.3", "1.9.2", "1.8.7"],
   :bundler => true,
-  :cli     => '--color --format Fuubar' do
+  :cli     => "--color --format Fuubar" do
 
   watch(%r{^spec/.+_spec\.rb})
-  watch(%r{^lib/(.+)\.rb})     { 'spec' }
-  watch('spec/spec_helper.rb') { 'spec' }
+  watch(%r{^lib/(.+)\.rb})     { "spec" }
+  watch("spec/spec_helper.rb") { "spec" }
 end