backup 4.3.0 → 5.0.0.beta.3

data/lib/backup/database/mongodb.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Backup
   module Database
     class MongoDB < Base
@@ -60,7 +58,6 @@ module Backup
         lock_database if @lock
         dump!
         package!
-
       ensure
         unlock_database if @lock
       end
@@ -78,7 +75,7 @@ module Backup
           run(mongodump)
         else
           collections.each do |collection|
-            run("#{ mongodump } --collection='#{ collection }'")
+            run("#{mongodump} --collection='#{collection}'")
           end
         end
       end
@@ -92,25 +89,27 @@ module Backup
       # If successful, +dump_packaging_path+ is removed.
       def package!
         pipeline = Pipeline.new
-        dump_ext = 'tar'
+        dump_ext = "tar"
 
-        pipeline << "#{ utility(:tar) } -cf - " +
-            "-C '#{ dump_path }' '#{ dump_filename }'"
+        pipeline << "#{utility(:tar)} -cf - " \
+            "-C '#{dump_path}' '#{dump_filename}'"
 
-        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?
           FileUtils.rm_rf dump_packaging_path
           log!(:finished)
         else
-          raise Error, "Dump Failed!\n" + pipeline.error_messages
+          raise Error, "Dump Failed!\n#{pipeline.error_messages}"
         end
       end
 
@@ -119,69 +118,69 @@ module Backup
       end
 
       def mongodump
-        "#{ utility(:mongodump) } #{ name_option } #{ credential_options } " +
-        "#{ connectivity_options } #{ ipv6_option } #{ oplog_option } " +
-        "#{ user_options } --out='#{ dump_packaging_path }'"
+        "#{utility(:mongodump)} #{name_option} #{credential_options} " \
+          "#{connectivity_options} #{ipv6_option} #{oplog_option} " \
+          "#{user_options} --out='#{dump_packaging_path}'"
       end
 
       def name_option
-        "--db='#{ name }'" if name
+        return unless name
+        "--db='#{name}'"
       end
 
       def credential_options
         opts = []
-        opts << "--username='#{ username }'" if username
-        opts << "--password='#{ password }'" if password
-        opts << "--authenticationDatabase='#{ authdb }'" if authdb
-        opts.join(' ')
+        opts << "--username='#{username}'" if username
+        opts << "--password='#{password}'" if password
+        opts << "--authenticationDatabase='#{authdb}'" if authdb
+        opts.join(" ")
       end
 
       def connectivity_options
         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 ipv6_option
-        '--ipv6' if ipv6
+        "--ipv6" if ipv6
       end
 
       def oplog_option
-        '--oplog' if oplog
+        "--oplog" if oplog
       end
 
       def user_options
-        Array(additional_options).join(' ')
+        Array(additional_options).join(" ")
       end
 
       def lock_database
-        lock_command = <<-EOS.gsub(/^ +/, '')
+        lock_command = <<-EOS.gsub(/^ +/, "")
           echo 'use admin
           db.setProfilingLevel(0)
-          db.fsyncLock()' | #{ mongo_shell }
+          db.fsyncLock()' | #{mongo_shell}
         EOS
 
         run(lock_command)
       end
 
       def unlock_database
-        unlock_command = <<-EOS.gsub(/^ +/, '')
+        unlock_command = <<-EOS.gsub(/^ +/, "")
           echo 'use admin
-          db.fsyncUnlock()' | #{ mongo_shell }
+          db.fsyncUnlock()' | #{mongo_shell}
         EOS
 
         run(unlock_command)
       end
 
       def mongo_shell
-        cmd = "#{ utility(:mongo) } #{ connectivity_options }".rstrip
-        cmd << " #{ credential_options }".rstrip
-        cmd << " #{ ipv6_option }".rstrip
-        cmd << " '#{ name }'" if name
+        cmd = "#{utility(:mongo)} #{connectivity_options}".rstrip
+        cmd << " #{credential_options}".rstrip
+        cmd << " #{ipv6_option}".rstrip
+        cmd << " '#{name}'" if name
         cmd
       end
-
     end
   end
 end

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 -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