backup 4.4.1 → 5.0.0.beta.3

data/lib/backup/database/mysql.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Backup
   module Database
     class MySQL < Base
@@ -78,71 +76,73 @@ module Backup
         super
 
         pipeline = Pipeline.new
-        dump_ext = sql_backup? ? 'sql' : 'tar'
+        dump_ext = sql_backup? ? "sql" : "tar"
 
         pipeline << sudo_option(sql_backup? ? mysqldump : innobackupex)
 
-        model.compressor.compress_with do |command, ext|
-          pipeline << command
-          dump_ext << ext
-        end if model.compressor
+        if model.compressor
+          model.compressor.compress_with do |command, ext|
+            pipeline << command
+            dump_ext << ext
+          end
+        end
 
-        pipeline << "#{ utility(:cat) } > " +
-            "'#{ File.join(dump_path, dump_filename) }.#{ dump_ext }'"
+        pipeline << "#{utility(:cat)} > " \
+          "'#{File.join(dump_path, dump_filename)}.#{dump_ext}'"
 
         pipeline.run
         if pipeline.success?
           log!(:finished)
         else
-          raise Error, "Dump Failed!\n" + pipeline.error_messages
+          raise Error, "Dump Failed!\n#{pipeline.error_messages}"
         end
       end
 
       private
 
       def mysqldump
-        "#{ utility(:mysqldump) } #{ user_options } #{ credential_options } " +
-        "#{ connectivity_options } #{ name_option } " +
-        "#{ tables_to_dump } #{ tables_to_skip }"
+        "#{utility(:mysqldump)} #{user_options} #{credential_options} " \
+          "#{connectivity_options} #{name_option} " \
+          "#{tables_to_dump} #{tables_to_skip}"
       end
 
       def credential_options
         opts = []
-        opts << "--user=#{ Shellwords.escape(username) }" if username
-        opts << "--password=#{ Shellwords.escape(password) }" if password
-        opts.join(' ')
+        opts << "--user=#{Shellwords.escape(username)}" if username
+        opts << "--password=#{Shellwords.escape(password)}" if password
+        opts.join(" ")
       end
 
       def connectivity_options
-        return "--socket='#{ socket }'" if socket
+        return "--socket='#{socket}'" if socket
 
         opts = []
-        opts << "--host='#{ host }'" if host
-        opts << "--port='#{ port }'" if port
-        opts.join(' ')
+        opts << "--host='#{host}'" if host
+        opts << "--port='#{port}'" if port
+        opts.join(" ")
       end
 
       def user_options
-        Array(additional_options).join(' ')
+        Array(additional_options).join(" ")
       end
 
       def user_prepare_options
-        Array(prepare_options).join(' ')
+        Array(prepare_options).join(" ")
       end
 
       def name_option
-        dump_all? ? '--all-databases' : name
+        dump_all? ? "--all-databases" : name
       end
 
       def tables_to_dump
-        Array(only_tables).join(' ') unless dump_all?
+        Array(only_tables).join(" ") unless dump_all?
       end
 
       def tables_to_skip
         Array(skip_tables).map do |table|
-          table = (dump_all? || table['.']) ? table : "#{ name }.#{ table }"
-          "--ignore-table='#{ table }'"
-        end.join(' ')
+          table = dump_all? || table["."] ? table : "#{name}.#{table}"
+          "--ignore-table='#{table}'"
+        end.join(" ")
       end
 
       def dump_all?
@@ -155,28 +155,28 @@ module Backup
 
       def innobackupex
         # Creation phase
-        "#{ utility(:innobackupex) } #{ credential_options } " +
-        "#{ connectivity_options } #{ user_options } " +
-        "--no-timestamp #{ temp_dir } #{ quiet_option } && " +
-        innobackupex_prepare +
-        # Move files to tar-ed stream on stdout
-        "#{ utility(:tar) } --remove-files -cf -  " +
-        "-C #{ File.dirname(temp_dir) } #{ File.basename(temp_dir) }"
+        "#{utility(:innobackupex)} #{credential_options} " \
+          "#{connectivity_options} #{user_options} " \
+          "--no-timestamp #{temp_dir} #{quiet_option} && " +
+          innobackupex_prepare +
+          # Move files to tar-ed stream on stdout
+          "#{utility(:tar)} --remove-files -cf -  " \
+          "-C #{File.dirname(temp_dir)} #{File.basename(temp_dir)}"
       end
 
       def innobackupex_prepare
         return "" unless @prepare_backup
         # Log applying phase (prepare for restore)
-        "#{ utility(:innobackupex) } --apply-log #{ temp_dir } " +
-        "#{ user_prepare_options }  #{ quiet_option } && "
+        "#{utility(:innobackupex)} --apply-log #{temp_dir} " \
+          "#{user_prepare_options}  #{quiet_option} && "
       end
 
       def sudo_option(command_block)
         return command_block unless sudo_user
 
-        "sudo -s -u #{ sudo_user } -- <<END_OF_SUDO\n" +
-        "#{command_block}\n" +
-        "END_OF_SUDO\n"
+        "sudo -s -u #{sudo_user} -- <<END_OF_SUDO\n" \
+          "#{command_block}\n" \
+          "END_OF_SUDO\n"
       end
 
       def quiet_option
@@ -184,9 +184,8 @@ module Backup
       end
 
       def temp_dir
-        File.join(dump_path, dump_filename + ".bkpdir")
+        File.join(dump_path, "#{dump_filename}.bkpdir")
       end
-
     end
   end
 end

data/lib/backup/database/openldap.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Backup
   module Database
     class OpenLDAP < Base
@@ -33,11 +31,11 @@ module Backup
         super
         instance_eval(&block) if block_given?
 
-        @name             ||= 'ldap_backup'
+        @name             ||= "ldap_backup"
         @use_sudo         ||= false
-        @slapcat_args     ||= Array.new
+        @slapcat_args     ||= []
         @slapcat_utility  ||= utility(:slapcat)
-        @slapcat_conf     ||= '/etc/ldap/slapd.d'
+        @slapcat_conf     ||= "/etc/ldap/slapd.d"
       end
 
       ##
@@ -47,7 +45,7 @@ module Backup
         super
 
         pipeline = Pipeline.new
-        dump_ext = 'ldif'
+        dump_ext = "ldif"
 
         pipeline << slapcat
         if @model.compressor
@@ -57,8 +55,8 @@ module Backup
           end
         end
 
-        pipeline << "#{ utility(:cat) } > " +
-            "'#{ File.join(dump_path, dump_filename) }.#{ dump_ext }'"
+        pipeline << "#{utility(:cat)} > " \
+            "'#{File.join(dump_path, dump_filename)}.#{dump_ext}'"
 
         pipeline.run
         if pipeline.success?
@@ -73,7 +71,7 @@ module Backup
       ##
       # Builds the full slapcat string based on all attributes
       def slapcat
-        command = "#{ slapcat_utility } #{ slapcat_conf_option } #{ slapcat_conf } #{ user_options }"
+        command = "#{slapcat_utility} #{slapcat_conf_option} #{slapcat_conf} #{user_options}"
         command.prepend("sudo ") if use_sudo
         command
       end
@@ -88,7 +86,7 @@ module Backup
       # Builds a compatible string for the additional options
       # specified by the user
       def user_options
-        slapcat_args.join(' ')
+        slapcat_args.join(" ")
       end
     end
   end

data/lib/backup/database/postgresql.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Backup
   module Database
     class PostgreSQL < Base
@@ -53,17 +51,19 @@ module Backup
         super
 
         pipeline = Pipeline.new
-        dump_ext = 'sql'
+        dump_ext = "sql"
 
         pipeline << (dump_all? ? pgdumpall : pgdump)
 
-        model.compressor.compress_with do |command, ext|
-          pipeline << command
-          dump_ext << ext
-        end if model.compressor
+        if model.compressor
+          model.compressor.compress_with do |command, ext|
+            pipeline << command
+            dump_ext << ext
+          end
+        end
 
-        pipeline << "#{ utility(:cat) } > " +
-            "'#{ File.join(dump_path, dump_filename) }.#{ dump_ext }'"
+        pipeline << "#{utility(:cat)} > " \
+          "'#{File.join(dump_path, dump_filename)}.#{dump_ext}'"
 
         pipeline.run
         if pipeline.success?
@@ -74,60 +74,59 @@ module Backup
       end
 
       def pgdump
-        "#{ password_option }" +
-        "#{ sudo_option }" +
-        "#{ utility(:pg_dump) } #{ username_option } #{ connectivity_options } " +
-        "#{ user_options } #{ tables_to_dump } #{ tables_to_skip } #{ name }"
+        password_option.to_s +
+          sudo_option.to_s +
+          "#{utility(:pg_dump)} #{username_option} #{connectivity_options} " \
+          "#{user_options} #{tables_to_dump} #{tables_to_skip} #{name}"
       end
 
       def pgdumpall
-        "#{ password_option }" +
-        "#{ sudo_option }" +
-        "#{ utility(:pg_dumpall) } #{ username_option } " +
-        "#{ connectivity_options } #{ user_options }"
+        password_option.to_s +
+          sudo_option.to_s +
+          "#{utility(:pg_dumpall)} #{username_option} " \
+          "#{connectivity_options} #{user_options}"
       end
 
       def password_option
-        "PGPASSWORD=#{ Shellwords.escape(password) } " if password
+        "PGPASSWORD=#{Shellwords.escape(password)} " if password
       end
 
       def sudo_option
-        "#{ utility(:sudo) } -n -H -u #{ sudo_user } " if sudo_user
+        "#{utility(:sudo)} -n -H -u #{sudo_user} " if sudo_user
       end
 
       def username_option
-        "--username=#{ Shellwords.escape(username) }" if username
+        "--username=#{Shellwords.escape(username)}" if username
       end
 
       def connectivity_options
-        return "--host='#{ socket }'" if socket
+        return "--host='#{socket}'" if socket
 
         opts = []
-        opts << "--host='#{ host }'" if host
-        opts << "--port='#{ port }'" if port
-        opts.join(' ')
+        opts << "--host='#{host}'" if host
+        opts << "--port='#{port}'" if port
+        opts.join(" ")
       end
 
       def user_options
-        Array(additional_options).join(' ')
+        Array(additional_options).join(" ")
       end
 
       def tables_to_dump
         Array(only_tables).map do |table|
-          "--table='#{ table }'"
-        end.join(' ')
+          "--table='#{table}'"
+        end.join(" ")
       end
 
       def tables_to_skip
         Array(skip_tables).map do |table|
-          "--exclude-table='#{ table }'"
-        end.join(' ')
+          "--exclude-table='#{table}'"
+        end.join(" ")
       end
 
       def dump_all?
         name == :all
       end
-
     end
   end
 end

data/lib/backup/database/redis.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Backup
   module Database
     class Redis < Base
@@ -59,12 +57,10 @@ module Backup
 
         @mode ||= :copy
 
-        unless MODES.include?(mode)
-          raise Error, "'#{ mode }' is not a valid mode"
-        end
+        raise Error, "'#{mode}' is not a valid mode" unless MODES.include?(mode)
 
         if mode == :copy && rdb_path.nil?
-          raise Error, '`rdb_path` must be set when `mode` is :copy'
+          raise Error, "`rdb_path` must be set when `mode` is :copy"
         end
       end
 
@@ -96,17 +92,19 @@ module Backup
 
       def sync!
         pipeline = Pipeline.new
-        dump_ext = 'rdb'
+        dump_ext = "rdb"
 
-        pipeline << "#{ redis_cli_cmd } --rdb -"
+        pipeline << "#{redis_cli_cmd} --rdb -"
 
-        model.compressor.compress_with do |command, ext|
-          pipeline << command
-          dump_ext << ext
-        end if model.compressor
+        if model.compressor
+          model.compressor.compress_with do |command, ext|
+            pipeline << command
+            dump_ext << ext
+          end
+        end
 
-        pipeline << "#{ utility(:cat) } > " +
-            "'#{ File.join(dump_path, dump_filename) }.#{ dump_ext }'"
+        pipeline << "#{utility(:cat)} > " \
+          "'#{File.join(dump_path, dump_filename)}.#{dump_ext}'"
 
         pipeline.run
 
@@ -116,17 +114,16 @@ module Backup
       end
 
       def save!
-        resp = run("#{ redis_cli_cmd } SAVE")
+        resp = run("#{redis_cli_cmd} SAVE")
         unless resp =~ /OK$/
           raise Error, <<-EOS
             Failed to invoke the `SAVE` command
-            Response was: #{ resp }
+            Response was: #{resp}
           EOS
         end
-
       rescue Error
         if resp =~ /save already in progress/
-          unless (attempts ||= '0').next! == '5'
+          unless (attempts ||= "0").next! == "5"
             sleep 5
             retry
           end
@@ -138,14 +135,14 @@ module Backup
         unless File.exist?(rdb_path)
           raise Error, <<-EOS
             Redis database dump not found
-            `rdb_path` was '#{ rdb_path }'
+            `rdb_path` was '#{rdb_path}'
           EOS
         end
 
-        dst_path = File.join(dump_path, dump_filename + '.rdb')
+        dst_path = File.join(dump_path, dump_filename + ".rdb")
         if model.compressor
           model.compressor.compress_with do |command, ext|
-            run("#{ command } -c '#{ rdb_path }' > '#{ dst_path + ext }'")
+            run("#{command} -c '#{rdb_path}' > '#{dst_path + ext}'")
           end
         else
           FileUtils.cp(rdb_path, dst_path)
@@ -153,27 +150,27 @@ module Backup
       end
 
       def redis_cli_cmd
-        "#{ utility('redis-cli') } #{ password_option } " +
-        "#{ connectivity_options } #{ user_options }"
+        "#{utility("redis-cli")} #{password_option} " \
+          "#{connectivity_options} #{user_options}"
       end
 
       def password_option
-        "-a '#{ password }'" if password
+        return unless password
+        "-a '#{password}'"
       end
 
       def connectivity_options
-        return "-s '#{ socket }'" if socket
+        return "-s '#{socket}'" if socket
 
         opts = []
-        opts << "-h '#{ host }'" if host
-        opts << "-p '#{ port }'" if port
-        opts.join(' ')
+        opts << "-h '#{host}'" if host
+        opts << "-p '#{port}'" if port
+        opts.join(" ")
       end
 
       def user_options
-        Array(additional_options).join(' ')
+        Array(additional_options).join(" ")
       end
-
     end
   end
 end

data/lib/backup/database/riak.rb

@@ -1,9 +1,6 @@
-# encoding: utf-8
-
 module Backup
   module Database
     class Riak < Base
-
       ##
       # Node is the node from which to perform the backup.
       # Default: riak@127.0.0.1
@@ -23,9 +20,9 @@ module Backup
         super
         instance_eval(&block) if block_given?
 
-        @node   ||= 'riak@127.0.0.1'
-        @cookie ||= 'riak'
-        @user   ||= 'riak'
+        @node   ||= "riak@127.0.0.1"
+        @cookie ||= "riak"
+        @user   ||= "riak"
       end
 
       ##
@@ -38,14 +35,16 @@ module Backup
 
         dump_file = File.join(dump_path, dump_filename)
         with_riak_owned_dump_path do
-          run("#{ riakadmin } backup #{ node } #{ cookie } '#{ dump_file }' node")
+          run("#{riakadmin} backup #{node} #{cookie} '#{dump_file}' node")
         end
 
-        model.compressor.compress_with do |command, ext|
-          dump_file << "-#{ node }" # `riak-admin` appends `node` to the filename.
-          run("#{ command } -c '#{ dump_file }' > '#{ dump_file + ext }'")
-          FileUtils.rm_f(dump_file)
-        end if model.compressor
+        if model.compressor
+          model.compressor.compress_with do |command, ext|
+            dump_file << "-#{node}" # `riak-admin` appends `node` to the filename.
+            run("#{command} -c '#{dump_file}' > '#{dump_file + ext}'")
+            FileUtils.rm_f(dump_file)
+          end
+        end
 
         log!(:finished)
       end
@@ -61,22 +60,20 @@ module Backup
       # the user running Backup, since the absence of the execute bit on their
       # home directory would deny +user+ access.
       def with_riak_owned_dump_path
-        run("#{ utility(:sudo) } -n #{ utility(:chown) } " +
-            "#{ user } '#{ dump_path }'")
+        run "#{utility(:sudo)} -n #{utility(:chown)} #{user} '#{dump_path}'"
         yield
       ensure
         # reclaim ownership
-        run("#{ utility(:sudo) } -n #{ utility(:chown) } -R " +
-            "#{ Config.user } '#{ dump_path }'")
+        run "#{utility(:sudo)} -n #{utility(:chown)} -R " \
+          "#{Config.user} '#{dump_path}'"
       end
 
       ##
       # `riak-admin` must be run as the riak +user+.
       # It will do this itself, but without `-n` and emits a message on STDERR.
       def riakadmin
-        "#{ utility(:sudo) } -n -u #{ user } #{ utility('riak-admin') }"
+        "#{utility(:sudo)} -n -u #{user} #{utility("riak-admin")}"
       end
-
     end
   end
 end

data/lib/backup/database/sqlite.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Backup
   module Database
     class SQLite < Base
@@ -28,10 +26,10 @@ module Backup
       def perform!
         super
 
-        dump = "echo '.dump' | #{ sqlitedump_utility } #{ path }"
+        dump = "echo '.dump' | #{sqlitedump_utility} #{path}"
 
         pipeline = Pipeline.new
-        dump_ext = 'sql'
+        dump_ext = "sql"
 
         pipeline << dump
         if model.compressor
@@ -41,7 +39,7 @@ module Backup
           end
         end
 
-        pipeline << "cat > '#{ File.join( dump_path , dump_filename) }.#{ dump_ext }'"
+        pipeline << "cat > '#{File.join(dump_path, dump_filename)}.#{dump_ext}'"
 
         pipeline.run
 
@@ -49,7 +47,7 @@ module Backup
           log!(:finished)
         else
           raise Error,
-            "#{ database_name } Dump Failed!\n" + pipeline.error_messages
+            "#{database_name} Dump Failed!\n" + pipeline.error_messages
         end
       end
     end

data/lib/backup/encryptor/base.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Backup
   module Encryptor
     class Base
@@ -15,14 +13,14 @@ module Backup
       ##
       # Return the encryptor name, with Backup namespace removed
       def encryptor_name
-        self.class.to_s.sub('Backup::', '')
+        self.class.to_s.sub("Backup::", "")
       end
 
       ##
       # Logs a message to the console and log file to inform
       # the client that Backup is encrypting the archive
       def log!
-        Logger.info "Using #{ encryptor_name } to encrypt the archive."
+        Logger.info "Using #{encryptor_name} to encrypt the archive."
       end
     end
   end