backup 3.0.13 → 3.0.14

data/lib/backup.rb

@@ -33,6 +33,7 @@ module Backup
   ENCRYPTOR_PATH     = File.join(LIBRARY_PATH, 'encryptor')
   NOTIFIER_PATH      = File.join(LIBRARY_PATH, 'notifier')
   SYNCER_PATH        = File.join(LIBRARY_PATH, 'syncer')
+  EXCEPTION_PATH     = File.join(LIBRARY_PATH, 'exception')
 
   ##
   # Backup's Environment paths
@@ -158,6 +159,12 @@ module Backup
     autoload :Campfire, File.join(NOTIFIER_PATH, 'campfire')
   end
 
+  ##
+  # Autoload exception classes
+  module Exception
+    autoload :CommandNotFound, File.join(EXCEPTION_PATH, 'command_not_found')
+  end
+
   ##
   # Dynamically defines all the available database, storage, compressor, encryptor and notifier
   # classes inside Backup::Finder to improve the DSL for the configuration file

data/lib/backup/cli.rb

@@ -6,9 +6,21 @@ module Backup
     ##
     # Wrapper method for %x[] to run CL commands
     # through a ruby method. This helps with test coverage and
-    # improves readability
+    # improves readability.
+    #
+    # Every time the Backup::CLI#run method is invoked, it'll invoke
+    # the Backup::CLI#raise_if_command_not_found method after running the
+    # requested command on the OS.
+    #
+    # Backup::CLI#raise_if_command_not_found takes a single argument, the utility name.
+    # the command.slice(0, command.index(/\s/)).split('/')[-1] line will extract only the utility
+    # name (e.g. mongodump, pgdump, etc) from a command like "/usr/local/bin/mongodump <options>"
+    # and pass that in to the Backup::CLI#raise_if_command_not_found
     def run(command)
       %x[#{command}]
+      raise_if_command_not_found!(
+        command.slice(0, command.index(/\s/)).split('/')[-1]
+      )
     end
 
     ##
@@ -46,5 +58,18 @@ module Backup
       name
     end
 
+    ##
+    # If the command that was previously run via this Ruby process returned
+    # error code "32512", the invoked utility (e.g. mysqldump, pgdump, etc) could not be found.
+    # If this is the case then this method will throw an exception, informing the user of this problem.
+    #
+    # Since this raises an exception, it'll stop the entire backup process, clean up the temp files
+    # and notify the user via the built-in notifiers if these are set.
+    def raise_if_command_not_found!(utility)
+      if $?.to_i.eql?(32512)
+        raise Exception::CommandNotFound , "Could not find the utility \"#{utility}\" on \"#{RUBY_PLATFORM}\"."
+      end
+    end
+
   end
 end

data/lib/backup/exception/command_not_found.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+module Backup
+  module Exception
+    class CommandNotFound < StandardError
+    end
+  end
+end

data/lib/backup/logger.rb

@@ -24,6 +24,14 @@ module Backup
       to_file loggify(:warning, string)
     end
 
+    ##
+    # Outputs the data as if it were a regular 'puts' command,
+    # but also logs it to the backup.log
+    def self.normal(string)
+      puts    string
+      to_file string
+    end
+
     ##
     # Silently logs data to the log file
     def self.silent(string)

data/lib/backup/model.rb

@@ -225,7 +225,7 @@ module Backup
 
         syncers.each   { |s| s.perform!       }
         notifiers.each { |n| n.perform!(self) }
-      rescue Exception => exception
+      rescue => exception
         clean!
         notifiers.each   { |n| n.perform!(self, exception) }
         show_exception!(exception)
@@ -263,9 +263,9 @@ module Backup
     ##
     # Formats an exception
     def show_exception!(exception)
-      puts ("=" * 75) + "\nException that got raised:\n#{exception}\n" + ("=" * 75) + "\n" + exception.backtrace.join("\n")
-      puts ("=" * 75) + "\n\nYou are running Backup version \"#{Backup::Version.current}\" and Ruby version \"#{ENV['RUBY_VERSION']}\".\n"
-      puts "If you've setup a \"Notification\" in your configuration file, the above error will have been sent."
+      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."
     end
 
   end

data/lib/backup/notifier/templates/notify_failure.erb

@@ -3,7 +3,7 @@ There seemed to be a problem backing up <%= @model.label %> (<%= @model.trigger
 
 ===========================================================================
 Exception that got raised:
-<%= @exception.to_s %>
+<%= @exception.class %> - <%= @exception.to_s %>
 ===========================================================================
 <%= @exception.backtrace.join("\n") %>
 ===========================================================================
@@ -13,8 +13,10 @@ You are running Backup version:
 <%= Backup::Version.current %>
 
 You are running Ruby version:
-<%= ENV["RUBY_VERSION"] %>
+<%= RUBY_VERSION %> (patchlevel <%= RUBY_PATCHLEVEL %>)
 
+On platform:
+<%= RUBY_PLATFORM %>
 
 ---------------------------------------------------------------------------
 

data/lib/backup/storage/dropbox.rb

@@ -79,7 +79,11 @@ module Backup
       ##
       # Removes the transferred archive file from the Dropbox folder
       def remove!
-        connection.delete(File.join(remote_path, remote_file))
+        begin
+          connection.delete(File.join(remote_path, remote_file))
+        rescue ::Dropbox::FileNotFoundError
+          Logger.warn "File \"#{ File.join(remote_path, remote_file) }\" does not exist, skipping removal."
+        end
       end
 
     end

data/lib/backup/version.rb

@@ -13,7 +13,7 @@ module Backup
     #  Defines the minor version
     # PATCH:
     #  Defines the patch version
-    MAJOR, MINOR, PATCH = 3, 0, 13
+    MAJOR, MINOR, PATCH = 3, 0, 14
 
     ##
     # Returns the major version ( big release based off of multiple minor releases )

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: backup
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 13
-  version: 3.0.13
+  version: 3.0.14
 platform: ruby
 authors: 
 - Michael van Rooijen
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +02:00
+date: 2011-04-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 14
-        - 6
         version: 0.14.6
   type: :runtime
   version_requirements: *id001
@@ -92,6 +82,7 @@ files:
 - lib/backup/encryptor/base.rb
 - lib/backup/encryptor/gpg.rb
 - lib/backup/encryptor/open_ssl.rb
+- lib/backup/exception/command_not_found.rb
 - lib/backup/finder.rb
 - lib/backup/logger.rb
 - lib/backup/model.rb
@@ -199,18 +190,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []